Merge branch 'callautomation/release/ga5' of https://github.com/Azure/azure-sdk-for-python into callautomation/release/ga5

Author: v-dharmarajv

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

@@ -30,7 +30,8 @@
     HoldRequest,
     UnholdRequest,
     StartMediaStreamingRequest,
-    StopMediaStreamingRequest
+    StopMediaStreamingRequest,
+    InterruptAudioAndAnnounceRequest
 )
 from azure.communication.callautomation._generated.models._enums import RecognizeInputType, DtmfTone
 from unittest.mock import Mock
@@ -112,8 +113,7 @@ def test_play_file_to_all_back_compat(self):
         expected_play_request = PlayRequest(
             play_sources=[play_source._to_generated()],
             play_to=[],
-            play_options=PlayOptions(loop=False),
-            interrupt_call_media_operation=False
+            play_options=PlayOptions(loop=False, interrupt_call_media_operation=False)
         )
         mock_play.assert_called_once()
         actual_play_request = mock_play.call_args[0][1]
@@ -126,7 +126,7 @@ def test_play_file_to_all_back_compat(self):
         )
         self.assertEqual(expected_play_request.play_to, actual_play_request.play_to)
         self.assertEqual(expected_play_request.play_options.loop, actual_play_request.play_options.loop)
-        self.assertEqual(expected_play_request.interrupt_call_media_operation, actual_play_request.interrupt_call_media_operation)
+        self.assertEqual(expected_play_request.play_options.interrupt_call_media_operation, actual_play_request.play_options.interrupt_call_media_operation)
 
     def test_play_file_to_all_via_play_back_compat_with_barge_in(self):
         mock_play = Mock()
@@ -138,8 +138,7 @@ def test_play_file_to_all_via_play_back_compat_with_barge_in(self):
         expected_play_request = PlayRequest(
             play_sources=[play_source._to_generated()],
             play_to=[],
-            play_options=PlayOptions(loop=False),
-            interrupt_call_media_operation=True
+            play_options=PlayOptions(loop=False, interrupt_call_media_operation=True)
         )
         mock_play.assert_called_once()
         actual_play_request = mock_play.call_args[0][1]
@@ -151,7 +150,7 @@ def test_play_file_to_all_via_play_back_compat_with_barge_in(self):
             actual_play_request.play_sources[0].play_source_cache_id,
         )
         self.assertEqual(expected_play_request.play_to, actual_play_request.play_to)
-        self.assertEqual(expected_play_request.interrupt_call_media_operation, actual_play_request.interrupt_call_media_operation)
+        self.assertEqual(expected_play_request.play_options.interrupt_call_media_operation, actual_play_request.play_options.interrupt_call_media_operation)
 
     def test_play_file_to_all_back_compat_with_barge_in(self):
         mock_play = Mock()
@@ -163,8 +162,7 @@ def test_play_file_to_all_back_compat_with_barge_in(self):
         expected_play_request = PlayRequest(
             play_sources=[play_source._to_generated()],
             play_to=[],
-            play_options=PlayOptions(loop=False),
-            interrupt_call_media_operation=True
+            play_options=PlayOptions(loop=False, interrupt_call_media_operation=True)
         )
         mock_play.assert_called_once()
         actual_play_request = mock_play.call_args[0][1]
@@ -176,7 +174,7 @@ def test_play_file_to_all_back_compat_with_barge_in(self):
             actual_play_request.play_sources[0].play_source_cache_id,
         )
         self.assertEqual(expected_play_request.play_to, actual_play_request.play_to)
-        self.assertEqual(expected_play_request.interrupt_call_media_operation, actual_play_request.interrupt_call_media_operation)
+        self.assertEqual(expected_play_request.play_options.interrupt_call_media_operation, actual_play_request.play_options.interrupt_call_media_operation)
 
     def test_play_multiple_source_to_all(self):
         mock_play = Mock()

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

@@ -15,9 +15,10 @@
     PhoneNumberIdentifier,
     MediaStreamingOptions,
     MediaStreamingContentType,
-    StreamingTransportType,
+    MediaStreamingTransportType,
     MediaStreamingAudioChannelType,
     TranscriptionOptions,
+    TranscriptionTransportType,
     TextSource,
     RecognizeInputType,
     RecognitionChoice
@@ -214,7 +215,7 @@ def test_start_stop_media_streaming_in_a_call(self):
 
         media_streaming_options=MediaStreamingOptions(
             transport_url=self.transport_url,
-            transport_type=StreamingTransportType.WEBSOCKET,
+            transport_type=MediaStreamingTransportType.WEBSOCKET,
             content_type=MediaStreamingContentType.AUDIO,
             audio_channel_type=MediaStreamingAudioChannelType.MIXED,
             start_media_streaming=False)
@@ -276,7 +277,7 @@ def test_start_stop_transcription_in_call(self):
 
         transcription_options=TranscriptionOptions(
             transport_url=self.transport_url,
-            transport_type=StreamingTransportType.WEBSOCKET,
+            transport_type=TranscriptionTransportType.WEBSOCKET,
             locale="en-US",
             start_transcription=False)