From 05c8dc8acf644db055c62b362b582d75b400609c Mon Sep 17 00:00:00 2001 From: annatisch Date: Tue, 2 Nov 2021 14:16:10 -0700 Subject: [PATCH] [QnA][CLU] Release prep (#21518) * Added release date * Bump core version * Fix async samples * Bug in setup.py --- .../azure-ai-language-conversations/CHANGELOG.md | 2 +- .../sample_analyze_conversation_app_language_parm_async.py | 4 ++-- ...analyze_orchestration_app_conversation_response_async.py | 4 ++-- .../sample_analyze_orchestration_app_luis_response_async.py | 4 ++-- .../sample_analyze_orchestration_app_qna_response_async.py | 4 ++-- .../azure-ai-language-conversations/setup.py | 6 +++++- .../azure-ai-language-questionanswering/CHANGELOG.md | 2 +- .../azure-ai-language-questionanswering/setup.py | 2 +- shared_requirements.txt | 4 ++-- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md b/sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md index f0d9f184e050..a136c4c50b05 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.0b1 (unreleased) +## 1.0.0b1 (2021-11-03) ### Features Added * Initial release diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_conversation_app_language_parm_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_conversation_app_language_parm_async.py index 28ce5f347867..835035df43f3 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_conversation_app_language_parm_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_conversation_app_language_parm_async.py @@ -30,7 +30,7 @@ async def sample_analyze_conversation_app_language_parm_async(): import os from azure.core.credentials import AzureKeyCredential - from azure.ai.language.conversations import ConversationAnalysisClient + from azure.ai.language.conversations.aio import ConversationAnalysisClient from azure.ai.language.conversations.models import ConversationAnalysisOptions # get secrets @@ -48,7 +48,7 @@ async def sample_analyze_conversation_app_language_parm_async(): # analyze quey client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key)) async with client: - result = client.analyze_conversations( + result = await client.analyze_conversations( input, project_name=conv_project, deployment_name='production' diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_conversation_response_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_conversation_response_async.py index 5b0acd521099..dd34d5352c02 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_conversation_response_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_conversation_response_async.py @@ -30,7 +30,7 @@ async def sample_analyze_orchestration_app_conversation_response_async(): import os from azure.core.credentials import AzureKeyCredential - from azure.ai.language.conversations import ConversationAnalysisClient + from azure.ai.language.conversations.aio import ConversationAnalysisClient from azure.ai.language.conversations.models import ConversationAnalysisOptions # get secrets @@ -47,7 +47,7 @@ async def sample_analyze_orchestration_app_conversation_response_async(): # analyze query client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key)) async with client: - result = client.analyze_conversations( + result = await client.analyze_conversations( input, project_name=orchestration_project, deployment_name='production', diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_luis_response_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_luis_response_async.py index c767930f43b8..428c32769edd 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_luis_response_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_luis_response_async.py @@ -30,7 +30,7 @@ async def sample_analyze_orchestration_app_luis_response_async(): import os from azure.core.credentials import AzureKeyCredential - from azure.ai.language.conversations import ConversationAnalysisClient + from azure.ai.language.conversations.aio import ConversationAnalysisClient from azure.ai.language.conversations.models import ConversationAnalysisOptions # get secrets @@ -47,7 +47,7 @@ async def sample_analyze_orchestration_app_luis_response_async(): # analyze query client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key)) async with client: - result = client.analyze_conversations( + result = await client.analyze_conversations( input, project_name=orchestration_project, deployment_name='production', diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_qna_response_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_qna_response_async.py index af197a1df031..017a63b3d9fb 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_qna_response_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/samples/async/sample_analyze_orchestration_app_qna_response_async.py @@ -30,7 +30,7 @@ async def sample_analyze_orchestration_app_qna_response_async(): import os from azure.core.credentials import AzureKeyCredential - from azure.ai.language.conversations import ConversationAnalysisClient + from azure.ai.language.conversations.aio import ConversationAnalysisClient from azure.ai.language.conversations.models import ConversationAnalysisOptions # get secrets @@ -47,7 +47,7 @@ async def sample_analyze_orchestration_app_qna_response_async(): # analyze query client = ConversationAnalysisClient(conv_endpoint, AzureKeyCredential(conv_key)) async with client: - result = client.analyze_conversations( + result = await client.analyze_conversations( input, project_name=orchestration_project, deployment_name='production', diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/setup.py b/sdk/cognitivelanguage/azure-ai-language-conversations/setup.py index 42ec6f386a01..a8c490e51d13 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/setup.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/setup.py @@ -76,11 +76,15 @@ packages=find_packages(exclude=[ 'tests', # Exclude packages that will be covered by PEP420 or nspkg + # This means any folder structure that only consists of a __init__.py. + # For example, for storage, this would mean adding 'azure.storage' + # in addition to the default 'azure' that is seen here. + 'azure', 'azure.ai', 'azure.ai.language', ]), install_requires=[ - "azure-core<2.0.0,>=1.19.0", + "azure-core<2.0.0,>=1.19.1", "msrest>=0.6.21", 'azure-common~=1.1', 'six>=1.11.0', diff --git a/sdk/cognitivelanguage/azure-ai-language-questionanswering/CHANGELOG.md b/sdk/cognitivelanguage/azure-ai-language-questionanswering/CHANGELOG.md index b0ac4a4e7f86..f01da3820557 100644 --- a/sdk/cognitivelanguage/azure-ai-language-questionanswering/CHANGELOG.md +++ b/sdk/cognitivelanguage/azure-ai-language-questionanswering/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.0 (Unreleased) +## 1.0.0 (2021-11-03) * We are now targeting service version `2021-10-01` diff --git a/sdk/cognitivelanguage/azure-ai-language-questionanswering/setup.py b/sdk/cognitivelanguage/azure-ai-language-questionanswering/setup.py index 2f338c1f28c5..35fff0b16aa7 100644 --- a/sdk/cognitivelanguage/azure-ai-language-questionanswering/setup.py +++ b/sdk/cognitivelanguage/azure-ai-language-questionanswering/setup.py @@ -67,7 +67,7 @@ 'azure.ai.language', ]), install_requires=[ - 'azure-core<2.0.0,>=1.19.0', + 'azure-core<2.0.0,>=1.19.1', 'msrest>=0.6.21', ], extras_require={ diff --git a/shared_requirements.txt b/shared_requirements.txt index 09fd92bdc815..78f9ac27ffc1 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -151,7 +151,7 @@ backports.functools-lru-cache >= 1.6.4; python_version == "2.7" #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.19.1 -#override azure-ai-language-questionanswering azure-core<2.0.0,>=1.19.0 +#override azure-ai-language-questionanswering azure-core<2.0.0,>=1.19.1 #override azure-ai-language-questionanswering msrest>=0.6.21 #override azure-search-documents azure-core<2.0.0,>=1.19.0 #override azure-ai-formrecognizer msrest>=0.6.21 @@ -353,7 +353,7 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-mgmt-azurearcdata msrest>=0.6.21 #override azure-mgmt-servicelinker msrest>=0.6.21 #override azure-mgmt-fluidrelay msrest>=0.6.21 -#override azure-ai-language-conversations azure-core<2.0.0,>=1.19.0 +#override azure-ai-language-conversations azure-core<2.0.0,>=1.19.1 #override azure-ai-language-conversations msrest>=0.6.21 #override azure-mgmt-dataprotection msrest>=0.6.21 #override azure-mgmt-chaos msrest>=0.6.21