Skip to content

[text analytics] Autogenerated code for v3.1-preview.4 #16811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iscai-msft merged 7 commits into from
Feb 19, 2021
Merged

[text analytics] Autogenerated code for v3.1-preview.4 #16811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edc5149
Autogenerated code for v3.1-preview.4
Feb 18, 2021
ceb58f0
Fixed imports in operations mixin files
Feb 18, 2021
0f436bb
Debugging errors in tests
Feb 18, 2021
dfa0789
Removed a space
Feb 19, 2021
4856d74
Adding back support for v3.1-preview.3 for now to prevent current tes…
Feb 19, 2021
6493689
Regenerated with both v3.1-preview.3 and v3.1-preview.4 to avoid test…
Feb 19, 2021
f9ccbb5
JobMetadata -> AnalyzeJobMetadata for polling related objects used fo…
Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_async_lro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ class AsyncAnalyzeBatchActionsLROPollingMethod(TextAnalyticsAsyncLROPollingMetho

@property
def _current_body(self):
from ._generated.v3_1_preview_3.models import JobMetadata
return JobMetadata.deserialize(self._pipeline_response)
from ._generated.v3_1_preview_3.models import AnalyzeJobMetadata
return AnalyzeJobMetadata.deserialize(self._pipeline_response)

@property
def created_on(self):
Expand Down
25 changes: 23 additions & 2 deletions ...xtanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/_operations_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
import warnings

# FIXME: have to manually reconfigure import path for multiapi operation mixin
from .._lro import AnalyzeHealthcareEntitiesLROPoller, AnalyzeHealthcareEntitiesLROPollingMethod
from .._lro import AnalyzeBatchActionsLROPoller, AnalyzeBatchActionsLROPollingMethod
from .._lro import AnalyzeBatchActionsLROPoller, AnalyzeBatchActionsLROPollingMethod, AnalyzeHealthcareEntitiesLROPoller, AnalyzeHealthcareEntitiesLROPollingMethod
from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpRequest, HttpResponse
Expand Down Expand Up @@ -61,6 +60,8 @@ def analyze_status(
api_version = self._get_api_version('analyze_status')
if api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'analyze_status'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -96,6 +97,8 @@ def begin_analyze(
api_version = self._get_api_version('begin_analyze')
if api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'begin_analyze'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -130,6 +133,8 @@ def begin_cancel_health_job(
api_version = self._get_api_version('begin_cancel_health_job')
if api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'begin_cancel_health_job'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -174,6 +179,8 @@ def begin_health(
api_version = self._get_api_version('begin_health')
if api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'begin_health'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -215,6 +222,8 @@ def entities_linking(
from .v3_0.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'entities_linking'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -257,6 +266,8 @@ def entities_recognition_general(
from .v3_0.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'entities_recognition_general'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -307,6 +318,8 @@ def entities_recognition_pii(
api_version = self._get_api_version('entities_recognition_pii')
if api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'entities_recognition_pii'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -348,6 +361,8 @@ def health_status(
api_version = self._get_api_version('health_status')
if api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'health_status'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -389,6 +404,8 @@ def key_phrases(
from .v3_0.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'key_phrases'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -431,6 +448,8 @@ def languages(
from .v3_0.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'languages'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -473,6 +492,8 @@ def sentiment(
from .v3_0.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from .v3_1_preview_3.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'sentiment'".format(api_version))
mixin_instance = OperationClass()
Expand Down
6 changes: 6 additions & 0 deletions ...lytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/_text_analytics_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ def __init__(
base_url = '{Endpoint}/text/analytics/v3.0'
elif api_version == 'v3.1-preview.3':
base_url = '{Endpoint}/text/analytics/v3.1-preview.3'
elif api_version == 'v3.1-preview.4':
Copy link
Contributor Author

@abhahn abhahn Feb 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we going to bump the version here like we did before for v3.1-preview.4 (i.e. removing support for other API versions)?

Copy link
Contributor Author

@abhahn abhahn Feb 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For now I've added this back in to prevent existing tests from failing. It will be easier to remove this later once updates to Healthcare and Analyze have been merged, because the tests will be updated to reflect the changes.

Copy link
Contributor

@iscai-msft iscai-msft Feb 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah @abhahn you made the right call. We need to keep v3.1-preview.3 and 4 for now, but once 4 is released we should get rid of 3

base_url = '{Endpoint}/text/analytics/v3.1-preview.4'
else:
raise ValueError("API version {} is not available".format(api_version))
self._config = TextAnalyticsClientConfiguration(credential, endpoint, **kwargs)
Expand All @@ -94,13 +96,17 @@ def models(cls, api_version=DEFAULT_API_VERSION):

* v3.0: :mod:`v3_0.models<azure.ai.textanalytics.v3_0.models>`
* v3.1-preview.3: :mod:`v3_1_preview_3.models<azure.ai.textanalytics.v3_1_preview_3.models>`
* v3.1-preview.4: :mod:`v3_1_preview_4.models<azure.ai.textanalytics.v3_1_preview_4.models>`
"""
if api_version == 'v3.0':
from .v3_0 import models
return models
elif api_version == 'v3.1-preview.3':
from .v3_1_preview_3 import models
return models
elif api_version == 'v3.1-preview.4':
from .v3_1_preview_4 import models
return models
raise ValueError("API version {} is not available".format(api_version))

def close(self):
Expand Down
27 changes: 24 additions & 3 deletions ...alytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/aio/_operations_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
import warnings

# FIXME: have to manually reconfigure import path for multiapi operation mixin
from ..._async_lro import AnalyzeHealthcareEntitiesAsyncLROPoller, AnalyzeHealthcareEntitiesAsyncLROPollingMethod
from ..._async_lro import AsyncAnalyzeBatchActionsLROPoller, AsyncAnalyzeBatchActionsLROPollingMethod
from ..._async_lro import AnalyzeHealthcareEntitiesAsyncLROPoller, AnalyzeHealthcareEntitiesAsyncLROPollingMethod, AsyncAnalyzeBatchActionsLROPoller, AsyncAnalyzeBatchActionsLROPollingMethod
from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
Expand Down Expand Up @@ -57,6 +56,8 @@ async def analyze_status(
api_version = self._get_api_version('analyze_status')
if api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'analyze_status'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -86,12 +87,14 @@ async def begin_analyze(
:paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
:return: An instance of AsyncAnalyzeBatchActionsLROPoller that returns either AnalyzeJobState or the result of cls(response)
:rtype: ~...._async_lro.AsyncAnalyzeBatchActionsLROPoller[~azure.ai.textanalytics.v3_1_preview_3.models.AnalyzeJobState]
:rtype: ~....._async_lro.AsyncAnalyzeBatchActionsLROPoller[~azure.ai.textanalytics.v3_1_preview_3.models.AnalyzeJobState]
:raises ~azure.core.exceptions.HttpResponseError:
"""
api_version = self._get_api_version('begin_analyze')
if api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'begin_analyze'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -126,6 +129,8 @@ async def begin_cancel_health_job(
api_version = self._get_api_version('begin_cancel_health_job')
if api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'begin_cancel_health_job'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -170,6 +175,8 @@ async def begin_health(
api_version = self._get_api_version('begin_health')
if api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'begin_health'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -211,6 +218,8 @@ async def entities_linking(
from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'entities_linking'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -253,6 +262,8 @@ async def entities_recognition_general(
from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'entities_recognition_general'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -303,6 +314,8 @@ async def entities_recognition_pii(
api_version = self._get_api_version('entities_recognition_pii')
if api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'entities_recognition_pii'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -344,6 +357,8 @@ async def health_status(
api_version = self._get_api_version('health_status')
if api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'health_status'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -385,6 +400,8 @@ async def key_phrases(
from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'key_phrases'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -427,6 +444,8 @@ async def languages(
from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'languages'".format(api_version))
mixin_instance = OperationClass()
Expand Down Expand Up @@ -469,6 +488,8 @@ async def sentiment(
from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.3':
from ..v3_1_preview_3.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'sentiment'".format(api_version))
mixin_instance = OperationClass()
Expand Down
6 changes: 6 additions & 0 deletions ...cs/azure-ai-textanalytics/azure/ai/textanalytics/_generated/aio/_text_analytics_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ def __init__(
base_url = '{Endpoint}/text/analytics/v3.0'
elif api_version == 'v3.1-preview.3':
base_url = '{Endpoint}/text/analytics/v3.1-preview.3'
elif api_version == 'v3.1-preview.4':
base_url = '{Endpoint}/text/analytics/v3.1-preview.4'
else:
raise ValueError("API version {} is not available".format(api_version))
self._config = TextAnalyticsClientConfiguration(credential, endpoint, **kwargs)
Expand All @@ -92,13 +94,17 @@ def models(cls, api_version=DEFAULT_API_VERSION):

* v3.0: :mod:`v3_0.models<azure.ai.textanalytics.v3_0.models>`
* v3.1-preview.3: :mod:`v3_1_preview_3.models<azure.ai.textanalytics.v3_1_preview_3.models>`
* v3.1-preview.4: :mod:`v3_1_preview_4.models<azure.ai.textanalytics.v3_1_preview_4.models>`
"""
if api_version == 'v3.0':
from ..v3_0 import models
return models
elif api_version == 'v3.1-preview.3':
from ..v3_1_preview_3 import models
return models
elif api_version == 'v3.1-preview.4':
from ..v3_1_preview_4 import models
return models
raise ValueError("API version {} is not available".format(api_version))

async def close(self):
Expand Down
Loading