Merge pull request #1093 from iceljc/master

Refine realtime and twilio

src/Infrastructure/BotSharp.Abstraction/SideCar/Attributes/SideCarAttribute.cs

@@ -79,7 +79,7 @@ public class SideCarAttribute : AsyncMoAttribute
         object? res = null;
         var isHandled = false;
 
-        var enabled = instance != null && instance.IsEnabled() && method != null;
+        var enabled = instance != null && instance.IsEnabled && method != null;
         if (!enabled)
         {
             return (isHandled, value);
@@ -112,7 +112,7 @@ public class SideCarAttribute : AsyncMoAttribute
         object? value = null;
         var isHandled = false;
 
-        var enabled = instance != null && instance.IsEnabled() && method != null;
+        var enabled = instance != null && instance.IsEnabled && method != null;
         if (!enabled)
         {
             return (isHandled, value);

src/Infrastructure/BotSharp.Abstraction/SideCar/IConversationSideCar.cs

@@ -5,8 +5,8 @@ namespace BotSharp.Abstraction.SideCar;
 public interface IConversationSideCar
 {
     string Provider { get; }
+    bool IsEnabled { get; }
 
-    bool IsEnabled();
     void AppendConversationDialogs(string conversationId, List<DialogElement> messages);
     List<DialogElement> GetConversationDialogs(string conversationId);
     void UpdateConversationBreakpoint(string conversationId, ConversationBreakpoint breakpoint);

src/Infrastructure/BotSharp.Core.SideCar/Services/BotSharpConversationSideCar.cs

@@ -14,7 +14,6 @@
   limitations under the License.
 ******************************************************************************/
 
-using BotSharp.Abstraction.SideCar.Models;
 using BotSharp.Core.Infrastructures;
 
 namespace BotSharp.Core.SideCar.Services;
@@ -31,6 +30,7 @@ public class BotSharpConversationSideCar : IConversationSideCar
     private string _conversationId = string.Empty;
 
     public string Provider => "botsharp";
+    public bool IsEnabled => _enabled;
 
     public BotSharpConversationSideCar(
         IServiceProvider services,
@@ -40,11 +40,6 @@ public class BotSharpConversationSideCar : IConversationSideCar
         _logger = logger;
     }
 
-    public bool IsEnabled()
-    {
-        return _enabled;
-    }
-
     public void AppendConversationDialogs(string conversationId, List<DialogElement> messages)
     {
         if (!IsValid(conversationId))
@@ -99,17 +94,22 @@ public class BotSharpConversationSideCar : IConversationSideCar
         top.State = new ConversationState(states);
     }
 
-    public async Task<RoleDialogModel> SendMessage(string agentId, string text,
+    public async Task<RoleDialogModel> SendMessage(
+        string agentId,
+        string text,
         PostbackMessageModel? postback = null,
         List<MessageState>? states = null,
         List<DialogElement>? dialogs = null,
         SideCarOptions? options = null)
     {
         _sideCarOptions = options;
+        _logger.LogInformation($"Entering side car conversation...");
 
         BeforeExecute(dialogs);
         var response = await InnerExecute(agentId, text, postback, states);
         AfterExecute();
+
+        _logger.LogInformation($"Existing side car conversation...");
         return response;
     }
 

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs

@@ -159,7 +159,7 @@ public class ConversationStateService : IConversationStateService
         Reset();
 
         var endNodes = new Dictionary<string, string>();
-        if (_sidecar?.IsEnabled() == true)
+        if (_sidecar?.IsEnabled == true)
         {
             return endNodes;
         }
@@ -234,7 +234,7 @@ public class ConversationStateService : IConversationStateService
 
     public void Save()
     {
-        if (_conversationId == null || _sidecar?.IsEnabled() == true)
+        if (_conversationId == null || _sidecar?.IsEnabled == true)
         {
             return;
         }

src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs

@@ -62,6 +62,7 @@ public class ChatStreamMiddleware
         var hub = services.GetRequiredService<IRealtimeHub>();
         var conn = hub.SetHubConnection(conversationId);
         conn.CurrentAgentId = agentId;
+        InitEvents(conn);
 
         // load conversation and state
         var convService = services.GetRequiredService<IConversationService>();
@@ -128,6 +129,11 @@ public class ChatStreamMiddleware
                 break;
         }
 
+        return (response.Event, data);
+    }
+
+    private void InitEvents(RealtimeHubConnection conn)
+    {
         conn.OnModelMessageReceived = message =>
             JsonSerializer.Serialize(new
             {
@@ -147,7 +153,5 @@ public class ChatStreamMiddleware
             {
                 @event = "clear"
             });
-
-        return (response.Event, data);
     }
 }

src/Plugins/BotSharp.Plugin.ChatHub/Hooks/ChatHubConversationHook.cs

@@ -179,7 +179,7 @@ public class ChatHubConversationHook : ConversationHookBase
     private bool AllowSendingMessage()
     {
         var sidecar = _services.GetService<IConversationSideCar>();
-        return sidecar == null || !sidecar.IsEnabled();
+        return sidecar == null || !sidecar.IsEnabled;
     }
 
     private async Task InitClientConversation(string conversationId, ConversationDto conversation)

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs

@@ -329,17 +329,13 @@ public class GoogleRealTimeProvider : IRealTimeCompletion
         var words = new List<string>();
         HookEmitter.Emit<IRealtimeHook>(_services, hook => words.AddRange(hook.OnModelTranscriptPrompt(agent)), agent.Id);
 
-        var functions = request.Tools?.SelectMany(s => s.FunctionDeclarations).Select(x =>
+        var functions = request.Tools?.SelectMany(s => s.FunctionDeclarations).Select(x => new FunctionDef
-        {
-            var fn = new FunctionDef
         {
             Name = x.Name ?? string.Empty,
             Description = x.Description ?? string.Empty,
             Parameters = x.Parameters != null
                             ? JsonSerializer.Deserialize<FunctionParametersDef>(JsonSerializer.Serialize(x.Parameters))
                             : null
-            };
-            return fn;
         }).ToArray();
 
         await HookEmitter.Emit<IContentGeneratingHook>(_services,

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs

@@ -326,15 +326,11 @@ public class RealTimeCompletionProvider : IRealTimeCompletion
         var (prompt, messages, options) = PrepareOptions(agent, []);
 
         var instruction = messages.FirstOrDefault()?.Content.FirstOrDefault()?.Text ?? agent?.Description ?? string.Empty;
-        var functions = options.Tools.Select(x =>
+        var functions = options.Tools.Select(x => new FunctionDef
-        {
-            var fn = new FunctionDef
         {
             Name = x.FunctionName,
-                Description = x.FunctionDescription
+            Description = x.FunctionDescription,
-            };
+            Parameters = JsonSerializer.Deserialize<FunctionParametersDef>(x.FunctionParameters)
-            fn.Parameters = JsonSerializer.Deserialize<FunctionParametersDef>(x.FunctionParameters);
-            return fn;
         }).ToArray();
 
         var realtimeModelSettings = _services.GetRequiredService<RealtimeModelSettings>();

src/Plugins/BotSharp.Plugin.Twilio/Controllers/TwilioInboundController.cs

@@ -53,25 +53,29 @@ public class TwilioInboundController : TwilioController
             instruction.SpeechPaths.Add(request.InitAudioFile);
         }
 
+        // Before creating session
         await HookEmitter.Emit<ITwilioSessionHook>(_services, async hook =>
         {
             await hook.OnSessionCreating(request, instruction);
         }, request.AgentId);
 
+
         var (agent, conversationId) = await InitConversation(request);
         request.ConversationId = conversationId.Id;
         instruction.AgentId = request.AgentId;
         instruction.ConversationId = request.ConversationId;
 
+
+        // After creating session
         await HookEmitter.Emit<ITwilioSessionHook>(_services, async hook =>
         {
             await hook.OnSessionCreated(request);
         }, request.AgentId);
 
+
         if (twilio.MachineDetected(request))
         {
             response = new VoiceResponse();
-            
             await HookEmitter.Emit<ITwilioCallStatusHook>(_services, 
                 async hook => await hook.OnVoicemailStarting(request), request.AgentId);
 
@@ -204,7 +208,7 @@ public class TwilioInboundController : TwilioController
 
             storage.Append(conversation.Id, new RoleDialogModel(AgentRole.User, request.Intent)
             {
-                CurrentAgentId = conversation.Id,
+                CurrentAgentId = agent.Id,
                 CreatedAt = DateTime.UtcNow
             });
         }