Adjust callautomation api based on latest swagger.

Author: zihzhan-msft

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/__init__.py

@@ -9,8 +9,6 @@
 from ._call_connection import CallConnection
 from ._callingserver_client import CallingServerClient
 from ._generated.models import (AddParticipantResult, CallConnectionProperties,
-                                CancelAllMediaOperationsRequest,
-                                CancelAllMediaOperationsResult,
                                 CreateCallRequest, PhoneNumberIdentifierModel,
                                 PlayAudioRequest, PlayAudioResult,
                                 MediaType, EventSubscriptionType,
@@ -32,11 +30,9 @@
 
 __all__ = [
     'AddParticipantResult',
-    'CancelAllMediaOperationsRequest',
     'CallConnectionProperties',
     'CallConnection',
     'CallingServerClient',
-    'CancelAllMediaOperationsResult',
     'CommunicationIdentifier',
     'CommunicationUserIdentifier',
     'CreateCallOptions',

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_call_connection.py

@@ -10,7 +10,6 @@
 from ._converters import (
     AddParticipantRequestConverter,
     RemoveParticipantRequestConverter,
-    CancelAllMediaOperationsConverter,
     TransferCallRequestConverter,
     CancelParticipantMediaOperationRequestConverter,
     PlayAudioRequestConverter,
@@ -19,7 +18,6 @@
 from ._generated.models import (
     AddParticipantResult,
     CallConnectionProperties,
-    CancelAllMediaOperationsResult,
     PhoneNumberIdentifierModel,
     PlayAudioResult
     )
@@ -64,15 +62,11 @@ def hang_up(
     @distributed_trace()
     def cancel_all_media_operations(
             self,
-            operation_context=None,  # type: Optional[str]
             **kwargs  # type: Any
-        ): # type: (...) -> CancelAllMediaOperationsResult
-
-        cancel_all_media_operations_request = CancelAllMediaOperationsConverter.convert(operation_context)
+        ): # type: (...) -> None
 
         return self._call_connection_client.cancel_all_media_operations(
             call_connection_id=self.call_connection_id,
-            cancel_all_media_operation_request=cancel_all_media_operations_request,
             **kwargs
         )
 

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_converters/_converter.py

@@ -17,8 +17,6 @@
     AddParticipantWithCallLocatorRequest,
     RemoveParticipantRequest,
     RemoveParticipantWithCallLocatorRequest,
-    CancelAllMediaOperationsRequest,
-    CancelMediaOperationRequest,
     CancelMediaOperationWithCallLocatorRequest,
     CancelParticipantMediaOperationRequest,
     CancelParticipantMediaOperationWithCallLocatorRequest,
@@ -215,29 +213,6 @@ def convert(
             remove_participant_request=RemoveParticipantRequestConverter.convert(identifier)
             )
 
-class CancelAllMediaOperationsConverter(object):
-    @staticmethod
-    def convert(
-        operation_context=None # type: str
-        ): # type: (...) -> CancelAllMediaOperationsRequest
-
-        return CancelAllMediaOperationsRequest(
-            operation_context=operation_context
-            )
-
-class CancelMediaOperationRequestConverter(object):
-    @staticmethod
-    def convert(
-        media_operation_id # type: str
-        ): # type: (...) -> CancelMediaOperationRequest
-
-        if not media_operation_id:
-            raise ValueError("media_operation_id can not be None")
-
-        return CancelMediaOperationRequest(
-            media_operation_id=media_operation_id
-        )
-
 class CancelMediaOperationWithCallLocatorRequestConverter(object):
     @staticmethod
     def convert(
@@ -252,9 +227,7 @@ def convert(
 
         return CancelMediaOperationWithCallLocatorRequest(
             call_locator=call_locator,
-            cancel_media_operation_request=CancelMediaOperationRequestConverter.convert(
-                media_operation_id=media_operation_id
-            )
+            media_operation_id=media_operation_id
         )
 
 class CancelParticipantMediaOperationRequestConverter(object):

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_generated/_azure_communication_calling_server_service.py

@@ -6,28 +6,28 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
+from copy import deepcopy
 from typing import TYPE_CHECKING
 
 from azure.core import PipelineClient
 from msrest import Deserializer, Serializer
 
+from . import models
+from ._configuration import AzureCommunicationCallingServerServiceConfiguration
+from .operations import CallConnectionsOperations, ServerCallsOperations
+
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from typing import Any
 
-    from azure.core.pipeline.transport import HttpRequest, HttpResponse
-
-from ._configuration import AzureCommunicationCallingServerServiceConfiguration
-from .operations import CallConnectionsOperations
-from .operations import ServerCallsOperations
-from . import models
-
+    from azure.core.rest import HttpRequest, HttpResponse
 
 class AzureCommunicationCallingServerService(object):
     """Azure Communication Service Call Automation APIs.
 
     :ivar call_connections: CallConnectionsOperations operations
-    :vartype call_connections: azure.communication.callingserver.operations.CallConnectionsOperations
+    :vartype call_connections:
+     azure.communication.callingserver.operations.CallConnectionsOperations
     :ivar server_calls: ServerCallsOperations operations
     :vartype server_calls: azure.communication.callingserver.operations.ServerCallsOperations
     :param endpoint: The endpoint of the Azure Communication resource.
@@ -40,37 +40,48 @@ def __init__(
         **kwargs  # type: Any
     ):
         # type: (...) -> None
-        base_url = '{endpoint}'
+        _base_url = '{endpoint}'
         self._config = AzureCommunicationCallingServerServiceConfiguration(endpoint, **kwargs)
-        self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client = PipelineClient(base_url=_base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
-        self._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
+        self._serialize.client_side_validation = False
+        self.call_connections = CallConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.server_calls = ServerCallsOperations(self._client, self._config, self._serialize, self._deserialize)
 
-        self.call_connections = CallConnectionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.server_calls = ServerCallsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
 
-    def _send_request(self, http_request, **kwargs):
-        # type: (HttpRequest, Any) -> HttpResponse
+    def _send_request(
+        self,
+        request,  # type: HttpRequest
+        **kwargs  # type: Any
+    ):
+        # type: (...) -> HttpResponse
         """Runs the network request through the client's chained policies.
 
-        :param http_request: The network request you want to make. Required.
-        :type http_request: ~azure.core.pipeline.transport.HttpRequest
-        :keyword bool stream: Whether the response payload will be streamed. Defaults to True.
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = client._send_request(request)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
         :return: The response of your network call. Does not do error handling on your response.
-        :rtype: ~azure.core.pipeline.transport.HttpResponse
+        :rtype: ~azure.core.rest.HttpResponse
         """
+
+        request_copy = deepcopy(request)
         path_format_arguments = {
-            'endpoint': self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
+            "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
         }
-        http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
-        stream = kwargs.pop("stream", True)
-        pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
-        return pipeline_response.http_response
+
+        request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
+        return self._client.send_request(request_copy, **kwargs)
 
     def close(self):
         # type: () -> None

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_generated/_vendor.py

@@ -0,0 +1,27 @@
+# --------------------------------------------------------------------------
+# 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 azure.core.pipeline.transport import HttpRequest
+
+def _convert_request(request, files=None):
+    data = request.content if not files else None
+    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
+    if files:
+        request.set_formdata_body(files)
+    return request
+
+def _format_url_section(template, **kwargs):
+    components = template.split("/")
+    while components:
+        try:
+            return template.format(**kwargs)
+        except KeyError as key:
+            formatted_components = template.split("/")
+            components = [
+                c for c in formatted_components if "{}".format(key.args[0]) not in c
+            ]
+            template = "/".join(components)

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_generated/aio/_azure_communication_calling_server_service.py

@@ -6,23 +6,23 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any
+from copy import deepcopy
+from typing import Any, Awaitable
 
 from azure.core import AsyncPipelineClient
-from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from msrest import Deserializer, Serializer
 
-from ._configuration import AzureCommunicationCallingServerServiceConfiguration
-from .operations import CallConnectionsOperations
-from .operations import ServerCallsOperations
 from .. import models
+from ._configuration import AzureCommunicationCallingServerServiceConfiguration
+from .operations import CallConnectionsOperations, ServerCallsOperations
 
-
-class AzureCommunicationCallingServerService(object):
+class AzureCommunicationCallingServerService:
     """Azure Communication Service Call Automation APIs.
 
     :ivar call_connections: CallConnectionsOperations operations
-    :vartype call_connections: azure.communication.callingserver.aio.operations.CallConnectionsOperations
+    :vartype call_connections:
+     azure.communication.callingserver.aio.operations.CallConnectionsOperations
     :ivar server_calls: ServerCallsOperations operations
     :vartype server_calls: azure.communication.callingserver.aio.operations.ServerCallsOperations
     :param endpoint: The endpoint of the Azure Communication resource.
@@ -34,36 +34,47 @@ def __init__(
         endpoint: str,
         **kwargs: Any
     ) -> None:
-        base_url = '{endpoint}'
+        _base_url = '{endpoint}'
         self._config = AzureCommunicationCallingServerServiceConfiguration(endpoint, **kwargs)
-        self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs)
+        self._client = AsyncPipelineClient(base_url=_base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
-        self._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
+        self._serialize.client_side_validation = False
+        self.call_connections = CallConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.server_calls = ServerCallsOperations(self._client, self._config, self._serialize, self._deserialize)
 
-        self.call_connections = CallConnectionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.server_calls = ServerCallsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
 
-    async def _send_request(self, http_request: HttpRequest, **kwargs: Any) -> AsyncHttpResponse:
+    def _send_request(
+        self,
+        request: HttpRequest,
+        **kwargs: Any
+    ) -> Awaitable[AsyncHttpResponse]:
         """Runs the network request through the client's chained policies.
 
-        :param http_request: The network request you want to make. Required.
-        :type http_request: ~azure.core.pipeline.transport.HttpRequest
-        :keyword bool stream: Whether the response payload will be streamed. Defaults to True.
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = await client._send_request(request)
+        <AsyncHttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
         :return: The response of your network call. Does not do error handling on your response.
-        :rtype: ~azure.core.pipeline.transport.AsyncHttpResponse
+        :rtype: ~azure.core.rest.AsyncHttpResponse
         """
+
+        request_copy = deepcopy(request)
         path_format_arguments = {
-            'endpoint': self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
+            "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, 'str', skip_quote=True),
         }
-        http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
-        stream = kwargs.pop("stream", True)
-        pipeline_response = await self._client._pipeline.run(http_request, stream=stream, **kwargs)
-        return pipeline_response.http_response
+
+        request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
+        return self._client.send_request(request_copy, **kwargs)
 
     async def close(self) -> None:
         await self._client.close()