CLU - March SDK - Remaining issues (Azure#23851)

* set default value for participiant id and conv id

* regenerate

* update samples

* Update changelog

* add direct target samples

* update swagger reference and delete outdated parameters

* regenerate to fix samples and tests

* re-record tests

* Update shared_requirements

* Update core min dependency

Co-authored-by: Anna Tisch <[email protected]>

Author: mshaban-msft

sdk/cognitivelanguage/azure-ai-language-conversations/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0b3 (2022-03-01)
+## 1.0.0b3 (2022-04-12)
 
 ### Features Added
 * Entity resolutions
@@ -9,16 +9,6 @@
 ### Breaking Changes
 Input and output structures are different from previous release.
 
-## 1.0.0b2 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
 ## 1.0.0b1 (2021-11-03)
 
 ### Features Added

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/__init__.py

@@ -6,13 +6,18 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._conversation_analysis_client import ConversationAnalysisClient
+from ._client import ConversationAnalysisClient
 from ._version import VERSION
 
 __version__ = VERSION
+
+try:
+    from ._patch import __all__ as _patch_all
+    from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
+except ImportError:
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
 __all__ = ['ConversationAnalysisClient']
+__all__.extend([p for p in _patch_all if p not in __all__])
 
-# `._patch.py` is used for handwritten extensions to the generated code
-# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
-from ._patch import patch_sdk
-patch_sdk()
+_patch_sdk()

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/_conversation_analysis_client.py renamed to sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/_client.py

@@ -8,6 +8,11 @@
 
 from ._operations import ConversationAnalysisClientOperationsMixin
 
+from ._patch import __all__ as _patch_all
+from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
+from ._patch import patch_sdk as _patch_sdk
 __all__ = [
     'ConversationAnalysisClientOperationsMixin',
 ]
+__all__.extend([p for p in _patch_all if p not in __all__])
+_patch_sdk()

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/_operations/__init__.py

@@ -15,8 +15,10 @@
 from azure.core.pipeline.transport import HttpResponse
 from azure.core.rest import HttpRequest
 from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
 
 from .. import models as _models
+from .._vendor import MixinABC
 T = TypeVar('T')
 JSONType = Any
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
@@ -30,41 +32,42 @@ def build_analyze_conversation_request(
     content: Any = None,
     **kwargs: Any
 ) -> HttpRequest:
-    api_version = kwargs.pop('api_version', "2022-03-01-preview")  # type: str
-    content_type = kwargs.pop('content_type', None)  # type: Optional[str]
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version = kwargs.pop('api_version', _params.pop('api-version', "2022-03-01-preview"))  # type: str
+    content_type = kwargs.pop('content_type', _headers.pop('Content-Type', None))  # type: Optional[str]
+    accept = _headers.pop('Accept', "application/json")
 
-    accept = "application/json"
     # Construct URL
     _url = "/:analyze-conversations"
 
     # Construct parameters
-    _query_parameters = kwargs.pop("params", {})  # type: Dict[str, Any]
-    _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str')
+    _params['api-version'] = _SERIALIZER.query("api_version", api_version, 'str')
 
     # Construct headers
-    _header_parameters = kwargs.pop("headers", {})  # type: Dict[str, Any]
     if content_type is not None:
-        _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str')
-    _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str')
+        _headers['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str')
+    _headers['Accept'] = _SERIALIZER.header("accept", accept, 'str')
 
     return HttpRequest(
         method="POST",
         url=_url,
-        params=_query_parameters,
-        headers=_header_parameters,
+        params=_params,
+        headers=_headers,
         json=json,
         content=content,
         **kwargs
     )
 
-class ConversationAnalysisClientOperationsMixin(object):
+class ConversationAnalysisClientOperationsMixin(MixinABC):
 
     @distributed_trace
     def analyze_conversation(
         self,
-        task: "_models.AnalyzeConversationTask",
+        task: _models.AnalyzeConversationTask,
         **kwargs: Any
-    ) -> "_models.AnalyzeConversationTaskResult":
+    ) -> _models.AnalyzeConversationTaskResult:
         """Analyzes the input conversation utterance.
 
         :param task: A single conversational task to execute.
@@ -73,28 +76,33 @@ def analyze_conversation(
         :rtype: ~azure.ai.language.conversations.models.AnalyzeConversationTaskResult
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType["_models.AnalyzeConversationTaskResult"]
         error_map = {
             401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
         }
-        error_map.update(kwargs.pop('error_map', {}))
+        error_map.update(kwargs.pop('error_map', {}) or {})
+
+        _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
-        api_version = kwargs.pop('api_version', "2022-03-01-preview")  # type: str
-        content_type = kwargs.pop('content_type', "application/json")  # type: Optional[str]
+        api_version = kwargs.pop('api_version', _params.pop('api-version', "2022-03-01-preview"))  # type: str
+        content_type = kwargs.pop('content_type', _headers.pop('Content-Type', "application/json"))  # type: Optional[str]
+        cls = kwargs.pop('cls', None)  # type: ClsType[_models.AnalyzeConversationTaskResult]
 
         _json = self._serialize.body(task, 'AnalyzeConversationTask')
 
         request = build_analyze_conversation_request(
             api_version=api_version,
             content_type=content_type,
             json=_json,
+            headers=_headers,
+            params=_params,
         )
         path_format_arguments = {
             "Endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
         }
-        request.url = self._client.format_url(request.url, **path_format_arguments)
+        request.url = self._client.format_url(request.url, **path_format_arguments)  # type: ignore
 
-        pipeline_response = self._client._pipeline.run(  # pylint: disable=protected-access
+        pipeline_response = self._client._pipeline.run(  # type: ignore # pylint: disable=protected-access
             request,
             stream=False,
             **kwargs

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/_operations/_operations.py

@@ -0,0 +1,19 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from typing import List
+
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/_operations/_patch.py

@@ -0,0 +1,25 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from abc import ABC
+from typing import TYPE_CHECKING
+
+from ._configuration import ConversationAnalysisClientConfiguration
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import,ungrouped-imports
+    from msrest import Deserializer, Serializer
+
+    from azure.core import PipelineClient
+
+
+class MixinABC(ABC):
+    """DO NOT use this class. It is for internal typing use only."""
+    _client: "PipelineClient"
+    _config: ConversationAnalysisClientConfiguration
+    _serialize: "Serializer"
+    _deserialize: "Deserializer"

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/_vendor.py

@@ -6,10 +6,15 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from ._conversation_analysis_client import ConversationAnalysisClient
+from ._client import ConversationAnalysisClient
+
+try:
+    from ._patch import __all__ as _patch_all
+    from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
+except ImportError:
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
 __all__ = ['ConversationAnalysisClient']
+__all__.extend([p for p in _patch_all if p not in __all__])
 
-# `._patch.py` is used for handwritten extensions to the generated code
-# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
-from ._patch import patch_sdk
-patch_sdk()
+_patch_sdk()

sdk/cognitivelanguage/azure-ai-language-conversations/azure/ai/language/conversations/aio/__init__.py

@@ -8,6 +8,11 @@
 
 from ._operations import ConversationAnalysisClientOperationsMixin
 
+from ._patch import __all__ as _patch_all
+from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
+from ._patch import patch_sdk as _patch_sdk
 __all__ = [
     'ConversationAnalysisClientOperationsMixin',
 ]
+__all__.extend([p for p in _patch_all if p not in __all__])
+_patch_sdk()