[text analytics] generate multiapi client, made v3.1-preview.1 default version

sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 1.0.1 (Unreleased)
 
+- 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,
+pass in `v3.0` to the kwarg `api_version` when creating your TextAnalyticsClient
 
 ## 1.0.0 (2020-06-09)
 

sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/__init__.py

@@ -6,7 +6,7 @@
 
 from ._text_analytics_client import TextAnalyticsClient
 from ._version import VERSION
-from ._multiapi import ApiVersion
+from ._base_client import ApiVersion
 from ._models import (
     DetectLanguageInput,
     TextDocumentInput,

sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_base_client.py

@@ -3,12 +3,19 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
-
+from enum import Enum
 from azure.core.pipeline.policies import AzureKeyCredentialPolicy
 from azure.core.credentials import AzureKeyCredential
+from ._generated import TextAnalyticsClient as _TextAnalyticsClient
 from ._policies import TextAnalyticsResponseHookPolicy
 from ._user_agent import USER_AGENT
-from ._multiapi import load_generated_api
+
+class ApiVersion(str, Enum):
+    """Text Analytics API versions supported by this package"""
+
+    #: this is the default version
+    V3_1_PREVIEW_1 = "v3.1-preview.1"
+    V3_0 = "v3.0"
 
 def _authentication_policy(credential):
     authentication_policy = None
@@ -26,11 +33,10 @@ def _authentication_policy(credential):
 
 class TextAnalyticsClientBase(object):
     def __init__(self, endpoint, credential, **kwargs):
-        api_version = kwargs.pop("api_version", None)
-        _TextAnalyticsClient = load_generated_api(api_version)
         self._client = _TextAnalyticsClient(
             endpoint=endpoint,
             credential=credential,
+            api_version=kwargs.pop("api_version", ApiVersion.V3_1_PREVIEW_1),
             sdk_moniker=USER_AGENT,
             authentication_policy=_authentication_policy(credential),
             custom_hook_policy=TextAnalyticsResponseHookPolicy(**kwargs),

sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/__init__.py

@@ -1,5 +1,16 @@
 # coding=utf-8
-# ------------------------------------
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-# ------------------------------------
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from ._text_analytics_client import TextAnalyticsClient
+__all__ = ['TextAnalyticsClient']
+
+try:
+    from ._patch import patch_sdk  # type: ignore
+    patch_sdk()
+except ImportError:
+    pass

sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/_configuration.py

@@ -0,0 +1,66 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+from typing import Any
+
+from azure.core.configuration import Configuration
+from azure.core.pipeline import policies
+
+from ._version import VERSION
+
+
+class TextAnalyticsClientConfiguration(Configuration):
+    """Configuration for TextAnalyticsClient.
+
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credential: Credential needed for the client to connect to Azure.
+    :type credential: ~azure.core.credentials.TokenCredential
+    :param endpoint: Supported Cognitive Services endpoints (protocol and hostname, for example: https://westus.api.cognitive.microsoft.com).
+    :type endpoint: str
+    """
+
+    def __init__(
+        self,
+        credential,  # type: "TokenCredential"
+        endpoint,  # type: str
+        **kwargs  # type: Any
+    ):
+        # type: (...) -> None
+        if credential is None:
+            raise ValueError("Parameter 'credential' must not be None.")
+        if endpoint is None:
+            raise ValueError("Parameter 'endpoint' must not be None.")
+        super(TextAnalyticsClientConfiguration, self).__init__(**kwargs)
+
+        self.credential = credential
+        self.endpoint = endpoint
+        self.credential_scopes = ['https://cognitiveservices.azure.com/.default']
+        self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
+        kwargs.setdefault('sdk_moniker', 'azure-ai-textanalytics/{}'.format(VERSION))
+        self._configure(**kwargs)
+
+    def _configure(
+        self,
+        **kwargs  # type: Any
+    ):
+        # type: (...) -> None
+        self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
+        self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
+        self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get('http_logging_policy') or policies.HttpLoggingPolicy(**kwargs)
+        self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
+        self.authentication_policy = kwargs.get('authentication_policy')
+        if self.credential and not self.authentication_policy:
+            self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)