Merge pull request #104 from hchen2020/master

Refactor to support agent router.

Author: Oceania2018

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

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Conversations.Models;
+
 namespace BotSharp.Abstraction.Agents;
 
 public abstract class AgentHookBase : IAgentHook
@@ -33,8 +35,12 @@ public virtual bool OnSamplesLoaded(ref string samples)
         return true;
     }
 
-    public virtual Agent OnAgentLoaded()
+    public virtual void  OnAgentLoaded(Agent agent)
     {
-        return _agent;
+    }
+
+    public virtual bool OnAgentRouting(RoleDialogModel message, ref string id)
+    {
+        return true;
     }
 }

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

@@ -24,5 +24,5 @@ public interface IAgentHook
     /// </summary>
     /// <param name="agent"></param>
     /// <returns></returns>
-    Agent OnAgentLoaded();
+    void OnAgentLoaded(Agent agent);
 }

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

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

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

@@ -1,5 +1,3 @@
-using BotSharp.Abstraction.Conversations.Models;
-
 namespace BotSharp.Abstraction.Agents.Models;
 
 public class Agent
@@ -29,4 +27,7 @@ public class Agent
     /// Domain knowledges
     /// </summary>
     public string Knowledges { get; set; }
+
+    public override string ToString()
+        => $"{Name} {Id}";
 }

src/Infrastructure/BotSharp.Abstraction/Agents/Settings/AgentSettings.cs

@@ -2,5 +2,9 @@ namespace BotSharp.Abstraction.Agents.Settings;
 
 public class AgentSettings
 {
+    /// <summary>
+    /// Router Agent Id
+    /// </summary>
+    public string RouterId { get; set; }
     public string DataDir { get; set; }
 }

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

@@ -8,25 +8,25 @@ public class RoleDialogModel
     public string Role { get; set; }
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
     public string Content { get; set; }
+    public string CurrentAgentId { get; set; }
 
     /// <summary>
     /// Function name if LLM response function call
     /// </summary>
     public string? FunctionName { get; set; }
 
+    public string? FunctionArgs { get; set; }
+
     /// <summary>
     /// Function execution result
     /// </summary>
     public string? ExecutionResult { get; set; }
 
-    /// <summary>
-    /// When function callback has been executed, system will pass result to LLM again,
-    /// Set this property to True to stop calling LLM.
-    /// </summary>
-    public bool StopSubsequentInteraction { get; set; }
-
     public bool IsConversationEnd { get; set; }
 
+    public bool NeedReloadAgent { get; set; }
+    public bool StopPropagate { get; set; }
+
     /// <summary>
     /// Channel name
     /// </summary>

src/Infrastructure/BotSharp.Abstraction/MLTasks/IChatCompletion.cs

@@ -4,7 +4,7 @@ namespace BotSharp.Abstraction.MLTasks;
 
 public interface IChatCompletion
 {
-    string GetChatCompletions(Agent agent, List<RoleDialogModel> conversations);
+    // string GetChatCompletions(Agent agent, List<RoleDialogModel> conversations, Func<RoleDialogModel, Task> onMessageReceived);
     Task<bool> GetChatCompletionsAsync(Agent agent, List<RoleDialogModel> conversations, Func<RoleDialogModel, Task> onMessageReceived);
     Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleDialogModel> conversations, Func<RoleDialogModel, Task> onMessageReceived);
 }

src/Infrastructure/BotSharp.Abstraction/Utilities/StringExtensions.cs

@@ -1,3 +1,6 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+
 namespace BotSharp.Abstraction.Utilities;
 
 public static class StringExtensions
@@ -15,4 +18,19 @@ public static string SubstringMax(this string str, int maxLength)
         else
             return str;
     }
+
+    public static string CleanPhoneNumber(this string phoneNumber)
+    {
+        if (phoneNumber != null && !phoneNumber.All(char.IsDigit))
+        {
+            phoneNumber = Regex.Replace(phoneNumber, @"[^\d]", "");
+        }
+
+        if (phoneNumber != null && phoneNumber.Length > 10)
+        {
+            phoneNumber = phoneNumber.Substring(1);
+        }
+
+        return phoneNumber;
+    }
 }

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

@@ -0,0 +1,37 @@
+using BotSharp.Abstraction.Agents.Models;
+
+namespace BotSharp.Core.Agents.Services;
+
+public class AgentRouter : IAgentRouting
+{
+    private readonly IServiceProvider _services;
+    private readonly ILogger _logger;
+    private readonly AgentSettings _settings;
+
+    public AgentRouter(IServiceProvider services, 
+        ILogger<AgentRouter> logger,
+        AgentSettings settings)
+    {
+        _services = services;
+        _logger = logger;
+        _settings = settings;
+    }
+
+    public async Task<Agent> LoadCurrentAgent()
+    {
+        // Load current agent from state
+        var stateService = _services.GetRequiredService<IConversationStateService>();
+        var currentAgentId = stateService.GetState("agentId");
+        if (string.IsNullOrEmpty(currentAgentId))
+        {
+            currentAgentId = _settings.RouterId;
+        }
+        var agentService = _services.GetRequiredService<IAgentService>();
+        var agent = await agentService.LoadAgent(currentAgentId);
+
+        // Set agent and trigger state changed
+        stateService.SetState("agentId", currentAgentId);
+
+        return agent;
+    }
+}

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs

@@ -39,9 +39,11 @@ public async Task<Agent> LoadAgent(string id)
                 hook.OnSamplesLoaded(ref samples);
             }
 
-            hook.OnAgentLoaded();
+            hook.OnAgentLoaded(agent);
         }
 
+        _logger.LogInformation($"Loaded agent {agent}.");
+
         return agent;
     }
 }