CallAutomationClient PMA Endpoint Constructors

sdk/communication/Azure.Communication.CallAutomation/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/communication/Azure.Communication.CallAutomation",
-  "Tag": "net/communication/Azure.Communication.CallAutomation_fdf269ce94"
+  "Tag": "net/communication/Azure.Communication.CallAutomation_13e45d1662"
 }

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs

@@ -25,7 +25,6 @@ public class CallAutomationClient
         internal AzureCommunicationServicesRestClient AzureCommunicationServicesRestClient { get; }
         internal CallMediaRestClient CallMediaRestClient { get; }
         internal CallRecordingRestClient CallRecordingRestClient { get; }
-        internal CallDialogRestClient CallDialogRestClient { get; }
         internal CallAutomationEventProcessor EventProcessor { get; }
 
         /// <summary>
@@ -115,17 +114,16 @@ private CallAutomationClient(Uri endpoint, HttpPipeline httpPipeline, CallAutoma
             CallConnectionRestClient = new CallConnectionRestClient(_clientDiagnostics, httpPipeline, endpoint, options.ApiVersion);
             CallMediaRestClient = new CallMediaRestClient(_clientDiagnostics, httpPipeline, endpoint, options.ApiVersion);
             CallRecordingRestClient = new CallRecordingRestClient(_clientDiagnostics, httpPipeline, endpoint, options.ApiVersion);
-            CallDialogRestClient = new CallDialogRestClient(_clientDiagnostics, httpPipeline, endpoint, options.ApiVersion);
             EventProcessor = new CallAutomationEventProcessor();
             Source = options.Source;
         }
 
         private CallAutomationClient(
-            Uri pmaEndpoint,
-            Uri acsEndpoint,
-            CallAutomationClientOptions options,
-            TokenCredential tokenCredential)
-            : this(pmaEndpoint, options.CustomBuildHttpPipeline(acsEndpoint, tokenCredential), options)
+           Uri pmaEndpoint,
+           Uri acsEndpoint,
+           CallAutomationClientOptions options,
+           TokenCredential tokenCredential)
+           : this(pmaEndpoint, options.CustomBuildHttpPipeline(acsEndpoint, tokenCredential), options)
         { }
         #endregion
 
@@ -242,24 +240,15 @@ private AnswerCallRequestInternal CreateAnswerCallRequest(AnswerCallOptions opti
             AnswerCallRequestInternal request = new AnswerCallRequestInternal(options.IncomingCallContext, options.CallbackUri.AbsoluteUri);
 
             // Add CallIntelligenceOptions such as custom cognitive service domain name
-            string cognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri;
-            string backupCognitiveServicesEndpoint = options.CallIntelligenceOptions?.BackupCognitiveServicesEndpoint?.AbsoluteUri;
-            if (!string.IsNullOrWhiteSpace(cognitiveServicesEndpoint))
+            request.CallIntelligenceOptions = new()
             {
-                request.CallIntelligenceOptions = new()
-                {
-                    CognitiveServicesEndpoint = cognitiveServicesEndpoint,
-                    BackupCognitiveServicesEndpoint = backupCognitiveServicesEndpoint
-                };
-            }
+                CognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri
+            };
 
             request.MediaStreamingOptions = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
             request.TranscriptionOptions = CreateTranscriptionOptionsInternal(options.TranscriptionOptions);
             request.AnsweredBy = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id);
             request.OperationContext = options.OperationContext;
-            request.CustomCallingContext = new CustomCallingContextInternal(
-                options.CustomCallingContext?.VoipHeaders ?? new ChangeTrackingDictionary<string, string>(),
-                options.CustomCallingContext?.SipHeaders ?? new ChangeTrackingDictionary<string, string>());
 
             return request;
         }
@@ -293,11 +282,6 @@ public virtual async Task<Response> RedirectCallAsync(RedirectCallOptions option
                     throw new ArgumentNullException(nameof(options));
 
                 RedirectCallRequestInternal request = new RedirectCallRequestInternal(options.IncomingCallContext, CommunicationIdentifierSerializer.Serialize(options.CallInvite.Target));
-
-                request.CustomCallingContext = new CustomCallingContextInternal(
-                   options.CallInvite.CustomCallingContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomCallingContext.VoipHeaders,
-                   options.CallInvite.CustomCallingContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomCallingContext.SipHeaders);
-
                 return await AzureCommunicationServicesRestClient.RedirectCallAsync(request, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception ex)
@@ -337,10 +321,6 @@ public virtual Response RedirectCall(RedirectCallOptions options, CancellationTo
 
                 RedirectCallRequestInternal request = new RedirectCallRequestInternal(options.IncomingCallContext, CommunicationIdentifierSerializer.Serialize(options.CallInvite.Target));
 
-                request.CustomCallingContext = new CustomCallingContextInternal(
-                                   options.CallInvite.CustomCallingContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomCallingContext.VoipHeaders,
-                                   options.CallInvite.CustomCallingContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomCallingContext.SipHeaders);
-
                 return AzureCommunicationServicesRestClient.RedirectCall(request, cancellationToken);
             }
             catch (Exception ex)
@@ -724,26 +704,13 @@ private CreateCallRequestInternal CreateCallRequest(CreateCallOptions options)
                     ? null
                     : new PhoneNumberIdentifierModel(options?.CallInvite?.SourceCallerIdNumber?.PhoneNumber),
                 SourceDisplayName = options?.CallInvite?.SourceDisplayName,
-                Source = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id),
-                TeamsAppSource = options.TeamsAppSource == null ? null : new MicrosoftTeamsAppIdentifierModel(options.TeamsAppSource.AppId),
+                Source = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id)
             };
 
-            request.CustomCallingContext = new CustomCallingContextInternal(
-               options.CallInvite.CustomCallingContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomCallingContext.VoipHeaders,
-               options.CallInvite.CustomCallingContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CallInvite.CustomCallingContext.SipHeaders);
-
-            // Add CallIntelligenceOptions such as custom cognitive service domain name
-            string cognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri;
-            string backupCognitiveServicesEndpoint = options.CallIntelligenceOptions?.BackupCognitiveServicesEndpoint?.AbsoluteUri;
-            if (!string.IsNullOrWhiteSpace(cognitiveServicesEndpoint))
+            request.CallIntelligenceOptions = new()
             {
-                request.CallIntelligenceOptions = new()
-                {
-                    CognitiveServicesEndpoint = cognitiveServicesEndpoint,
-                    BackupCognitiveServicesEndpoint = backupCognitiveServicesEndpoint
-                };
-            }
-
+                CognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri
+            };
             request.OperationContext = options.OperationContext;
             request.MediaStreamingOptions = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
             request.TranscriptionOptions = CreateTranscriptionOptionsInternal(options.TranscriptionOptions);
@@ -761,25 +728,13 @@ private CreateCallRequestInternal CreateCallRequest(CreateGroupCallOptions optio
                     ? null
                     : new PhoneNumberIdentifierModel(options?.SourceCallerIdNumber?.PhoneNumber),
                 SourceDisplayName = options?.SourceDisplayName,
-                Source = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id),
-                TeamsAppSource = options.TeamsAppSource == null ? null : new MicrosoftTeamsAppIdentifierModel(options.TeamsAppSource.AppId)
+                Source = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id)
             };
 
-            request.CustomCallingContext = new CustomCallingContextInternal(
-               options.CustomCallingContext.VoipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomCallingContext.VoipHeaders,
-               options.CustomCallingContext.SipHeaders == null ? new ChangeTrackingDictionary<string, string>() : options.CustomCallingContext.SipHeaders);
-
-            // Add CallIntelligenceOptions such as custom cognitive service domain name
-            string cognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri;
-            string backupCognitiveServicesEndpoint = options.CallIntelligenceOptions?.BackupCognitiveServicesEndpoint?.AbsoluteUri;
-            if (!string.IsNullOrWhiteSpace(cognitiveServicesEndpoint))
+            request.CallIntelligenceOptions = new()
             {
-                request.CallIntelligenceOptions = new()
-                {
-                    CognitiveServicesEndpoint = cognitiveServicesEndpoint,
-                    BackupCognitiveServicesEndpoint = backupCognitiveServicesEndpoint
-                };
-            }
+                CognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri
+            };
 
             request.OperationContext = options.OperationContext;
             request.MediaStreamingOptions = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
@@ -795,49 +750,41 @@ private ConnectRequestInternal ConnectRequest(ConnectCallOptions options)
             connectRequest.OperationContext = options.OperationContext;
             connectRequest.MediaStreamingOptions = CreateMediaStreamingOptionsInternal(options.MediaStreamingOptions);
             connectRequest.TranscriptionOptions = CreateTranscriptionOptionsInternal(options.TranscriptionOptions);
-
-            string cognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri;
-            string backupCognitiveServicesEndpoint = options.CallIntelligenceOptions?.BackupCognitiveServicesEndpoint?.AbsoluteUri;
-            if (!string.IsNullOrWhiteSpace(cognitiveServicesEndpoint))
+            connectRequest.CallIntelligenceOptions = new()
             {
-                connectRequest.CallIntelligenceOptions = new()
-                {
-                    CognitiveServicesEndpoint = cognitiveServicesEndpoint,
-                    BackupCognitiveServicesEndpoint = backupCognitiveServicesEndpoint
-                };
-            }
+                CognitiveServicesEndpoint = options.CallIntelligenceOptions?.CognitiveServicesEndpoint?.AbsoluteUri
+            };
 
             return connectRequest;
         }
 
-        /// <summary>
-        /// Validates an Https Uri.
-        /// </summary>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        private static bool IsValidHttpsUri(Uri uri)
-        {
-            if (uri == null)
-                return false;
-            var uriString = uri.AbsoluteUri;
-            return Uri.IsWellFormedUriString(uriString, UriKind.Absolute) && new Uri(uriString).Scheme == Uri.UriSchemeHttps;
-        }
-
-        private static MediaStreamingOptionsInternal CreateMediaStreamingOptionsInternal(MediaStreamingOptions configuration)
+        private static WebSocketMediaStreamingOptionsInternal CreateMediaStreamingOptionsInternal(MediaStreamingOptions configuration)
         {
             return configuration == default
                 ? default
-                : new MediaStreamingOptionsInternal(configuration.TransportUri.AbsoluteUri, configuration.MediaStreamingTransport,
-                configuration.MediaStreamingContent, configuration.MediaStreamingAudioChannel, configuration.StartMediaStreaming,
-                configuration.EnableBidirectional, configuration.AudioFormat);
+                : new WebSocketMediaStreamingOptionsInternal(configuration.MediaStreamingAudioChannel)
+                {
+                    AudioFormat = configuration.AudioFormat,
+                    TransportUrl = configuration.TransportUri?.AbsoluteUri,
+                    TransportType = configuration.MediaStreamingTransport,
+                    ContentType = configuration.MediaStreamingContent,
+                    EnableBidirectional = configuration.EnableBidirectional,
+                    EnableDtmfTones = configuration.EnableDtmfTones,
+                    StartMediaStreaming = configuration.StartMediaStreaming,
+                };
         }
-        private static TranscriptionOptionsInternal CreateTranscriptionOptionsInternal(TranscriptionOptions configuration)
+
+        private static WebSocketTranscriptionOptionsInternal CreateTranscriptionOptionsInternal(TranscriptionOptions configuration)
         {
             return configuration == default
                 ? default
-                : new TranscriptionOptionsInternal(configuration.TransportUrl.AbsoluteUri, configuration.TranscriptionTransport, configuration.Locale,
-                configuration.StartTranscription.GetValueOrDefault())
+                : new WebSocketTranscriptionOptionsInternal(
+                configuration.Locale)
                 {
+                    SpeechModelEndpointId = configuration.SpeechRecognitionModelEndpointId,
+                    StartTranscription = configuration.StartTranscription,
+                    TransportUrl = configuration.TransportUri?.AbsoluteUri,
+                    TransportType = configuration.TranscriptionTransport,
                     EnableIntermediateResults = configuration.EnableIntermediateResults,
                     SpeechRecognitionModelEndpointId = configuration.SpeechRecognitionModelEndpointId
                 };
@@ -851,7 +798,7 @@ public virtual CallConnection GetCallConnection(string callConnectionId)
             scope.Start();
             try
             {
-                return new CallConnection(callConnectionId, CallConnectionRestClient, CallMediaRestClient, CallDialogRestClient, _clientDiagnostics, EventProcessor);
+                return new CallConnection(callConnectionId, CallConnectionRestClient, CallMediaRestClient, _clientDiagnostics, EventProcessor);
             }
             catch (Exception ex)
             {

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClientOptions.cs

@@ -16,7 +16,7 @@ public class CallAutomationClientOptions : ClientOptions
         /// <summary>
         /// The latest version of the CallAutomation service.
         /// </summary>
-        internal const ServiceVersion LatestVersion = ServiceVersion.V2024_09_01_Preview;
+        internal const ServiceVersion LatestVersion = ServiceVersion.V2025_05_15;
 
         internal string ApiVersion { get; }
 
@@ -33,10 +33,10 @@ public CallAutomationClientOptions(ServiceVersion version = LatestVersion)
             ApiVersion = version switch
             {
                 ServiceVersion.V2023_03_06 => "2023-03-06",
-                ServiceVersion.V2023_06_15_Preview => "2023-06-15-preview",
                 ServiceVersion.V2023_10_15 => "2023-10-15",
-                ServiceVersion.V2023_10_03_Preview => "2023-10-03-preview",
-                ServiceVersion.V2024_09_01_Preview => "2024-09-01-preview",
+                ServiceVersion.V2024_04_15 => "2024-04-15",
+                ServiceVersion.V2024_09_15 => "2024-09-15",
+                ServiceVersion.V2025_05_15 => "2025-05-15",
                 _ => throw new ArgumentOutOfRangeException(nameof(version)),
             };
         }
@@ -53,24 +53,24 @@ public enum ServiceVersion
             V2023_03_06 = 1,
 
             /// <summary>
-            /// The BETA2 (1.1.0-beta) of the CallAutomation service.
+            /// The GA2 (1.1.0) of the CallAutomation service.
             /// </summary>
-            V2023_06_15_Preview = 2,
+            V2023_10_15 = 2,
 
             /// <summary>
-            /// The GA2 (1.1.0) of the CallAutomation service.
+            /// The GA3 (1.2.0) of the CallAutomation service.
             /// </summary>
-            V2023_10_15 = 3,
+            V2024_04_15 = 3,
 
             /// <summary>
-            /// Latest ALPHA3 (1.2.0-alpha) preview of the CallAutomation service.
+            /// The GA4 (1.3.0) of the CallAutomation service.
             /// </summary>
-            V2023_10_03_Preview = 4,
+            V2024_09_15 = 4,
 
             /// <summary>
-            /// Latest ALPHA4 (1.4.0-alpha) preview of the CallAutomation service.
+            /// The GA5 (1.4.0) of the CallAutomation service.
             /// </summary>
-            V2024_09_01_Preview = 5
+            V2025_05_15 = 5,
 #pragma warning restore CA1707 // Identifiers should not contain underscores
         }
     }

sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationEventProcessor/EventResult/CancelAddParticipantEventResult.cs

@@ -21,29 +21,14 @@ public class CancelAddParticipantEventResult
         /// </summary>
         public CancelAddParticipantFailed FailureResult { get; }
 
-        /// <summary>
-        /// <see cref="CommunicationIdentifier"/> Participant whoose invitation was cancelled. Only applicable for
-        /// <see cref="CancelAddParticipantSucceeded"/> event
-        /// </summary>
-        public CommunicationIdentifier Participant { get; }
-
-        /// <summary>
-        /// Invitation ID used to cancel the request.
-        /// </summary>
-        public string InvitationId { get; }
-
         internal CancelAddParticipantEventResult(
             bool isSuccess,
             CancelAddParticipantSucceeded successResult,
-            CancelAddParticipantFailed failureResult,
-            string invitationId,
-            CommunicationIdentifier participant = null)
+            CancelAddParticipantFailed failureResult)
         {
             IsSuccess = isSuccess;
             SuccessResult = successResult;
             FailureResult = failureResult;
-            Participant = participant;
-            InvitationId = invitationId;
         }
     }
 }