Merge pull request #864 from iceljc/master

add routing dialogs

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/ConversationContext.cs

@@ -4,6 +4,7 @@ public class ConversationContext
 {
     public ConversationState State { get; set; }
     public List<DialogElement> Dialogs { get; set; } = new();
+    public List<RoleDialogModel> RoutingDialogs { get; set; } = new();
     public List<ConversationBreakpoint> Breakpoints { get; set; } = new();
     public int RecursiveCounter { get; set; }
     public Stack<string> RoutingStack { get; set; } = new();

src/Infrastructure/BotSharp.Abstraction/Routing/IRoutingContext.cs

@@ -29,4 +29,8 @@ public interface IRoutingContext
     Stack<string> GetAgentStack();
     void SetAgentStack(Stack<string> stack);
     void ResetAgentStack();
+
+    void SetDialogs(List<RoleDialogModel> dialogs);
+    List<RoleDialogModel> GetDialogs();
+    void ResetDialogs();
 }

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

@@ -124,6 +124,7 @@ private void BeforeExecute(List<DialogElement>? dialogs)
         {
             State = state.GetCurrentState(),
             Dialogs = dialogs ?? [],
+            RoutingDialogs = routing.Context.GetDialogs(),
             Breakpoints = [],
             RecursiveCounter = routing.Context.GetRecursiveCounter(),
             RoutingStack = routing.Context.GetAgentStack()
@@ -134,6 +135,7 @@ private void BeforeExecute(List<DialogElement>? dialogs)
         state.ResetCurrentState();
         routing.Context.ResetRecursiveCounter();
         routing.Context.ResetAgentStack();
+        routing.Context.ResetDialogs();
         Utilities.ClearCache();
     }
 
@@ -148,6 +150,7 @@ private void AfterExecute()
         state.SetCurrentState(node.State);
         routing.Context.SetRecursiveCounter(node.RecursiveCounter);
         routing.Context.SetAgentStack(node.RoutingStack);
+        routing.Context.SetDialogs(node.RoutingDialogs);
         Utilities.ClearCache();
         enabled = false;
     }

src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs

@@ -10,6 +10,7 @@ public class RoutingContext : IRoutingContext
     private string _conversationId;
     private string _messageId;
     private int _currentRecursionDepth = 0;
+    private List<RoleDialogModel> _dialogs = [];
 
     public RoutingContext(IServiceProvider services, RoutingSettings setting)
     {
@@ -259,4 +260,19 @@ public void ResetAgentStack()
     {
         _stack.Clear();
     }
+
+    public void SetDialogs(List<RoleDialogModel> dialogs)
+    {
+        _dialogs = dialogs ?? [];
+    }
+
+    public List<RoleDialogModel> GetDialogs()
+    {
+        return _dialogs ?? [];
+    }
+
+    public void ResetDialogs()
+    {
+        _dialogs = [];
+    }
 }

src/Infrastructure/BotSharp.Core/Routing/RoutingService.InstructLoop.cs

@@ -41,6 +41,7 @@ public async Task<RoleDialogModel> InstructLoop(RoleDialogModel message, List<Ro
         }
 
         dialogs.Add(message);
+        Context.SetDialogs(dialogs);
         storage.Append(convService.ConversationId, message);
 
         // Get first instruction

src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeAgent.cs

@@ -59,6 +59,7 @@ public async Task<bool> InvokeAgent(string agentId, List<RoleDialogModel> dialog
             message = RoleDialogModel.From(message, role: AgentRole.Assistant, content: response.Content);
             message.CurrentAgentId = agent.Id;
             dialogs.Add(message);
+            Context.SetDialogs(dialogs);
         }
 
         return true;
@@ -86,6 +87,7 @@ private async Task<bool> InvokeFunction(RoleDialogModel message, List<RoleDialog
                 dialogs.Add(RoleDialogModel.From(message,
                     role: AgentRole.Assistant,
                     content: responseTemplate));
+                Context.SetDialogs(dialogs);
             }
             else
             {
@@ -95,6 +97,7 @@ private async Task<bool> InvokeFunction(RoleDialogModel message, List<RoleDialog
                     content: message.Content);
 
                 dialogs.Add(msg);
+                Context.SetDialogs(dialogs);
 
                 // Send to Next LLM
                 var agentId = routing.Context.GetCurrentAgentId();
@@ -106,6 +109,7 @@ private async Task<bool> InvokeFunction(RoleDialogModel message, List<RoleDialog
             dialogs.Add(RoleDialogModel.From(message,
                 role: AgentRole.Assistant,
                 content: message.Content));
+            Context.SetDialogs(dialogs);
         }
 
         return true;

src/Infrastructure/BotSharp.Core/Routing/RoutingService.cs

@@ -1,6 +1,5 @@
 using BotSharp.Abstraction.Routing.Models;
 using BotSharp.Abstraction.Routing.Settings;
-using BotSharp.Core.Infrastructures;
 
 namespace BotSharp.Core.Routing;
 

src/Plugins/BotSharp.Plugin.FileHandler/Functions/ReadImageFn.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Routing;
+
 namespace BotSharp.Plugin.FileHandler.Functions;
 
 public class ReadImageFn : IFunctionCallback
@@ -20,6 +22,7 @@ public async Task<bool> Execute(RoleDialogModel message)
     {
         var args = JsonSerializer.Deserialize<LlmContextIn>(message.FunctionArgs);
         var conv = _services.GetRequiredService<IConversationService>();
+        var routingCtx = _services.GetRequiredService<IRoutingContext>();
         var agentService = _services.GetRequiredService<IAgentService>();
 
         Agent? fromAgent = null;
@@ -28,7 +31,7 @@ public async Task<bool> Execute(RoleDialogModel message)
             fromAgent = await agentService.LoadAgent(message.CurrentAgentId);
         }
 
-        var wholeDialogs = conv.GetDialogHistory();
+        var wholeDialogs = routingCtx.GetDialogs();
         var dialogs = AssembleFiles(conv.ConversationId, args?.ImageUrls, wholeDialogs);
         var agent = new Agent
         {