Merge pull request #199 from sj-distributor/enhance-ai-speech-call-out

Enhance ai speech assistant call out

Author: happyshower

src/SmartTalk.Api/Controllers/AiSpeechAssistantController.cs

@@ -46,6 +46,28 @@ public async Task ConnectAiSpeechAssistantAsync(string from, string to)
             HttpContext.Response.StatusCode = 400;
         }
     }
+    
+    [HttpGet("outbound/connect")]
+    [HttpGet("outbound/connect/{from}/{to}/{id}")]
+    public async Task OutboundConnectAiSpeechAssistantAsync(string from, string to, int id)
+    {
+        if (HttpContext.WebSockets.IsWebSocketRequest)
+        {
+            var command = new ConnectAiSpeechAssistantCommand
+            {
+                From = from,
+                To = to,
+                AssistantId = id,
+                Host = HttpContext.Request.Host.Host,
+                TwilioWebSocket = await HttpContext.WebSockets.AcceptWebSocketAsync()
+            };
+            await _mediator.SendAsync(command);
+        }
+        else
+        {
+            HttpContext.Response.StatusCode = 400;
+        }
+    }
 
     [Route("recording/callback"), HttpPost]
     public async Task<IActionResult> ReceivePhoneRecordingStatusCallBackAcyn()

src/SmartTalk.Core/Services/AiSpeechAssistant/AiSpeechAssistantDataProvider.cs

@@ -9,7 +9,7 @@ namespace SmartTalk.Core.Services.AiSpeechAssistant;
 public interface IAiSpeechAssistantDataProvider : IScopedDependency
 {
     Task<(Domain.AISpeechAssistant.AiSpeechAssistant, AiSpeechAssistantPromptTemplate, AiSpeechAssistantUserProfile)>
-        GetAiSpeechAssistantInfoByNumbersAsync(string callerNumber, string didNumber, CancellationToken cancellationToken);
+        GetAiSpeechAssistantInfoByNumbersAsync(string callerNumber, string didNumber, int? assistantId = null, CancellationToken cancellationToken = default);
 
     Task<Domain.AISpeechAssistant.AiSpeechAssistant> GetAiSpeechAssistantByNumbersAsync(string didNumber, CancellationToken cancellationToken);
 
@@ -28,7 +28,7 @@ public AiSpeechAssistantDataProvider(IRepository repository)
     }
 
     public async Task<(Domain.AISpeechAssistant.AiSpeechAssistant, AiSpeechAssistantPromptTemplate, AiSpeechAssistantUserProfile)>
-        GetAiSpeechAssistantInfoByNumbersAsync(string callerNumber, string didNumber, CancellationToken cancellationToken)
+        GetAiSpeechAssistantInfoByNumbersAsync(string callerNumber, string didNumber, int? assistantId = null, CancellationToken cancellationToken = default)
     {
         var assistantInfo =
             from assistant in _repository.Query<Domain.AISpeechAssistant.AiSpeechAssistant>()
@@ -38,12 +38,13 @@ from promptTemplate in promptGroup.DefaultIfEmpty()
             join userProfile in _repository.Query<AiSpeechAssistantUserProfile>().Where(x => x.CallerNumber == callerNumber) 
                 on assistant.Id equals userProfile.AssistantId into userProfileGroup
             from userProfile in userProfileGroup.DefaultIfEmpty()
-            where assistant.DidNumber == didNumber
             select new
             {
                 assistant, promptTemplate, userProfile
             };
 
+        assistantInfo = assistantInfo.Where(x => assistantId.HasValue ? x.assistant.Id == assistantId.Value : x.assistant.DidNumber == didNumber);
+
         var result = await assistantInfo.FirstOrDefaultAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
 
         return (result.assistant, result.promptTemplate, result.userProfile);

src/SmartTalk.Core/Services/AiSpeechAssistant/AiSpeechAssistantService.cs

@@ -106,7 +106,7 @@ public async Task<AiSpeechAssistantConnectCloseEvent> ConnectAiSpeechAssistantAs
     {
         Log.Information($"The call from {command.From} to {command.To} is connected");
 
-        var (assistant, knowledgeBase) = await BuildingAiSpeechAssistantKnowledgeBaseAsync(command.From, command.To, cancellationToken).ConfigureAwait(false);
+        var (assistant, knowledgeBase) = await BuildingAiSpeechAssistantKnowledgeBaseAsync(command.From, command.To, command.AssistantId, cancellationToken).ConfigureAwait(false);
 
         if (string.IsNullOrEmpty(knowledgeBase)) return new AiSpeechAssistantConnectCloseEvent();
 
@@ -204,10 +204,10 @@ await CallResource.UpdateAsync(
         );
     }
 
-    private async Task<(Domain.AISpeechAssistant.AiSpeechAssistant Assistant, string Prompt)> BuildingAiSpeechAssistantKnowledgeBaseAsync(string from, string to, CancellationToken cancellationToken)
+    private async Task<(Domain.AISpeechAssistant.AiSpeechAssistant Assistant, string Prompt)> BuildingAiSpeechAssistantKnowledgeBaseAsync(string from, string to, int? assistantId, CancellationToken cancellationToken)
     {
         var (assistant, promptTemplate, userProfile) = await _aiSpeechAssistantDataProvider
-            .GetAiSpeechAssistantInfoByNumbersAsync(from, to, cancellationToken).ConfigureAwait(false);
+            .GetAiSpeechAssistantInfoByNumbersAsync(from, to, assistantId, cancellationToken).ConfigureAwait(false);
 
         Log.Information("Matching Ai speech assistant: {@Assistant}、{@PromptTemplate}、{@UserProfile}", assistant, promptTemplate, userProfile);
 

src/SmartTalk.Messages/Commands/AiSpeechAssistant/ConnectAiSpeechAssistantCommand.cs

@@ -11,5 +11,7 @@ public class ConnectAiSpeechAssistantCommand : ICommand
 
     public string Host { get; set; }
 
+    public int? AssistantId { get; set; }
+    
     public WebSocket TwilioWebSocket { get; set; }
 }