connect api merge changes

Author: Vinothini Dharmaraj

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_call_automation_client.py

@@ -23,7 +23,8 @@
     RedirectCallRequest,
     RejectCallRequest,
     StartCallRecordingRequest,
-    CallIntelligenceOptions
+    CallIntelligenceOptions,
+    ConnectRequest
 )
 from ._models import (
     CallConnectionProperties,
@@ -46,6 +47,7 @@
     from ._models  import (
         ServerCallLocator,
         GroupCallLocator,
+        RoomCallLocator,
         MediaStreamingOptions,
         TranscriptionOptions
     )
@@ -168,6 +170,118 @@ def get_call_connection( # pylint: disable=client-method-missing-tracing-decorat
             **kwargs
         )
 
+    @overload
+    def connect_call(
+        self,
+        *,
+        server_call_id: str,
+        callback_url: str,
+        cognitive_services_endpoint: Optional[str] = None,
+        operation_context: Optional[str] = None,
+        **kwargs
+    ) -> CallConnectionProperties:
+        """The request payload for creating a connection to a room CallLocator.
+        All required parameters must be populated in order to send to server.
+        :keyword server_call_id: The server call ID to locate ongoing call.
+        :paramtype server_call_id: str
+        :keyword callback_url: The call back url where callback events are sent. Required
+        :paramtype callback_url: str
+        :keyword cognitive_services_endpoint:
+         The identifier of the Cognitive Service resource assigned to this call.
+        :paramtype cognitive_services_endpoint: str or None
+        :keyword operation_context: Value that can be used to track the call and its associated events.
+        :paramtype operation_context: str or None
+        :return: CallConnectionProperties
+        :rtype: ~azure.communication.callautomation.CallConnectionProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def connect_call(
+        self,
+        *,
+        group_call_id: str,
+        callback_url: str,
+        cognitive_services_endpoint: Optional[str] = None,
+        operation_context: Optional[str] = None,
+        **kwargs
+    ) -> CallConnectionProperties:
+        """The request payload for creating a connection to a room CallLocator.
+        All required parameters must be populated in order to send to server.
+        :keyword group_call_id: The group call ID to locate ongoing call.
+        :paramtype group_call_id: str
+        :keyword callback_url: The call back url where callback events are sent. Required
+        :paramtype callback_url: str
+        :keyword cognitive_services_endpoint:
+         The identifier of the Cognitive Service resource assigned to this call.
+        :paramtype cognitive_services_endpoint: str or None
+        :keyword operation_context: Value that can be used to track the call and its associated events.
+        :paramtype operation_context: str or None
+        :return: CallConnectionProperties
+        :rtype: ~azure.communication.callautomation.CallConnectionProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def connect_call(
+        self,
+        *,
+        room_id: str,
+        callback_url: str,
+        cognitive_services_endpoint: Optional[str] = None,
+        operation_context: Optional[str] = None,
+        **kwargs
+    ) -> CallConnectionProperties:
+        """The request payload for creating a connection to a room CallLocator.
+        All required parameters must be populated in order to send to server.
+        :keyword room_id: Acs room id. Required
+        :paramtype room_id: str
+        :keyword callback_url: The call back url where callback events are sent. Required
+        :paramtype callback_url: str
+        :keyword cognitive_services_endpoint:
+         The identifier of the Cognitive Service resource assigned to this call.
+        :paramtype cognitive_services_endpoint: str or None
+        :keyword operation_context: Value that can be used to track the call and its associated events.
+        :paramtype operation_context: str or None
+        :return: CallConnectionProperties
+        :rtype: ~azure.communication.callautomation.CallConnectionProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def connect_call(
+        self,
+        *args: Union['ServerCallLocator', 'GroupCallLocator', 'RoomCallLocator'],
+        **kwargs
+    ) -> CallConnectionProperties:
+
+        cognitive_services_endpoint=kwargs.pop("cognitive_services_endpoint", None)
+        call_intelligence_options = CallIntelligenceOptions(
+            cognitive_services_endpoint=cognitive_services_endpoint
+            ) if cognitive_services_endpoint else None
+
+        call_locator = build_call_locator(
+            args,
+            kwargs.pop("call_locator", None),
+            kwargs.pop("server_call_id", None),
+            kwargs.pop("group_call_id", None),
+            kwargs.pop("room_id", None)
+        )
+        connect_call_request = ConnectRequest(
+            call_locator=call_locator,
+            callback_uri=kwargs.pop("callback_url", None),
+            operation_context=kwargs.pop("operation_context", None),
+            call_intelligence_options=call_intelligence_options
+        )
+
+        process_repeatability_first_sent(kwargs)
+        result = self._client.connect(
+            connect_request=connect_call_request,
+            **kwargs
+        )
+
+        return CallConnectionProperties._from_generated(result)  # pylint:disable=protected-access
+
     @distributed_trace
     def create_call(
         self,
@@ -516,10 +630,60 @@ def start_recording(
         :raises ~azure.core.exceptions.HttpResponseError:
         """
 
+    @overload
+    def start_recording(
+        self,
+        *,
+        room_id: str,
+        recording_state_callback_url: Optional[str] = None,
+        recording_content_type: Optional[Union[str, 'RecordingContent']] = None,
+        recording_channel_type: Optional[Union[str, 'RecordingChannel']] = None,
+        recording_format_type: Optional[Union[str, 'RecordingFormat']] = None,
+        audio_channel_participant_ordering: Optional[List['CommunicationIdentifier']] = None,
+        channel_affinity: Optional[List['ChannelAffinity']] = None,
+        recording_storage: Optional[Union['AzureCommunicationsRecordingStorage',
+                                          'AzureBlobContainerRecordingStorage']] = None,
+        pause_on_start: Optional[bool] = None,
+        **kwargs
+    ) -> RecordingProperties:
+        """Start recording for a ongoing call. Locate the call with call locator.
+        :keyword str room_id: The acs room id to locate ongoing call.
+        :keyword recording_state_callback_url: The url to send notifications to.
+        :paramtype recording_state_callback_url: str or None
+        :keyword recording_content_type: The content type of call recording.
+        :paramtype recording_content_type: str or ~azure.communication.callautomation.RecordingContent or None
+        :keyword recording_channel_type: The channel type of call recording.
+        :paramtype recording_channel_type: str or ~azure.communication.callautomation.RecordingChannel or None
+        :keyword recording_format_type: The format type of call recording.
+        :paramtype recording_format_type: str or ~azure.communication.callautomation.RecordingFormat or None
+        :keyword audio_channel_participant_ordering:
+         The sequential order in which audio channels are assigned to participants in the unmixed recording.
+         When 'recordingChannelType' is set to 'unmixed' and `audioChannelParticipantOrdering is not specified,
+         the audio channel to participant mapping will be automatically assigned based on the order in
+         which participant first audio was detected.
+         Channel to participant mapping details can be found in the metadata of the recording.
+        :paramtype audio_channel_participant_ordering:
+         list[~azure.communication.callautomation.CommunicationIdentifier] or None
+        :keyword channel_affinity: The channel affinity of call recording
+         When 'recordingChannelType' is set to 'unmixed', if channelAffinity is not specified,
+         'channel' will be automatically assigned.
+         Channel-Participant mapping details can be found in the metadata of the recording.
+        :paramtype channel_affinity: list[~azure.communication.callautomation.ChannelAffinity] or None
+        :keyword recording_storage: Defines the kind of external storage. Known values are:
+          ``AzureCommunicationsRecordingStorage`` and ``AzureBlobContainerRecordingStorage``.
+          If no storage option is provided, the default is Azure Communications recording storage.
+        :paramtype recording_storage: AzureCommunicationsRecordingStorage or AzureBlobContainerRecordingStorage or None
+        :keyword pause_on_start: The state of the pause on start option.
+        :paramtype pause_on_start: bool or None
+        :return: RecordingProperties
+        :rtype: ~azure.communication.callautomation.RecordingProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
     @distributed_trace
     def start_recording(
         self,
-        *args: Union['ServerCallLocator', 'GroupCallLocator'],
+        *args: Union['ServerCallLocator', 'GroupCallLocator', 'RoomCallLocator'],
         **kwargs
     ) -> RecordingProperties:
         # pylint:disable=protected-access
@@ -529,7 +693,8 @@ def start_recording(
             args,
             kwargs.pop("call_locator", None),
             kwargs.pop("server_call_id", None),
-            kwargs.pop("group_call_id", None)
+            kwargs.pop("group_call_id", None),
+            kwargs.pop("room_id", None)
         )
         external_storage = build_external_storage(kwargs.pop("recording_storage", None))
 

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_call_connection_client.py

@@ -372,6 +372,7 @@ def add_participant(
             add_participant_request,
             **kwargs
         )
+        print(f"Response from add participant: {response}")
         return AddParticipantResult._from_generated(response)  # pylint:disable=protected-access
 
     @distributed_trace

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_generated/_client.py

@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any
+from typing_extensions import Self
 
 from azure.core import PipelineClient
 from azure.core.credentials import AzureKeyCredential
@@ -108,7 +109,7 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "AzureCommunicationCallAutomationService":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_generated/_serialization.py

@@ -144,6 +144,8 @@ def _json_attemp(data):
                 # context otherwise.
                 _LOGGER.critical("Wasn't XML not JSON, failing")
                 raise DeserializationError("XML is invalid") from err
+        elif content_type.startswith("text/"):
+            return data_as_str
         raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
 
     @classmethod
@@ -1441,7 +1443,7 @@ def _deserialize(self, target_obj, data):
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
 
-        if data is None:
+        if data is None or data is CoreNull:
             return data
         try:
             attributes = response._attribute_map  # type: ignore

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_generated/aio/_client.py

@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable
+from typing_extensions import Self
 
 from azure.core import AsyncPipelineClient
 from azure.core.credentials import AzureKeyCredential
@@ -111,7 +112,7 @@ def send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "AzureCommunicationCallAutomationService":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self