From ff9658482b3cb5c032450cb313cfd7b3b499c6fa Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Mon, 1 Nov 2021 12:12:40 -0700 Subject: [PATCH 1/4] update release date --- sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md index 6dcaf7fd79d6..3c131076ce5e 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md +++ b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 5.2.0b2 (Unreleased) +## 5.2.0b2 (2021-11-02) This version of the SDK defaults to the latest supported API version, which currently is `v3.2-preview.2`. @@ -10,8 +10,6 @@ This version of the SDK defaults to the latest supported API version, which curr - Added support for Custom Multi Classification through the `begin_analyze_actions` API with the `MultiCategoryClassifyAction` and `MultiCategoryClassifyActionResult` types. - Multiple of the same action type is now supported with `begin_analyze_actions`. -### Breaking Changes - ### Bugs Fixed - Restarting a long-running operation from a saved state is now supported for the `begin_analyze_actions` and `begin_recognize_healthcare_entities` methods. - In the event of an action level error, available partial results are now returned for any successful actions in `begin_analyze_actions`. From 88cf7a64b62ae30d6a4fefe4a3560678a28257d0 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Mon, 1 Nov 2021 12:12:51 -0700 Subject: [PATCH 2/4] update sample descriptions --- .../async_samples/sample_multi_category_classify_async.py | 8 +++++--- .../sample_recognize_custom_entities_async.py | 3 ++- .../sample_single_category_classify_async.py | 8 +++++--- .../samples/sample_multi_category_classify.py | 8 +++++--- .../samples/sample_recognize_custom_entities.py | 3 ++- .../samples/sample_single_category_classify.py | 8 +++++--- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py index 44f8943c17af..d6d2bfc08869 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py +++ b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_multi_category_classify_async.py @@ -11,10 +11,12 @@ DESCRIPTION: This sample demonstrates how to classify documents into multiple custom categories. For example, - movie plot summaries can be categorized into multiple movie genres like Sci-Fi and Horror, or Comedy and Romance, etc. - Classifying documents is available as an action type through the begin_analyze_actions API. + movie plot summaries can be categorized into multiple movie genres like "Action" and "Thriller", + or "Comedy" and "Drama", etc. Classifying documents is available as an action type through + the begin_analyze_actions API. - To train a model to classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities + For information on regional support of custom features and how to train a model to + classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities USAGE: python sample_multi_category_classify_async.py diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py index d930663d4276..8bcd5cc32eaf 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py +++ b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_recognize_custom_entities_async.py @@ -13,7 +13,8 @@ This sample demonstrates how to recognize custom entities in documents. Recognizing custom entities is available as an action type through the begin_analyze_actions API. - To train a model to recognize your custom entities, see https://aka.ms/azsdk/textanalytics/customentityrecognition + For information on regional support of custom features and how to train a model to + recognize custom entities, see https://aka.ms/azsdk/textanalytics/customentityrecognition USAGE: python sample_recognize_custom_entities_async.py diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py index e55f38d3b54f..e8ca2333c316 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py +++ b/sdk/textanalytics/azure-ai-textanalytics/samples/async_samples/sample_single_category_classify_async.py @@ -11,10 +11,12 @@ DESCRIPTION: This sample demonstrates how to classify documents into a single custom category. For example, - movie plot summaries can be categorized into a single movie genre like Sci-Fi, Horror, Comedy, Romance, etc. - Classifying documents is available as an action type through the begin_analyze_actions API. + movie plot summaries can be categorized into a single movie genre like "Mystery", "Drama", "Thriller", + "Comedy", "Action", etc. Classifying documents is available as an action type through + the begin_analyze_actions API. - To train a model to classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities + For information on regional support of custom features and how to train a model to + classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities USAGE: python sample_single_category_classify_async.py diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py index 3f191c7eda83..8487bda97f0a 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py +++ b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_multi_category_classify.py @@ -11,10 +11,12 @@ DESCRIPTION: This sample demonstrates how to classify documents into multiple custom categories. For example, - movie plot summaries can be categorized into multiple movie genres like Sci-Fi and Horror, or Comedy and Romance, etc. - Classifying documents is available as an action type through the begin_analyze_actions API. + movie plot summaries can be categorized into multiple movie genres like "Action" and "Thriller", + or "Comedy" and "Drama", etc. Classifying documents is available as an action type through + the begin_analyze_actions API. - To train a model to classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities + For information on regional support of custom features and how to train a model to + classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities USAGE: python sample_multi_category_classify.py diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py index e23f6b1ebc3f..579a603947fa 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py +++ b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_recognize_custom_entities.py @@ -13,7 +13,8 @@ This sample demonstrates how to recognize custom entities in documents. Recognizing custom entities is available as an action type through the begin_analyze_actions API. - To train a model to recognize your custom entities, see https://aka.ms/azsdk/textanalytics/customentityrecognition + For information on regional support of custom features and how to train a model to + recognize custom entities, see https://aka.ms/azsdk/textanalytics/customentityrecognition USAGE: python sample_recognize_custom_entities.py diff --git a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py index cc4d62b1b495..0d6f460dd9b9 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py +++ b/sdk/textanalytics/azure-ai-textanalytics/samples/sample_single_category_classify.py @@ -11,10 +11,12 @@ DESCRIPTION: This sample demonstrates how to classify documents into a single custom category. For example, - movie plot summaries can be categorized into a single movie genre like Sci-Fi, Horror, Comedy, Romance, etc. - Classifying documents is available as an action type through the begin_analyze_actions API. + movie plot summaries can be categorized into a single movie genre like "Mystery", "Drama", "Thriller", + "Comedy", "Action", etc. Classifying documents is available as an action type through + the begin_analyze_actions API. - To train a model to classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities + For information on regional support of custom features and how to train a model to + classify your documents, see https://aka.ms/azsdk/textanalytics/customfunctionalities USAGE: python sample_single_category_classify.py From 8ba1140df1335919e14eba33b9b0d1a028bdbded Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Mon, 1 Nov 2021 12:16:02 -0700 Subject: [PATCH 3/4] update swagger readme --- sdk/textanalytics/azure-ai-textanalytics/swagger/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md b/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md index f236cba560fd..fef874b4004a 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md +++ b/sdk/textanalytics/azure-ai-textanalytics/swagger/README.md @@ -46,7 +46,7 @@ perform-load: false These settings apply only when `--tag=release_3_0` is specified on the command line. ```yaml $(tag) == 'release_3_0' -input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification/cognitiveservices/data-plane/TextAnalytics/stable/v3.0/TextAnalytics.json +input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cognitiveservices/data-plane/TextAnalytics/stable/v3.0/TextAnalytics.json namespace: azure.ai.textanalytics.v3_0 output-folder: $(python-sdks-folder)/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_0 ``` @@ -56,7 +56,7 @@ output-folder: $(python-sdks-folder)/textanalytics/azure-ai-textanalytics/azure/ These settings apply only when `--tag=release_3_1` is specified on the command line. ```yaml $(tag) == 'release_3_1' -input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification/cognitiveservices/data-plane/TextAnalytics/stable/v3.1/TextAnalytics.json +input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cognitiveservices/data-plane/TextAnalytics/stable/v3.1/TextAnalytics.json namespace: azure.ai.textanalytics.v3_1 output-folder: $(python-sdks-folder)/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_1 ``` @@ -66,7 +66,7 @@ output-folder: $(python-sdks-folder)/textanalytics/azure-ai-textanalytics/azure/ These settings apply only when `--tag=release_3_2_preview.2` is specified on the command line. ```yaml $(tag) == 'release_3_2_preview.2' -input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/71c9d235dab9206194691d083f0248c8613e2e17/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.2-preview.2/TextAnalytics.json +input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.2-preview.2/TextAnalytics.json namespace: azure.ai.textanalytics.v3_2_preview_2 output-folder: $(python-sdks-folder)/textanalytics/azure-ai-textanalytics/azure/ai/textanalytics/_generated/v3_2_preview_2 ``` From 38b88704b01e9f97ee8128d011c89d91c13407dd Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Mon, 1 Nov 2021 16:18:20 -0700 Subject: [PATCH 4/4] bump azure-core --- sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md | 2 +- sdk/textanalytics/azure-ai-textanalytics/setup.py | 2 +- shared_requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md index 3c131076ce5e..fe86a940fecb 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md +++ b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md @@ -15,7 +15,7 @@ This version of the SDK defaults to the latest supported API version, which curr - In the event of an action level error, available partial results are now returned for any successful actions in `begin_analyze_actions`. ### Other Changes -- Package requires [azure-core](https://pypi.org/project/azure-core/) version 1.16.0 or greater +- Package requires [azure-core](https://pypi.org/project/azure-core/) version 1.19.1 or greater ## 5.2.0b1 (2021-08-09) diff --git a/sdk/textanalytics/azure-ai-textanalytics/setup.py b/sdk/textanalytics/azure-ai-textanalytics/setup.py index 5cc1787da551..b3850e6a5409 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/setup.py +++ b/sdk/textanalytics/azure-ai-textanalytics/setup.py @@ -80,7 +80,7 @@ 'azure.ai', ]), install_requires=[ - "azure-core<2.0.0,>=1.16.0", + "azure-core<2.0.0,>=1.19.1", "msrest>=0.6.21", 'azure-common~=1.1', 'six>=1.11.0', diff --git a/shared_requirements.txt b/shared_requirements.txt index c329fe2b3efc..09fd92bdc815 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -150,7 +150,7 @@ backports.functools-lru-cache >= 1.6.4; python_version == "2.7" #override azure-keyvault-keys azure-core<2.0.0,>=1.7.0 #override azure-keyvault-secrets azure-core<2.0.0,>=1.7.0 #override azure-ai-textanalytics msrest>=0.6.21 -#override azure-ai-textanalytics azure-core<2.0.0,>=1.16.0 +#override azure-ai-textanalytics azure-core<2.0.0,>=1.19.1 #override azure-ai-language-questionanswering azure-core<2.0.0,>=1.19.0 #override azure-ai-language-questionanswering msrest>=0.6.21 #override azure-search-documents azure-core<2.0.0,>=1.19.0