From 278792363c16bccd9631b129c1c51c3c8f246324 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 27 Sep 2019 12:54:06 -0700 Subject: [PATCH 1/3] allow cog key pass in headers --- .../cognitiveservices_testcase.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py b/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py index 8f43e6ef36d5..85fa049f69b4 100644 --- a/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py @@ -33,6 +33,7 @@ def __init__(self, name_prefix='', sku='S0', location='westus', kind='cognitiveservices', parameter_name='cognitiveservices_account', + use_core=False, resource_group_parameter_name=RESOURCE_GROUP_PARAM, disable_recording=True, playback_fake_resource=None, client_kwargs=None): @@ -46,6 +47,7 @@ def __init__(self, self.resource_group_parameter_name = resource_group_parameter_name self.parameter_name = parameter_name self.cogsci_key = '' + self.use_core = use_core def create_resource(self, name, **kwargs): if self.is_live: @@ -62,17 +64,24 @@ def create_resource(self, name, **kwargs): 'properties': {} } ) - time.sleep(5) # it takes a few seconds to create a cognitive services account + time.sleep(10) # it takes a few seconds to create a cognitive services account self.resource = cogsci_account self.cogsci_key = self.client.accounts.list_keys(group.name, name).key1 # FIXME: LuisAuthoringClient and LuisRuntimeClient need authoring key from ARM API (coming soon-ish) else: self.resource = FakeCognitiveServicesAccount("https://{}.api.cognitive.microsoft.com".format(self.location)) self.cogsci_key = 'ZmFrZV9hY29jdW50X2tleQ==' - return { - self.parameter_name: self.resource.endpoint, - '{}_key'.format(self.parameter_name): CognitiveServicesCredentials(self.cogsci_key), - } + + if self.use_core: + return { + self.parameter_name: self.resource.endpoint, + '{}_key'.format(self.parameter_name): self.cogsci_key, + } + else: + return { + self.parameter_name: self.resource.endpoint, + '{}_key'.format(self.parameter_name): CognitiveServicesCredentials(self.cogsci_key), + } def remove_resource(self, name, **kwargs): if self.is_live: From af9d8802b82f1ae285ab7bf5f3ba7669909cd832 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 27 Sep 2019 13:15:39 -0700 Subject: [PATCH 2/3] change param to legacy --- .../devtools_testutils/cognitiveservices_testcase.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py b/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py index 85fa049f69b4..cea00a74982d 100644 --- a/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/cognitiveservices_testcase.py @@ -33,7 +33,7 @@ def __init__(self, name_prefix='', sku='S0', location='westus', kind='cognitiveservices', parameter_name='cognitiveservices_account', - use_core=False, + legacy=False, resource_group_parameter_name=RESOURCE_GROUP_PARAM, disable_recording=True, playback_fake_resource=None, client_kwargs=None): @@ -47,7 +47,7 @@ def __init__(self, self.resource_group_parameter_name = resource_group_parameter_name self.parameter_name = parameter_name self.cogsci_key = '' - self.use_core = use_core + self.legacy = legacy def create_resource(self, name, **kwargs): if self.is_live: @@ -72,15 +72,15 @@ def create_resource(self, name, **kwargs): self.resource = FakeCognitiveServicesAccount("https://{}.api.cognitive.microsoft.com".format(self.location)) self.cogsci_key = 'ZmFrZV9hY29jdW50X2tleQ==' - if self.use_core: + if self.legacy: return { self.parameter_name: self.resource.endpoint, - '{}_key'.format(self.parameter_name): self.cogsci_key, + '{}_key'.format(self.parameter_name): CognitiveServicesCredentials(self.cogsci_key), } else: return { self.parameter_name: self.resource.endpoint, - '{}_key'.format(self.parameter_name): CognitiveServicesCredentials(self.cogsci_key), + '{}_key'.format(self.parameter_name): self.cogsci_key, } def remove_resource(self, name, **kwargs): From 2e9cd341167a818e2d5c9c15826ac33750689703 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 27 Sep 2019 13:58:15 -0700 Subject: [PATCH 3/3] adding legacy param to text analytics test --- .../test_text_analytics.test_detect_language.yaml | 8 ++++---- .../tests/test_text_analytics.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/recordings/test_text_analytics.test_detect_language.yaml b/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/recordings/test_text_analytics.test_detect_language.yaml index 8efeb74965bb..5f2c884e3c45 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/recordings/test_text_analytics.test_detect_language.yaml +++ b/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/recordings/test_text_analytics.test_detect_language.yaml @@ -14,7 +14,7 @@ interactions: Content-Type: - application/json; charset=utf-8 User-Agent: - - python/3.7.3 (Windows-10-10.0.18362-SP0) msrest/0.6.6 azure-cognitiveservices-language-textanalytics/0.2.0 + - python/3.7.3 (Windows-10-10.0.18362-SP0) msrest/0.6.10 azure-cognitiveservices-language-textanalytics/0.2.0 X-BingApis-SDK-Client: - Python-SDK method: POST @@ -24,19 +24,19 @@ interactions: string: '{"documents":[{"id":"1","detectedLanguages":[{"name":"English","iso6391Name":"en","score":1.0}]}],"errors":[]}' headers: apim-request-id: - - 79422b97-439d-4042-b2ca-0053d00770d3 + - 99652aa4-e000-4263-adf2-920d0e1f5d6f content-type: - application/json; charset=utf-8 csp-billing-usage: - CognitiveServices.TextAnalytics.BatchScoring|1 date: - - Mon, 09 Sep 2019 21:55:42 GMT + - Fri, 27 Sep 2019 20:56:30 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload transfer-encoding: - chunked x-aml-ta-request-id: - - f34d7b3c-5552-4b8e-89e0-164e129c66ac + - 97c455bd-bbb0-4b2b-bce2-1cdde2439e50 x-content-type-options: - nosniff x-ms-transaction-count: diff --git a/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/test_text_analytics.py b/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/test_text_analytics.py index 19a79954b0c5..be63b3fca408 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/test_text_analytics.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/tests/test_text_analytics.py @@ -18,7 +18,7 @@ class TextAnalyticsTest(CognitiveServiceTest): @ResourceGroupPreparer() - @CognitiveServicesAccountPreparer(name_prefix="pycog") + @CognitiveServicesAccountPreparer(name_prefix="pycog", legacy=True) def test_detect_language(self, resource_group, location, cognitiveservices_account, cognitiveservices_account_key): text_analytics = TextAnalyticsClient(cognitiveservices_account, cognitiveservices_account_key)