remove callinvite from transfer (Azure#30247)

Author: fangchen0601

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

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import TYPE_CHECKING, Optional, List, Union
+from typing import TYPE_CHECKING, Optional, List, Union, Dict
 from urllib.parse import urlparse
 from azure.core.paging import ItemPaged
 from azure.core.tracing.decorator import distributed_trace
@@ -198,29 +198,33 @@ def list_participants(self, **kwargs) -> ItemPaged[CallParticipant]:
     @distributed_trace
     def transfer_call_to_participant(
         self,
-        target_participant: 'CallInvite',
+        target_participant: 'CommunicationIdentifier',
         *,
+        sip_headers: Optional[Dict[str, str]] = None,
+        voip_headers: Optional[Dict[str, str]] = None,
         operation_context: Optional[str] = None,
         **kwargs
     ) -> TransferCallResult:
         """Transfer this call to another participant.
 
         :param target_participant: The transfer target.
-        :type target_participant: CallInvite
+        :type target_participant: CommunicationIdentifier
+        :keyword sip_headers: Custom context for PSTN
+        :paramtype sip_headers: dict[str, str]
+        :keyword voip_headers: Custom context for VOIP
+        :paramtype voip_headers: dict[str, str]
         :keyword operation_context: Value that can be used to track this call and its associated events.
         :paramtype operation_context: str
         :return: TransferCallResult
         :rtype: ~azure.communication.callautomation.TransferCallResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         user_custom_context = CustomContext(
-            voip_headers=target_participant.voip_headers,
-            sip_headers=target_participant.sip_headers
-            ) if target_participant.sip_headers or target_participant.voip_headers else None
+            voip_headers=voip_headers,
+            sip_headers=sip_headers
+            ) if sip_headers or voip_headers else None
         request = TransferToParticipantRequest(
-            target_participant=serialize_identifier(target_participant.target),
-            transferee_caller_id=serialize_identifier(
-                target_participant.source_caller_id_number) if target_participant.source_caller_id_number else None,
+            target_participant=serialize_identifier(target_participant),
             custom_context=user_custom_context, operation_context=operation_context)
 
         return self._call_connection_client.transfer_to_participant(

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

@@ -49,9 +49,9 @@ class CallInvite(object):
     :ivar source_display_name: Set display name for caller
     :vartype source_display_name: str
     :ivar sip_headers: Custom context for PSTN
-    :vartype sip_headers: str
+    :vartype sip_headers: dict[str, str]
     :ivar voip_headers: Custom context for VOIP
-    :vartype voip_headers: str
+    :vartype voip_headers: dict[str, str]
     """
     def __init__(
         self,

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/aio/_call_connection_client_async.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import TYPE_CHECKING, Optional, List, Union
+from typing import TYPE_CHECKING, Optional, List, Union, Dict
 from urllib.parse import urlparse
 from azure.core.async_paging import AsyncItemPaged
 from azure.core.tracing.decorator import distributed_trace
@@ -203,29 +203,33 @@ def list_participants(self, **kwargs) -> AsyncItemPaged[CallParticipant]:
     @distributed_trace_async
     async def transfer_call_to_participant(
         self,
-        target_participant: 'CallInvite',
+        target_participant: 'CommunicationIdentifier',
         *,
+        sip_headers: Optional[Dict[str, str]] = None,
+        voip_headers: Optional[Dict[str, str]] = None,
         operation_context: Optional[str] = None,
         **kwargs
     ) -> TransferCallResult:
         """Transfer the call to a participant.
 
         :param target_participant: The transfer target.
-        :type target_participant: CallInvite
+        :type target_participant: CommunicationIdentifier
+        :keyword sip_headers: Custom context for PSTN
+        :paramtype sip_headers: dict[str, str]
+        :keyword voip_headers: Custom context for VOIP
+        :paramtype voip_headers: dict[str, str]
         :keyword operation_context: Value that can be used to track the call and its associated events.
         :paramtype operation_context: str
         :return: TransferCallResult
         :rtype: ~azure.communication.callautomation.TransferCallResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         user_custom_context = CustomContext(
-            voip_headers=target_participant.voip_headers,
-            sip_headers=target_participant.sip_headers
-            ) if target_participant.sip_headers or target_participant.voip_headers else None
+            voip_headers=voip_headers,
+            sip_headers=sip_headers
+            ) if sip_headers or voip_headers else None
         request = TransferToParticipantRequest(
-            target_participant=serialize_identifier(target_participant.target),
-            transferee_caller_id=serialize_identifier(
-                target_participant.source_caller_id_number) if target_participant.source_caller_id_number else None,
+            target_participant=serialize_identifier(target_participant),
             custom_context=user_custom_context, operation_context=operation_context)
 
         return await self._call_connection_client.transfer_to_participant(

sdk/communication/azure-communication-callautomation/tests/test_call_connection_client.py

@@ -78,9 +78,8 @@ def mock_send(*_, **__):
             call_connection_id=self.call_connection_id,
             transport=Mock(send=mock_send))
         user = CommunicationUserIdentifier(self.communication_user_id)
-        call_invite = CallInvite(target=user)
         try:
-            response = call_connection.transfer_call_to_participant(call_invite)
+            response = call_connection.transfer_call_to_participant(user)
         except:
             raised = True
             raise