[text analytics] default to v3.1-preview.2, have it listed under enum…

… V3_1_PREVIEW (#13708)
Azure · Sep 10, 2020 · a866f59 · a866f59
1 parent bbcc72f
commit a866f59
Show file tree

Hide file tree

Showing 519 changed files with 2,952 additions and 7,870 deletions.
diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
@@ -3,16 +3,15 @@
 ## 5.1.0b1 (Unreleased)
 
 **New features**
-- We are now targeting the service's v3.1-preview.1 API as the default. If you would like to still use version v3.0 of the service,
+- We are now targeting the service's v3.1-preview API as the default. If you would like to still use version v3.0 of the service,
 pass in `v3.0` to the kwarg `api_version` when creating your TextAnalyticsClient
-- We have added an API `recognize_pii_entities` which returns entities containing personal information for a batch of documents. Only available for API version v3.1-preview.1 and up.
-  - In API version v3.1-preview.2 and up, the redacted text of the document is returned on the top-level result object `RecognizePiiEntitiesResult` through property `redacted_text`.
-- Added `offset` and `length` properties for `CategorizedEntity`, `SentenceSentiment`, and `LinkedEntityMatch`. These properties are only available for API versions v3.1-preview.1 and up.
+- We have added an API `recognize_pii_entities` which returns entities containing personally identifiable information for a batch of documents. Only available for API version v3.1-preview and up.
+- Added `offset` and `length` properties for `CategorizedEntity`, `SentenceSentiment`, and `LinkedEntityMatch`. These properties are only available for API versions v3.1-preview and up.
   - `length` is the number of characters in the text of these models
   - `offset` is the offset of the text from the start of the document
 - We now have added support for opinion mining. To use this feature, you need to make sure you are using the service's
-v3.1-preview.1 API. To get this support pass `show_opinion_mining` as True when calling the `analyze_sentiment` endpoint
-- Add property `bing_entity_search_api_id` to the `LinkedEntity` class. This property is only available for v3.1-preview.2 and up, and it is to be
+v3.1-preview API. To get this support pass `show_opinion_mining` as True when calling the `analyze_sentiment` endpoint
+- Add property `bing_entity_search_api_id` to the `LinkedEntity` class. This property is only available for v3.1-preview and up, and it is to be
 used in conjunction with the Bing Entity Search API to fetch additional relevant information about the returned entity.
 
 ## 5.0.0 (2020-07-27)

diff --git a/sdk/textanalytics/azure-ai-textanalytics/README.md b/sdk/textanalytics/azure-ai-textanalytics/README.md
@@ -305,7 +305,7 @@ and [supported types][linked_entities_categories].
 
 ### Recognize PII entities
 [recognize_pii_entities][recognize_pii_entities] recognizes and categorizes Personally Identifiable Information (PII) entities in its input text, such as
-Social Security Numbers, bank account information, credit card numbers, and more. This endpoint is only available for v3.1-preview.1 and up.
+Social Security Numbers, bank account information, credit card numbers, and more. This endpoint is only available for v3.1-preview and up.
 
 ```python
 from azure.core.credentials import AzureKeyCredential

diff --git a/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_base_client.py b/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_base_client.py
@@ -14,11 +14,7 @@ class TextAnalyticsApiVersion(str, Enum):
     """Text Analytics API versions supported by this package"""
 
     #: this is the default version
-    V3_1_PREVIEW_1 = "v3.1-preview.1"
-
-    # 3.1-preview.2 is not yet the default version since we don't have a
-    # reliable endpoint
-    V3_1_PREVIEW_2 = "v3.1-preview.2"
+    V3_1_PREVIEW = "v3.1-preview.2"
     V3_0 = "v3.0"
 
 def _authentication_policy(credential):
@@ -40,7 +36,7 @@ def __init__(self, endpoint, credential, **kwargs):
         self._client = _TextAnalyticsClient(
             endpoint=endpoint,
             credential=credential,
-            api_version=kwargs.pop("api_version", TextAnalyticsApiVersion.V3_1_PREVIEW_1),
+            api_version=kwargs.pop("api_version", TextAnalyticsApiVersion.V3_1_PREVIEW),
             sdk_moniker=USER_AGENT,
             authentication_policy=_authentication_policy(credential),
             custom_hook_policy=TextAnalyticsResponseHookPolicy(**kwargs),

diff --git a/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/aio/__init__.py b/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/aio/__init__.py
@@ -6,5 +6,5 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._text_analytics_client_async import TextAnalyticsClient
+from ._text_analytics_client import TextAnalyticsClient
 __all__ = ['TextAnalyticsClient']
diff --git a/...cs/_generated/aio/_configuration_async.py → ...nalytics/_generated/aio/_configuration.py b/...cs/_generated/aio/_configuration_async.py → ...nalytics/_generated/aio/_configuration.py
diff --git a/..._generated/aio/_operations_mixin_async.py → ...ytics/_generated/aio/_operations_mixin.py b/..._generated/aio/_operations_mixin_async.py → ...ytics/_generated/aio/_operations_mixin.py
@@ -47,11 +47,11 @@ async def entities_linking(
         """
         api_version = self._get_api_version('entities_linking')
         if api_version == 'v3.0':
-            from ..v3_0.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.1':
-            from ..v3_1_preview_1.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_1.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.2':
-            from ..v3_1_preview_2.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_2.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         mixin_instance = OperationClass()
@@ -90,11 +90,11 @@ async def entities_recognition_general(
         """
         api_version = self._get_api_version('entities_recognition_general')
         if api_version == 'v3.0':
-            from ..v3_0.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.1':
-            from ..v3_1_preview_1.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_1.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.2':
-            from ..v3_1_preview_2.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_2.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         mixin_instance = OperationClass()
@@ -142,9 +142,9 @@ async def entities_recognition_pii(
         """
         api_version = self._get_api_version('entities_recognition_pii')
         if api_version == 'v3.1-preview.1':
-            from ..v3_1_preview_1.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_1.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.2':
-            from ..v3_1_preview_2.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_2.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         mixin_instance = OperationClass()
@@ -182,11 +182,11 @@ async def key_phrases(
         """
         api_version = self._get_api_version('key_phrases')
         if api_version == 'v3.0':
-            from ..v3_0.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.1':
-            from ..v3_1_preview_1.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_1.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.2':
-            from ..v3_1_preview_2.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_2.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         mixin_instance = OperationClass()
@@ -225,11 +225,11 @@ async def languages(
         """
         api_version = self._get_api_version('languages')
         if api_version == 'v3.0':
-            from ..v3_0.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.1':
-            from ..v3_1_preview_1.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_1.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.2':
-            from ..v3_1_preview_2.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_2.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         mixin_instance = OperationClass()
@@ -268,11 +268,11 @@ async def sentiment(
         """
         api_version = self._get_api_version('sentiment')
         if api_version == 'v3.0':
-            from ..v3_0.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_0.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.1':
-            from ..v3_1_preview_1.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_1.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         elif api_version == 'v3.1-preview.2':
-            from ..v3_1_preview_2.aio.operations_async import TextAnalyticsClientOperationsMixin as OperationClass
+            from ..v3_1_preview_2.aio.operations import TextAnalyticsClientOperationsMixin as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         mixin_instance = OperationClass()

diff --git a/...rated/aio/_text_analytics_client_async.py → .../_generated/aio/_text_analytics_client.py b/...rated/aio/_text_analytics_client_async.py → .../_generated/aio/_text_analytics_client.py
@@ -14,8 +14,8 @@
 
 from azure.profiles import KnownProfiles, ProfileDefinition
 from azure.profiles.multiapiclient import MultiApiClientMixin
-from ._configuration_async import TextAnalyticsClientConfiguration
-from ._operations_mixin_async import TextAnalyticsClientOperationsMixin
+from ._configuration import TextAnalyticsClientConfiguration
+from ._operations_mixin import TextAnalyticsClientOperationsMixin
 class _SDKClient(object):
     def __init__(self, *args, **kwargs):
         """This is a fake class to support current implemetation of MultiApiClientMixin."

diff --git a/...xtanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_0/aio/__init__.py b/...xtanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_0/aio/__init__.py
@@ -6,5 +6,5 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._text_analytics_client_async import TextAnalyticsClient
+from ._text_analytics_client import TextAnalyticsClient
 __all__ = ['TextAnalyticsClient']
diff --git a/...enerated/v3_0/aio/_configuration_async.py → ...ics/_generated/v3_0/aio/_configuration.py b/...enerated/v3_0/aio/_configuration_async.py → ...ics/_generated/v3_0/aio/_configuration.py
diff --git a/.../v3_0/aio/_text_analytics_client_async.py → ...erated/v3_0/aio/_text_analytics_client.py b/.../v3_0/aio/_text_analytics_client_async.py → ...erated/v3_0/aio/_text_analytics_client.py
@@ -15,8 +15,8 @@
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
-from ._configuration_async import TextAnalyticsClientConfiguration
-from .operations_async import TextAnalyticsClientOperationsMixin
+from ._configuration import TextAnalyticsClientConfiguration
+from .operations import TextAnalyticsClientOperationsMixin
 from .. import models
 
 

diff --git a/...ted/v3_1_preview_1/operations/__init__.py → ...generated/v3_0/aio/operations/__init__.py b/...ted/v3_1_preview_1/operations/__init__.py → ...generated/v3_0/aio/operations/__init__.py
diff --git a/...text_analytics_client_operations_async.py → ...ions/_text_analytics_client_operations.py b/...text_analytics_client_operations_async.py → ...ions/_text_analytics_client_operations.py
diff --git a/...-ai-textanalytics/azure/ai/textanalytics/_generated/v3_0/aio/operations_async/__init__.py b/...-ai-textanalytics/azure/ai/textanalytics/_generated/v3_0/aio/operations_async/__init__.py
diff --git a/...ytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_1_preview_1/__init__.py b/...ytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_1_preview_1/__init__.py
diff --git a/...azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_1_preview_1/_configuration.py b/...azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_1_preview_1/_configuration.py