update api version enum (#14254)

Azure · Oct 5, 2020 · 0c2e175 · 0c2e175
1 parent 82188ac
commit 0c2e175
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_api_versions.py b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_api_versions.py
@@ -10,7 +10,7 @@ class FormRecognizerApiVersion(str, Enum):
     """Form Recognizer API versions supported by this package"""
 
     #: this is the default version
-    V2_1_PREVIEW_1 = "2.1-preview.1"
+    V2_1_PREVIEW = "2.1-preview.1"
     V2_0 = "2.0"
 
 

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_form_base_client.py b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_form_base_client.py
@@ -24,11 +24,11 @@ def __init__(self, endpoint, credential, **kwargs):
         # type: (str, Union[AzureKeyCredential, TokenCredential], Any) -> None
         self._endpoint = endpoint
         self._credential = credential
-        self.api_version = kwargs.pop('api_version', FormRecognizerApiVersion.V2_1_PREVIEW_1)
+        self.api_version = kwargs.pop('api_version', FormRecognizerApiVersion.V2_1_PREVIEW)
+        validate_api_version(self.api_version)
 
         authentication_policy = get_authentication_policy(credential)
         polling_interval = kwargs.pop("polling_interval", POLLING_INTERVAL)
-        validate_api_version(self.api_version)
 
         http_logging_policy = HttpLoggingPolicy(**kwargs)
         http_logging_policy.allowed_header_names.update(

diff --git a/...recognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_form_base_client_async.py b/...recognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_form_base_client_async.py
@@ -29,11 +29,11 @@ def __init__(
     ) -> None:
         self._endpoint = endpoint
         self._credential = credential
-        self.api_version = kwargs.pop('api_version', FormRecognizerApiVersion.V2_1_PREVIEW_1)
+        self.api_version = kwargs.pop('api_version', FormRecognizerApiVersion.V2_1_PREVIEW)
+        validate_api_version(self.api_version)
 
         authentication_policy = get_authentication_policy(credential)
         polling_interval = kwargs.pop("polling_interval", POLLING_INTERVAL)
-        validate_api_version(self.api_version)
 
         http_logging_policy = HttpLoggingPolicy(**kwargs)
         http_logging_policy.allowed_header_names.update(

diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi.py
@@ -36,11 +36,11 @@ def test_v2_0_form_training_client(self, client):
         assert "v2.0" in client._client._client._base_url
 
     @GlobalFormRecognizerAccountPreparer()
-    @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW_1})
+    @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW})
     def test_v2_1_preview_1_form_recognizer_client(self, client):
         assert "v2.1-preview.1" in client._client._client._base_url
 
     @GlobalFormRecognizerAccountPreparer()
-    @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW_1})
+    @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW})
     def test_v2_1_preview_1_form_training_client(self, client):
         assert "v2.1-preview.1" in client._client._client._base_url
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi_async.py
@@ -37,11 +37,11 @@ def test_v2_0_form_training_client(self, client):
         assert "v2.0" in client._client._client._base_url
 
     @GlobalFormRecognizerAccountPreparer()
-    @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW_1})
+    @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW})
     def test_v2_1_preview_1_form_recognizer_client(self, client):
         assert "v2.1-preview.1" in client._client._client._base_url
 
     @GlobalFormRecognizerAccountPreparer()
-    @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW_1})
+    @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1_PREVIEW})
     def test_v2_1_preview_1_form_training_client(self, client):
         assert "v2.1-preview.1" in client._client._client._base_url