diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/assets.json b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/assets.json index 2fd21627fcc8..36165c8c495a 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/assets.json +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "python", "TagPrefix": "python/cognitivelanguage/azure-ai-language-conversations-authoring", - "Tag": "python/cognitivelanguage/azure-ai-language-conversations-authoring_94c35e32fe" + "Tag": "python/cognitivelanguage/azure-ai-language-conversations-authoring_1f8d51d76b" } diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job.py index 76b212e75e00..c70be027034e 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job.py @@ -1,5 +1,6 @@ # pylint: disable=line-too-long,useless-suppression import functools +import pytest from devtools_testutils import AzureRecordedTestCase, EnvironmentVariableLoader, recorded_by_proxy from azure.core.credentials import AzureKeyCredential @@ -18,7 +19,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint, key): return ConversationAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsCancelTrainingSync(TestConversations): @ConversationsPreparer() @recorded_by_proxy @@ -27,7 +28,7 @@ def test_cancel_training_job(self, authoring_endpoint, authoring_key): client = self.create_client(authoring_endpoint, authoring_key) project_client = client.get_project_client("Test-data-labels") - job_id = "0f2fa6fe-c39c-48d5-a1e1-1e549a1c2299_638985888000000000" + job_id = "e39f6ec0-9ba9-426b-989d-3e0804bdcd1c_639034272000000000" poller = project_client.project.begin_cancel_training_job( job_id=job_id, diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job_async.py index e6b1e912bfcc..dbe12f2c252d 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_cancel_training_job_async.py @@ -20,7 +20,7 @@ class TestConversationsAsync(AzureRecordedTestCase): async def create_client(self, endpoint: str, key: str) -> ConversationAuthoringClient: return ConversationAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsCancelTrainingAsync(TestConversationsAsync): @ConversationsPreparer() @recorded_by_proxy_async @@ -29,7 +29,7 @@ async def test_cancel_training_job_async(self, authoring_endpoint, authoring_key client = await self.create_client(authoring_endpoint, authoring_key) try: project_name = "Test-data-labels" - job_id = "122b7341-afaa-4bea-af63-f6c7e0539fcb_638985888000000000" + job_id = "fb3b428d-185f-4d6e-a777-e3fd86cab993_639034272000000000" project_client = client.get_project_client(project_name) poller = await project_client.project.begin_cancel_training_job( diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment.py index fc38f4a9a8b6..0d1e3ff16772 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment.py @@ -1,5 +1,6 @@ # pylint: disable=line-too-long,useless-suppression import functools +import pytest from devtools_testutils import AzureRecordedTestCase, EnvironmentVariableLoader, recorded_by_proxy from azure.core.credentials import AzureKeyCredential @@ -19,7 +20,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint, key): return ConversationAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsDeleteDeploymentSync(TestConversations): @ConversationsPreparer() @recorded_by_proxy @@ -27,7 +28,7 @@ def test_delete_deployment(self, authoring_endpoint, authoring_key): client = self.create_client(authoring_endpoint, authoring_key) project_name = "Test-data-labels" - deployment_name = "deployment2" + deployment_name = "deployment1" project_client = client.get_project_client(project_name) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_async.py index d345f504bace..efc37d379389 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_async.py @@ -21,7 +21,7 @@ class TestConversationsAsync(AzureRecordedTestCase): async def create_client(self, endpoint: str, key: str) -> ConversationAuthoringClient: return ConversationAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsDeleteDeploymentAsync(TestConversationsAsync): @ConversationsPreparer() @recorded_by_proxy_async @@ -30,7 +30,7 @@ async def test_delete_deployment_async(self, authoring_endpoint, authoring_key): client = await self.create_client(authoring_endpoint, authoring_key) async with client: project_name = "Test-data-labels" - deployment_name = "deployment2" + deployment_name = "deployment1" project_client = client.get_project_client(project_name) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources.py index 635eb0014ef0..2f2039bab226 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources.py @@ -1,5 +1,6 @@ # pylint: disable=line-too-long,useless-suppression import functools +import pytest from devtools_testutils import AzureRecordedTestCase, EnvironmentVariableLoader, recorded_by_proxy from azure.core.credentials import AzureKeyCredential @@ -19,7 +20,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint, key): return ConversationAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsDeleteDeploymentSync(TestConversations): @ConversationsPreparer() @recorded_by_proxy diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources_async.py index 8581410afd48..54849b7f7bbc 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_deployment_from_resources_async.py @@ -21,7 +21,7 @@ class TestConversationsAsync(AzureRecordedTestCase): async def create_client(self, endpoint: str, key: str) -> ConversationAuthoringClient: return ConversationAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsDeleteDeploymentFromResourcesAsync(TestConversationsAsync): @ConversationsPreparer() @recorded_by_proxy_async diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project.py index 3ae39d8aee9b..8dccbea8e03f 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project.py @@ -27,7 +27,7 @@ class TestConversationsDeleteProjectSync(TestConversations): @recorded_by_proxy def test_delete_project(self, authoring_endpoint, authoring_key): authoring_client = self.create_client(authoring_endpoint, authoring_key) - project_name = "MyPythonProject0820" + project_name = "MyPythonProject1110" # Act: begin delete (LRO) poller = authoring_client.begin_delete_project(project_name) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project_async.py index 2685c166c8e6..4d34a697de19 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_delete_project_async.py @@ -29,7 +29,7 @@ class TestConversationsDeleteProjectAsync(TestConversationsAsync): async def test_delete_project_async(self, authoring_endpoint, authoring_key): client = await self.create_client(authoring_endpoint, authoring_key) async with client: - project_name = "PythonImportProject0820" + project_name = "MyPythonProject1110Async" # Begin delete; LRO now returns None on success poller = await client.begin_delete_project(project_name) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_export_project.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_export_project.py index 3b9abfa48634..781d0ef2188b 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_export_project.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_export_project.py @@ -28,7 +28,7 @@ class TestConversationsExportCase(TestConversations): @recorded_by_proxy def test_export_project(self, authoring_endpoint, authoring_key): authoring_client = self.create_client(authoring_endpoint, authoring_key) - project_name = "PythonImportProject0820" + project_name = "Test-data-labels" project_client = authoring_client.get_project_client(project_name) # Act: begin export (LRO) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results.py index be3901d2472d..aca2afce4b86 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results.py @@ -26,8 +26,8 @@ class TestConversationsGetModelEvaluationResultsSync(TestConversations): def test_get_model_evaluation_results(self, authoring_endpoint, authoring_key): authoring_client = self.create_client(authoring_endpoint, authoring_key) - project_name = "Aurora-CLU-Prod" - trained_model_label = "m1" + project_name = "EmailApp" + trained_model_label = "Model1" # Get trained-model scoped client and fetch the paged evaluation results project_client = authoring_client.get_project_client(project_name) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results_async.py index 9cdaf8062b22..cc5e83093d4a 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations-authoring/tests/test_get_model_evaluation_results_async.py @@ -28,8 +28,8 @@ class TestConversationsGetModelEvaluationResultsAsync(TestConversationsAsync): async def test_get_model_evaluation_results_async(self, authoring_endpoint, authoring_key): client = await self.create_client(authoring_endpoint, authoring_key) try: - project_name = "Aurora-CLU-Prod" - trained_model_label = "m1" + project_name = "EmailApp" + trained_model_label = "Model1" # Get trained-model scoped client and fetch the paged evaluation results project_client = client.get_project_client(project_name) diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction.py b/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction.py index 25c1cb5d5aa4..3db93a6217ec 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction.py @@ -36,7 +36,7 @@ def create_client(self, endpoint, key): ... - +@pytest.mark.playback_test_only class TestConversationsCase(TestConversations): @ConversationsPreparer() @recorded_by_proxy diff --git a/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction_async.py b/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction_async.py index 720119563d08..d06ae6c2bb2d 100644 --- a/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction_async.py +++ b/sdk/cognitivelanguage/azure-ai-language-conversations/tests/test_orchestration_prediction_async.py @@ -34,7 +34,7 @@ async def create_async_client(self, endpoint: str, key: str) -> ConversationAnal credential = AzureKeyCredential(key) return ConversationAnalysisClient(endpoint, credential) - +@pytest.mark.playback_test_only class TestConversationsCase(TestConversations): @ConversationsPreparer() @recorded_by_proxy_async diff --git a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job.py b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job.py index 52c2fa358707..55ac3be4e211 100644 --- a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job.py +++ b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job.py @@ -1,5 +1,6 @@ # pylint: disable=line-too-long,useless-suppression import functools +import pytest from devtools_testutils import AzureRecordedTestCase, EnvironmentVariableLoader, recorded_by_proxy from azure.core.credentials import AzureKeyCredential @@ -18,7 +19,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint, key): return TextAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsCancelTrainingSync(TestConversations): @ConversationsPreparer() @recorded_by_proxy diff --git a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job_async.py b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job_async.py index c1f3585aecec..d9d8c096dee4 100644 --- a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job_async.py +++ b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_cancel_training_job_async.py @@ -15,7 +15,7 @@ authoring_key="fake_key", ) - +@pytest.mark.playback_test_only class TestConversationsCancelTrainingAsync(AzureRecordedTestCase): @ConversationsPreparer() @recorded_by_proxy_async diff --git a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment.py b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment.py index e7c85f9951c2..5be86e17d5cb 100644 --- a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment.py +++ b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment.py @@ -1,5 +1,6 @@ # pylint: disable=line-too-long,useless-suppression import functools +import pytest from devtools_testutils import AzureRecordedTestCase, EnvironmentVariableLoader, recorded_by_proxy from azure.core.credentials import AzureKeyCredential @@ -19,7 +20,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint, key): return TextAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsDeleteDeploymentSync(TestConversations): @ConversationsPreparer() @recorded_by_proxy diff --git a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment_async.py b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment_async.py index 0abd75fd2d12..3f7a7ad0fe66 100644 --- a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment_async.py +++ b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_deployment_async.py @@ -21,7 +21,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint, key): return TextAuthoringClient(endpoint, AzureKeyCredential(key)) # type: ignore[arg-type] - +@pytest.mark.playback_test_only class TestConversationsDeleteDeploymentAsync(TestConversations): @ConversationsPreparer() @recorded_by_proxy_async diff --git a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project.py b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project.py index ff820d1e4d4c..13f1bdb10c10 100644 --- a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project.py +++ b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project.py @@ -1,5 +1,7 @@ # pylint: disable=line-too-long,useless-suppression import functools +import pytest + from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer, recorded_by_proxy from azure.core.credentials import AzureKeyCredential from azure.core.exceptions import HttpResponseError @@ -17,7 +19,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint: str, key: str) -> TextAuthoringClient: return TextAuthoringClient(endpoint, AzureKeyCredential(key)) - +@pytest.mark.playback_test_only class TestConversationsCase(TestConversations): @ConversationsPreparer() @recorded_by_proxy diff --git a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project_async.py b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project_async.py index 73a2cc84b78b..13af429a24af 100644 --- a/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project_async.py +++ b/sdk/cognitivelanguage/azure-ai-textanalytics-authoring/tests/test_delete_project_async.py @@ -21,7 +21,7 @@ class TestConversations(AzureRecordedTestCase): def create_client(self, endpoint: str, key: str) -> TextAuthoringClient: # type: ignore[override] return TextAuthoringClient(endpoint, AzureKeyCredential(key)) # type: ignore[arg-type] - +@pytest.mark.playback_test_only class TestConversationsCaseAsync(TestConversations): @ConversationsPreparer() @recorded_by_proxy_async diff --git a/sdk/cognitivelanguage/tests.yml b/sdk/cognitivelanguage/tests.yml index 3f8e78f558d5..e133f6be2482 100644 --- a/sdk/cognitivelanguage/tests.yml +++ b/sdk/cognitivelanguage/tests.yml @@ -18,12 +18,12 @@ extends: AZURE_CONVERSATIONS_DEPLOYMENT_NAME: $(clu-project-deployment) AZURE_CONVERSATIONS_WORKFLOW_PROJECT_NAME: $(clu-workflow-project) AZURE_CONVERSATIONS_WORKFLOW_DEPLOYMENT_NAME: $(clu-workflow-project-deployment) - CONVERSATIONS_ENDPOINT: $(clu-uri) - CONVERSATIONS_KEY: $(clu-key) - AUTHORING_ENDPOINT: $(clu-uri) - AUTHORING_KEY: $(clu-key) - TEXT_ANALYSIS_ENDPOINT: $(clu-uri) - TEXT_ANALYSIS_KEY: $(clu-key) + CONVERSATIONS_ENDPOINT: $(conversation-uri) + CONVERSATIONS_KEY: $(conversation-key) + AUTHORING_ENDPOINT: $(authoring-uri) + AUTHORING_KEY: $(authoring-key) + TEXT_ANALYSIS_ENDPOINT: $(text_analysis-uri) + TEXT_ANALYSIS_KEY: $(text_analysis-key) AZURE_SUBSCRIPTION_ID: $(COGNITIVELANGUAGE_SUBSCRIPTION_ID) TEST_MODE: "RunLiveNoRecord" # use when allowing preparers to create the rgs for you AZURE_TEST_RUN_LIVE: 'true'