Merge pull request #108 from hchen2020/master

Support rich content in UI.

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Agents/IAgentRouting.cs

@@ -2,5 +2,6 @@ namespace BotSharp.Abstraction.Agents;
 
 public interface IAgentRouting
 {
+    Task<Agent> LoadRouter();
     Task<Agent> LoadCurrentAgent();
 }

src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentRoutingArgs.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace BotSharp.Abstraction.Agents.Models;
+
+public class AgentRoutingArgs
+{
+    [JsonPropertyName("agent_id")]
+    public string AgentId { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs

@@ -20,12 +20,14 @@ public interface IConversationService
     /// <param name="lastDalog"></param>
     /// <param name="onMessageReceived"></param>
     /// <param name="onFunctionExecuting">This delegate is useful when you want to report progress on UI</param>
+    /// <param name="onFunctionExecuted">This delegate is useful when you want to report progress on UI</param>
     /// <returns></returns>
     Task<bool> SendMessage(string agentId, 
         string conversationId, 
         RoleDialogModel lastDalog, 
         Func<RoleDialogModel, Task> onMessageReceived, 
-        Func<RoleDialogModel, Task> onFunctionExecuting);
+        Func<RoleDialogModel, Task> onFunctionExecuting,
+        Func<RoleDialogModel, Task> onFunctionExecuted);
 
     List<RoleDialogModel> GetDialogHistory(string conversationId, int lastCount = 20);
     Task CleanHistory(string agentId);

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

@@ -20,10 +20,16 @@ public class RoleDialogModel
     public string? FunctionArgs { get; set; }
 
     /// <summary>
-    /// Function execution result
+    /// Function execution result, this result will be seen by LLM.
     /// </summary>
     public string? ExecutionResult { get; set; }
 
+    /// <summary>
+    /// Function execution structured data, this data won't pass to LLM.
+    /// It's ideal to render in rich content in UI.
+    /// </summary>
+    public object ExecutionData { get; set; }
+
     public bool IsConversationEnd { get; set; }
 
     public bool NeedReloadAgent { get; set; }

src/Infrastructure/BotSharp.Abstraction/Conversations/Settings/ConversationSetting.cs

@@ -5,4 +5,5 @@ public class ConversationSetting
     public string DataDir { get; set; }
     public string ChatCompletion { get; set; }
     public bool EnableKnowledgeBase { get; set; }
+    public bool ShowVerboseLog { get; set; }
 }

src/Infrastructure/BotSharp.Core/Agents/Services/AgentRouter.cs

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Agents;
 using BotSharp.Abstraction.Agents.Models;
 
 namespace BotSharp.Core.Agents.Services;
@@ -17,11 +18,18 @@ public AgentRouter(IServiceProvider services,
         _settings = settings;
     }
 
+    public async Task<Agent> LoadRouter()
+    {
+        var agentService = _services.GetRequiredService<IAgentService>();
+        var agent = await agentService.LoadAgent(_settings.RouterId);
+        return agent;
+    }
+
     public async Task<Agent> LoadCurrentAgent()
     {
         // Load current agent from state
         var state = _services.GetRequiredService<IConversationStateService>();
-        var currentAgentId = state.GetState("agentId");
+        var currentAgentId = state.GetState("agent_id");
         if (string.IsNullOrEmpty(currentAgentId))
         {
             currentAgentId = _settings.RouterId;
@@ -30,7 +38,7 @@ public async Task<Agent> LoadCurrentAgent()
         var agent = await agentService.LoadAgent(currentAgentId);
 
         // Set agent and trigger state changed
-        state.SetState("agentId", currentAgentId);
+        state.SetState("agent_id", currentAgentId);
 
         return agent;
     }

src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj

@@ -73,7 +73,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Colorful.Console" Version="1.2.15" />
     <PackageReference Include="EntityFrameworkCore.BootKit" Version="6.2.1" />
     <PackageReference Include="Fluid.Core" Version="2.4.0" />
     <PackageReference Include="TensorFlow.Keras" Version="0.11.2" />

src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs

@@ -38,6 +38,7 @@ public static IServiceCollection AddBotSharp(this IServiceCollection services, I
         services.AddScoped<IAgentRouting, AgentRouter>();
 
         services.AddScoped<IFunctionCallback, GoToRouterFn>();
+        services.AddScoped<IFunctionCallback, RouteToAgentFn>();
 
         return services;
     }

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.GetChatCompletionsAsyncRecursively.cs

@@ -15,15 +15,17 @@ private async Task<bool> GetChatCompletionsAsyncRecursively(IChatCompletion chat
         Agent agent, 
         List<RoleDialogModel> wholeDialogs,
         Func<RoleDialogModel, Task> onMessageReceived,
-        Func<RoleDialogModel, Task> onFunctionExecuting)
+        Func<RoleDialogModel, Task> onFunctionExecuting,
+        Func<RoleDialogModel, Task> onFunctionExecuted)
     {
         currentRecursiveDepth++;
         if (currentRecursiveDepth > maxRecursiveDepth)
         {
             _logger.LogError($"Exceed max current recursive depth.");
             await HandleAssistantMessage(new RoleDialogModel(AgentRole.Assistant, "System has exception, please try later.")
             {
-                CurrentAgentId = agent.Id
+                CurrentAgentId = agent.Id,
+                Channel = wholeDialogs.Last().Channel
             }, onMessageReceived);
             return false;
         }
@@ -38,14 +40,15 @@ await HandleAssistantMessage(new RoleDialogModel(AgentRole.Assistant, "System ha
         {
             var preAgentId = agent.Id;
 
-            await HandleFunctionMessage(fn, onFunctionExecuting);
+            await HandleFunctionMessage(fn, onFunctionExecuting, onFunctionExecuted);
 
             // Function executed has exception
             if (fn.ExecutionResult == null)
             {
                 await HandleAssistantMessage(new RoleDialogModel(AgentRole.Assistant, fn.Content)
                 {
-                    CurrentAgentId = fn.CurrentAgentId
+                    CurrentAgentId = fn.CurrentAgentId,
+                    Channel = fn.Channel
                 }, onMessageReceived);
                 return;
             }
@@ -58,10 +61,6 @@ await HandleAssistantMessage(new RoleDialogModel(AgentRole.Assistant, fn.Content
                 var agentSettings = _services.GetRequiredService<AgentSettings>();
                 var agentService = _services.GetRequiredService<IAgentService>();
                 agent = await agentService.LoadAgent(fn.CurrentAgentId);
-
-                // Set state to make next conversation will go to this agent directly
-                // var state = _services.GetRequiredService<IConversationStateService>();
-                // state.SetState("agentId", fn.CurrentAgentId);
             }
 
             // Add to dialog history
@@ -70,7 +69,13 @@ await HandleAssistantMessage(new RoleDialogModel(AgentRole.Assistant, fn.Content
             // After function is executed, pass the result to LLM to get a natural response
             wholeDialogs.Add(fn);
 
-            await GetChatCompletionsAsyncRecursively(chatCompletion, conversationId, agent, wholeDialogs, onMessageReceived, onFunctionExecuting);
+            await GetChatCompletionsAsyncRecursively(chatCompletion, 
+                conversationId, 
+                agent, 
+                wholeDialogs, 
+                onMessageReceived, 
+                onFunctionExecuting,
+                onFunctionExecuted);
         });
 
         return result;
@@ -89,13 +94,16 @@ private async Task HandleAssistantMessage(RoleDialogModel msg, Func<RoleDialogMo
         await onMessageReceived(msg);
     }
 
-    private async Task HandleFunctionMessage(RoleDialogModel msg, Func<RoleDialogModel, Task> onFunctionExecuting)
+    private async Task HandleFunctionMessage(RoleDialogModel msg, 
+        Func<RoleDialogModel, Task> onFunctionExecuting,
+        Func<RoleDialogModel, Task> onFunctionExecuted)
     {
         // Save states
         SaveStateByArgs(msg.FunctionArgs);
 
         // Call functions
         await onFunctionExecuting(msg);
         await CallFunctions(msg);
+        await onFunctionExecuted(msg);
     }
 }

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs

@@ -8,7 +8,8 @@ public partial class ConversationService
     public async Task<bool> SendMessage(string agentId, string conversationId,
         RoleDialogModel lastDialog,
         Func<RoleDialogModel, Task> onMessageReceived,
-        Func<RoleDialogModel, Task> onFunctionExecuting)
+        Func<RoleDialogModel, Task> onFunctionExecuting,
+        Func<RoleDialogModel, Task> onFunctionExecuted)
     {
         var converation = await GetConversation(conversationId);
 
@@ -27,16 +28,19 @@ public async Task<bool> SendMessage(string agentId, string conversationId,
         var stateService = _services.GetRequiredService<IConversationStateService>();
         stateService.SetConversation(conversationId);
         stateService.Load();
+        stateService.SetState("channel", lastDialog.Channel);
 
         var router = _services.GetRequiredService<IAgentRouting>();
-        var agent = await router.LoadCurrentAgent();
+        var agent = await router.LoadRouter();
 
         _logger.LogInformation($"[{agent.Name}] {lastDialog.Role}: {lastDialog.Content}");
 
         lastDialog.CurrentAgentId = agent.Id;
-        _storage.Append(conversationId, agent.Id, lastDialog);
-
+        
         var wholeDialogs = GetDialogHistory(conversationId);
+        wholeDialogs.Add(lastDialog);
+
+        _storage.Append(conversationId, agent.Id, lastDialog);
 
         // Get relevant domain knowledge
         /*if (_settings.EnableKnowledgeBase)
@@ -67,7 +71,8 @@ public async Task<bool> SendMessage(string agentId, string conversationId,
             agent,
             wholeDialogs,
             onMessageReceived,
-            onFunctionExecuting);
+            onFunctionExecuting,
+            onFunctionExecuted);
 
         return result;
     }