From dcc203a5256cda902c703384b0517c90cad05af7 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Wed, 8 Jan 2020 11:35:26 -0800 Subject: [PATCH 1/4] update ci.yml to include nspkg --- sdk/textanalytics/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/textanalytics/ci.yml b/sdk/textanalytics/ci.yml index 3501e6dab6d7..2382cc404695 100644 --- a/sdk/textanalytics/ci.yml +++ b/sdk/textanalytics/ci.yml @@ -44,3 +44,5 @@ stages: Artifacts: - name: azure_ai_textanalytics safeName: azureaitextanalytics + - name: azure_ai_nspkg + safeName: azureainspkg \ No newline at end of file From 826010e2e16b7f747c4f89301e26c998828e2c51 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Wed, 8 Jan 2020 11:39:15 -0800 Subject: [PATCH 2/4] newline --- sdk/textanalytics/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/textanalytics/ci.yml b/sdk/textanalytics/ci.yml index 2382cc404695..3751732b87d1 100644 --- a/sdk/textanalytics/ci.yml +++ b/sdk/textanalytics/ci.yml @@ -45,4 +45,4 @@ stages: - name: azure_ai_textanalytics safeName: azureaitextanalytics - name: azure_ai_nspkg - safeName: azureainspkg \ No newline at end of file + safeName: azureainspkg From 87a2180f7eaa353cf7fe889cdb08b9a028c9cb3e Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Wed, 8 Jan 2020 12:52:19 -0800 Subject: [PATCH 3/4] add setup.cfg to nspkg --- sdk/textanalytics/azure-ai-nspkg/setup.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sdk/textanalytics/azure-ai-nspkg/setup.cfg diff --git a/sdk/textanalytics/azure-ai-nspkg/setup.cfg b/sdk/textanalytics/azure-ai-nspkg/setup.cfg new file mode 100644 index 000000000000..3c6e79cf31da --- /dev/null +++ b/sdk/textanalytics/azure-ai-nspkg/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 From b4a58cbe8e6b218266c8881142c4aa90ac2d32dd Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Wed, 8 Jan 2020 14:10:29 -0800 Subject: [PATCH 4/4] readme tweaks and fix innererror code returned --- .../azure-ai-textanalytics/README.md | 18 ++++++++++++------ .../ai/textanalytics/_response_handlers.py | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sdk/textanalytics/azure-ai-textanalytics/README.md b/sdk/textanalytics/azure-ai-textanalytics/README.md index 9134d123cb01..9e78097b3b49 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/README.md +++ b/sdk/textanalytics/azure-ai-textanalytics/README.md @@ -195,7 +195,8 @@ documents = [ "The food was yummy. :)" ] -result = text_analytics_client.analyze_sentiment(documents, language="en") +response = text_analytics_client.analyze_sentiment(documents, language="en") +result = [doc for doc in response if not doc.is_error] for doc in result: print("Overall sentiment: {}".format(doc.sentiment)) @@ -222,7 +223,8 @@ documents = [ "Jeff bought three dozen eggs because there was a 50% discount." ] -result = text_analytics_client.recognize_entities(documents, language="en") +response = text_analytics_client.recognize_entities(documents, language="en") +result = [doc for doc in response if not doc.is_error] for doc in result: for entity in doc.entities: @@ -246,7 +248,8 @@ documents = [ "The employee's phone number is 555-55-5555." ] -result = text_analytics_client.recognize_pii_entities(documents, language="en") +response = text_analytics_client.recognize_pii_entities(documents, language="en") +result = [doc for doc in response if not doc.is_error] for doc in result: for entity in doc.entities: @@ -269,7 +272,8 @@ documents = [ "Easter Island, a Chilean territory, is a remote volcanic island in Polynesia." ] -result = text_analytics_client.recognize_linked_entities(documents, language="en") +response = text_analytics_client.recognize_linked_entities(documents, language="en") +result = [doc for doc in response if not doc.is_error] for doc in result: for entity in doc.entities: @@ -299,7 +303,8 @@ documents = [ "I will travel to South America in the summer." ] -result = text_analytics_client.extract_key_phrases(documents, language="en") +response = text_analytics_client.extract_key_phrases(documents, language="en") +result = [doc for doc in response if not doc.is_error] for doc in result: print(doc.key_phrases) @@ -321,7 +326,8 @@ documents = [ "Dies ist in englischer Sprache verfasst." ] -result = text_analytics_client.detect_languages(documents) +response = text_analytics_client.detect_languages(documents) +result = [doc for doc in response if not doc.is_error] for doc in result: print("Language detected: {}".format(doc.primary_language.name)) diff --git a/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_response_handlers.py b/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_response_handlers.py index 8aeef866424a..e6e5e879177b 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_response_handlers.py +++ b/sdk/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_response_handlers.py @@ -34,7 +34,7 @@ def process_single_error(error): """ try: error_message = error.error["inner_error"]["message"] - error_code = error.error["code"] + error_code = error.error["inner_error"]["code"] error_message += "\nErrorCode:{}".format(error_code) except KeyError: raise HttpResponseError(message="There was an unknown error with the request.")