Skip to content

Commit

Permalink
Beta 2 feedback changes(sdk specific only) (#37876)
Browse files Browse the repository at this point in the history 
* Beta 2 feedback changes(sdk specific only)

* make remaining ABR updates

* update media event reason codes

* address pr comments

* update tests

---------

Co-authored-by: abhishesingh-msft <abhishesingh@microsoft.com>
Co-authored-by: Adam Tazi <adamtazi@microsoft.com>
  • Loading branch information
@vivekmore-msft @abhishesingh-msft @atazimsft
3 people committed Sep 18, 2023
1 parent 18060f2 commit b5d6227
Show file tree
Hide file tree
Showing 79 changed files with 1,694 additions and 850 deletions.
119 changes: 61 additions & 58 deletions ...ure.Communication.CallAutomation/api/Azure.Communication.CallAutomation.netstandard2.0.cs
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions ...nication/Azure.Communication.CallAutomation/src/Azure.Communication.CallAutomation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,4 @@
<PackageReference Include="Azure.Communication.Common" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>
<ItemGroup>
<Folder Include="Generated\" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions sdk/communication/Azure.Communication.CallAutomation/src/CallAutomationClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ private AnswerCallRequestInternal CreateAnswerCallRequest(AnswerCallOptions opti
AnswerCallRequestInternal request = new AnswerCallRequestInternal(options.IncomingCallContext, options.CallbackUri.AbsoluteUri);

// Add custom cognitive service domain name
if (options.AzureCognitiveServicesEndpointUri != null)
if (options.CognitiveServicesEndpoint != null)
{
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUri.AbsoluteUri;
request.CognitiveServicesEndpoint = options.CognitiveServicesEndpoint.AbsoluteUri;
}

request.AnsweredBy = Source == null ? null : new CommunicationUserIdentifierModel(Source.Id);
Expand Down Expand Up @@ -576,9 +576,9 @@ private CreateCallRequestInternal CreateCallRequest(CreateCallOptions options)
};

// Add custom cognitive service domain name
if (options.AzureCognitiveServicesEndpointUri != null)
if (options.CognitiveServicesEndpoint != null)
{
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUri.AbsoluteUri;
request.CognitiveServicesEndpoint = options.CognitiveServicesEndpoint.AbsoluteUri;
}

request.OperationContext = options.OperationContext;
Expand All @@ -600,9 +600,9 @@ private CreateCallRequestInternal CreateCallRequest(CreateGroupCallOptions optio
};

// Add custom cognitive service domain name
if (options.AzureCognitiveServicesEndpointUri != null)
if (options.CognitiveServicesEndpoint != null)
{
request.AzureCognitiveServicesEndpointUrl = options.AzureCognitiveServicesEndpointUri.AbsoluteUri;
request.CognitiveServicesEndpoint = options.CognitiveServicesEndpoint.AbsoluteUri;
}

request.OperationContext = options.OperationContext;
Expand Down
31 changes: 0 additions & 31 deletions ...cation.CallAutomation/src/CallAutomationEventProcessor/EventResult/SendDtmfEventResult.cs
View file

This file was deleted.

31 changes: 31 additions & 0 deletions ...n.CallAutomation/src/CallAutomationEventProcessor/EventResult/SendDtmfTonesEventResult.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

namespace Azure.Communication.CallAutomation
{
/// <summary><see cref="SendDtmfTonesEventResult"/> is returned from WaitForEvent of <see cref="SendDtmfTonesResult"/>.</summary>
public class SendDtmfTonesEventResult
{
/// <summary>
/// Indicates whether the returned event is considered successful or not.
/// </summary>
public bool IsSuccess { get; internal set; }

/// <summary>
/// <see cref="SendDtmfTonesCompleted"/> event will be returned once the dtmf tones have been sent successfully.
/// </summary>
public SendDtmfTonesCompleted SuccessResult { get; }

/// <summary>
/// <see cref="SendDtmfTonesFailed"/> event will be returned if send dtmf tones completed unsuccessfully.
/// </summary>
public SendDtmfTonesFailed FailureResult { get; }

internal SendDtmfTonesEventResult(bool isSuccess, SendDtmfTonesCompleted successResult, SendDtmfTonesFailed failureResult)
{
IsSuccess = isSuccess;
SuccessResult = successResult;
FailureResult = failureResult;
}
}
}
66 changes: 16 additions & 50 deletions sdk/communication/Azure.Communication.CallAutomation/src/CallConnection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,47 +613,30 @@ public virtual CallMedia GetCallMedia()
/// Only Acs Users are currently supported.
/// </summary>
/// <param name="targetParticipant">Participant to mute.</param>
/// <param name="operationContext"> The Operation Context. </param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <exception cref="RequestFailedException">The server returned an error. See <see cref="Exception.Message"/> for details returned from the server.</exception>
/// <exception cref="ArgumentNullException"> <paramref name="targetParticipant"/> is null. </exception>
/// <returns>A Response containing MuteParticipantsResponse.</returns>
public virtual Response<MuteParticipantsResult> MuteParticipants(CommunicationIdentifier targetParticipant, CancellationToken cancellationToken = default)
{
var options = new MuteParticipantsOptions(new List<CommunicationIdentifier> { targetParticipant });

return MuteParticipants(options, cancellationToken);
}

/// <summary>
/// Mute participants from the call.
/// Only Acs Users are currently supported.
/// </summary>
/// <param name="options">Options for the MuteParticipant operation.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <exception cref="RequestFailedException">The server returned an error. See <see cref="Exception.Message"/> for details returned from the server.</exception>
/// <exception cref="ArgumentNullException"> <paramref name="options"/> is null. </exception>
/// <returns>A Response containing MuteParticipantsResponse. </returns>
public virtual Response<MuteParticipantsResult> MuteParticipants(MuteParticipantsOptions options, CancellationToken cancellationToken = default)
public virtual Response<MuteParticipantResult> MuteParticipant(CommunicationIdentifier targetParticipant, string operationContext = default, CancellationToken cancellationToken = default)
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(MuteParticipants)}");
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(MuteParticipant)}");
scope.Start();
try
{
if (options == null)
throw new ArgumentNullException(nameof(options));

MuteParticipantsRequestInternal request = new MuteParticipantsRequestInternal(
options.TargetParticipants.Select(participant => CommunicationIdentifierSerializer.Serialize(participant)));
MuteParticipantRequestInternal request = new(new List<CommunicationIdentifierModel>() { CommunicationIdentifierSerializer.Serialize(targetParticipant) });
var repeatabilityHeaders = new RepeatabilityHeaders();

request.OperationContext = options.OperationContext;
request.OperationContext = operationContext;

return RestClient.Mute(
var response = RestClient.Mute(
CallConnectionId,
request,
repeatabilityHeaders.RepeatabilityRequestId,
repeatabilityHeaders.RepeatabilityFirstSent,
cancellationToken);

return Response.FromValue(new MuteParticipantResult(response.Value), response.GetRawResponse());
}
catch (Exception ex)
{
Expand All @@ -667,47 +650,30 @@ public virtual Response<MuteParticipantsResult> MuteParticipants(MuteParticipant
/// Only Acs Users are currently supported.
/// </summary>
/// <param name="targetParticipant">Participants to mute.</param>
/// <param name="operationContext"> The Operation Context. </param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <exception cref="ArgumentNullException"> <paramref name="targetParticipant"/> is null. </exception>
/// <exception cref="RequestFailedException">The server returned an error. See <see cref="Exception.Message"/> for details returned from the server.</exception>
/// <returns></returns>
public async virtual Task<Response<MuteParticipantsResult>> MuteParticipantsAsync(CommunicationIdentifier targetParticipant, CancellationToken cancellationToken = default)
public async virtual Task<Response<MuteParticipantResult>> MuteParticipantAsync(CommunicationIdentifier targetParticipant, string operationContext = default, CancellationToken cancellationToken = default)
{
var options = new MuteParticipantsOptions(new List<CommunicationIdentifier> { targetParticipant });

return await MuteParticipantsAsync(options, cancellationToken).ConfigureAwait(false);
}

/// <summary>
/// Mute participants on the call.
/// </summary>
/// <param name="options">Options for the MuteParticipant operation.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <exception cref="ArgumentNullException"> <paramref name="options"/> is null. </exception>
/// <exception cref="ArgumentException"> <paramref name="options"/> OperationContext is too long. </exception>
/// <exception cref="RequestFailedException">The server returned an error. See <see cref="Exception.Message"/> for details returned from the server.</exception>
/// <returns></returns>
public async virtual Task<Response<MuteParticipantsResult>> MuteParticipantsAsync(MuteParticipantsOptions options, CancellationToken cancellationToken = default)
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(MuteParticipants)}");
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallConnection)}.{nameof(MuteParticipant)}");
scope.Start();
try
{
if (options == null)
throw new ArgumentNullException(nameof(options));

MuteParticipantsRequestInternal request = new MuteParticipantsRequestInternal(
options.TargetParticipants.Select(participant => CommunicationIdentifierSerializer.Serialize(participant)));
MuteParticipantRequestInternal request = new(new List<CommunicationIdentifierModel>() { CommunicationIdentifierSerializer.Serialize(targetParticipant) });
var repeatabilityHeaders = new RepeatabilityHeaders();

request.OperationContext = options.OperationContext;
request.OperationContext = operationContext;

return await RestClient.MuteAsync(
var response = await RestClient.MuteAsync(
CallConnectionId,
request,
repeatabilityHeaders.RepeatabilityRequestId,
repeatabilityHeaders.RepeatabilityFirstSent,
cancellationToken).ConfigureAwait(false);

return Response.FromValue(new MuteParticipantResult(response.Value), response.GetRawResponse());
}
catch (Exception ex)
{
Expand Down
46 changes: 24 additions & 22 deletions sdk/communication/Azure.Communication.CallAutomation/src/CallMedia.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ private static RecognizeRequestInternal CreateRecognizeRequest(CallMediaRecogniz
InitialSilenceTimeoutInSeconds = (int)recognizeChoiceOptions.InitialSilenceTimeout.TotalSeconds
};

recognizeChoiceOptions.RecognizeChoices
recognizeChoiceOptions.Choices
.ToList().ForEach(t => recognizeConfigurationsInternal.Choices.Add(t));

if (!String.IsNullOrEmpty(recognizeChoiceOptions.SpeechLanguage))
Expand Down Expand Up @@ -535,19 +535,19 @@ private static PlaySourceInternal TranslatePlaySourceToInternal(PlaySource playS
else if (playSource != null && playSource is TextSource textSource)
{
sourceInternal = new PlaySourceInternal(PlaySourceTypeInternal.Text);
sourceInternal.TextSource = new TextSourceInternal(textSource.Text);
sourceInternal.TextSource.SourceLocale = textSource.SourceLocale ?? null;
sourceInternal.TextSource.VoiceGender = textSource.VoiceGender ?? GenderType.Male;
sourceInternal.TextSource.VoiceName = textSource.VoiceName ?? null;
sourceInternal.TextSource.CustomVoiceEndpointId = textSource.CustomVoiceEndpointId ?? null;
sourceInternal.Text = new TextSourceInternal(textSource.Text);
sourceInternal.Text.SourceLocale = textSource.SourceLocale ?? null;
sourceInternal.Text.VoiceKind = textSource.VoiceKind ?? VoiceKind.Male;
sourceInternal.Text.VoiceName = textSource.VoiceName ?? null;
sourceInternal.Text.CustomVoiceEndpointId = textSource.CustomVoiceEndpointId ?? null;
sourceInternal.PlaySourceCacheId = textSource.PlaySourceCacheId;
return sourceInternal;
}
else if (playSource != null && playSource is SsmlSource ssmlSource)
{
sourceInternal = new PlaySourceInternal(PlaySourceTypeInternal.Ssml);
sourceInternal.SsmlSource = new SsmlSourceInternal(ssmlSource.SsmlText);
sourceInternal.SsmlSource.CustomVoiceEndpointId = ssmlSource.CustomVoiceEndpointId ?? null;
sourceInternal.Ssml = new SsmlSourceInternal(ssmlSource.SsmlText);
sourceInternal.Ssml.CustomVoiceEndpointId = ssmlSource.CustomVoiceEndpointId ?? null;
sourceInternal.PlaySourceCacheId = ssmlSource.PlaySourceCacheId;
return sourceInternal;
}
Expand Down Expand Up @@ -676,23 +676,24 @@ public virtual async Task<Response> StopContinuousDtmfRecognitionAsync(Communica
/// <param name="operationContext">An optional context object containing information about the operation, such as a unique identifier or custom metadata.</param>
/// <param name="cancellationToken">An optional CancellationToken to cancel the request.</param>
/// <returns>Returns a Response containing a SendDtmfResult object indicating the result of the send operation.</returns>
public virtual async Task<Response<SendDtmfResult>> SendDtmfAsync(IEnumerable<DtmfTone> tones, CommunicationIdentifier targetParticipant,
public virtual async Task<Response<SendDtmfTonesResult>> SendDtmfTonesAsync(IEnumerable<DtmfTone> tones, CommunicationIdentifier targetParticipant,
string operationContext = default, CancellationToken cancellationToken = default)
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallMedia)}.{nameof(SendDtmf)}");
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallMedia)}.{nameof(SendDtmfTones)}");
scope.Start();
try
{
SendDtmfRequestInternal request = request = new(tones, CommunicationIdentifierSerializer.Serialize(targetParticipant));

request.OperationContext = operationContext;
SendDtmfTonesRequestInternal request = new(tones, CommunicationIdentifierSerializer.Serialize(targetParticipant))
{
OperationContext = operationContext
};

var repeatabilityHeaders = new RepeatabilityHeaders();

var response = await CallMediaRestClient.SendDtmfAsync(CallConnectionId, request, repeatabilityHeaders.RepeatabilityRequestId,
var response = await CallMediaRestClient.SendDtmfTonesAsync(CallConnectionId, request, repeatabilityHeaders.RepeatabilityRequestId,
repeatabilityHeaders.RepeatabilityFirstSent, cancellationToken).ConfigureAwait(false);

var result = new SendDtmfResult();
var result = new SendDtmfTonesResult(response.Value.OperationContext);
result.SetEventProcessor(EventProcessor, CallConnectionId, response.Value.OperationContext);

return Response.FromValue(result, response.GetRawResponse());
Expand All @@ -712,23 +713,24 @@ public virtual async Task<Response<SendDtmfResult>> SendDtmfAsync(IEnumerable<Dt
/// <param name="operationContext">An optional context object containing information about the operation, such as a unique identifier or custom metadata.</param>
/// <param name="cancellationToken">An optional CancellationToken to cancel the request.</param>
/// <returns>Returns a Response containing a SendDtmfResult object indicating the result of the send operation.</returns>
public virtual Response<SendDtmfResult> SendDtmf(IEnumerable<DtmfTone> tones, CommunicationIdentifier targetParticipant,
public virtual Response<SendDtmfTonesResult> SendDtmfTones(IEnumerable<DtmfTone> tones, CommunicationIdentifier targetParticipant,
string operationContext = default, CancellationToken cancellationToken = default)
{
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallMedia)}.{nameof(SendDtmf)}");
using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(CallMedia)}.{nameof(SendDtmfTones)}");
scope.Start();
try
{
SendDtmfRequestInternal request = new(tones, CommunicationIdentifierSerializer.Serialize(targetParticipant));

request.OperationContext = operationContext;
SendDtmfTonesRequestInternal request = new(tones, CommunicationIdentifierSerializer.Serialize(targetParticipant))
{
OperationContext = operationContext
};

var repeatabilityHeaders = new RepeatabilityHeaders();

var response = CallMediaRestClient.SendDtmf(CallConnectionId, request, repeatabilityHeaders.RepeatabilityRequestId,
var response = CallMediaRestClient.SendDtmfTones(CallConnectionId, request, repeatabilityHeaders.RepeatabilityRequestId,
repeatabilityHeaders.RepeatabilityFirstSent, cancellationToken);

var result = new SendDtmfResult();
var result = new SendDtmfTonesResult(response.Value.OperationContext);
result.SetEventProcessor(EventProcessor, CallConnectionId, response.Value.OperationContext);

return Response.FromValue(result, response.GetRawResponse());
Expand Down
Loading

0 comments on commit b5d6227

Please sign in to comment.