Merge remote-tracking branch 'origin/master' into jason_dev

Author: jason

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

@@ -1,5 +1,10 @@
 using BotSharp.Abstraction.Agents.Settings;
+using BotSharp.Abstraction.Conversations;
 using BotSharp.Abstraction.Functions.Models;
+using BotSharp.Abstraction.Repositories;
+using BotSharp.Abstraction.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using System.Data;
 
 namespace BotSharp.Abstraction.Agents;
 
@@ -49,7 +54,71 @@ public virtual bool OnSamplesLoaded(List<string> samples)
         return true;
     }
 
-    public virtual void  OnAgentLoaded(Agent agent)
+    public virtual void OnAgentLoaded(Agent agent)
     {
     }
+
+    public virtual void OnAgentUtilityLoaded(Agent agent)
+    {
+        if (agent.Type == AgentType.Routing) return;
+
+        var conv = _services.GetRequiredService<IConversationService>();
+        var isConvMode = conv.IsConversationMode();
+        if (!isConvMode) return;
+
+        agent.Functions ??= [];
+        agent.Utilities ??= [];
+
+        var (functions, templates) = GetUtilityContent(agent);
+
+        agent.Functions.AddRange(functions);
+        foreach (var prompt in templates)
+        {
+            agent.Instruction += $"\r\n\r\n{prompt}\r\n\r\n";
+        }
+    }
+
+    private (IEnumerable<FunctionDef>, IEnumerable<string>) GetUtilityContent(Agent agent)
+    {
+        var db = _services.GetRequiredService<IBotSharpRepository>();
+        var (functionNames, templateNames) = GetUniqueContent(agent.Utilities);
+
+        if (agent.MergeUtility)
+        {
+            var routing = _services.GetRequiredService<IRoutingContext>();
+            var entryAgentId = routing.EntryAgentId;
+            if (!string.IsNullOrEmpty(entryAgentId))
+            {
+                var entryAgent = db.GetAgent(entryAgentId);
+                var (fns, tps) = GetUniqueContent(entryAgent?.Utilities);
+                functionNames = functionNames.Concat(fns).Distinct().ToList();
+                templateNames = templateNames.Concat(tps).Distinct().ToList();
+            }
+        }
+
+        var ua = db.GetAgent(BuiltInAgentId.UtilityAssistant);
+        var functions = ua?.Functions?.Where(x => functionNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.ToList() ?? [];
+        var templates = ua?.Templates?.Where(x => templateNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.Select(x => x.Content)?.ToList() ?? [];
+        return (functions, templates);
+    }
+
+    private (IEnumerable<string>, IEnumerable<string>) GetUniqueContent(IEnumerable<AgentUtility>? utilities)
+    {
+        if (utilities.IsNullOrEmpty())
+        {
+            return ([], []);
+        }
+
+        utilities = utilities?.Where(x => !string.IsNullOrEmpty(x.Name) && !x.Disabled)?.ToList() ?? [];
+        var functionNames = utilities.SelectMany(x => x.Functions)
+                                     .Where(x => !string.IsNullOrEmpty(x.Name))
+                                     .Select(x => x.Name)
+                                     .Distinct().ToList();
+        var templateNames = utilities.SelectMany(x => x.Templates)
+                                     .Where(x => !string.IsNullOrEmpty(x.Name))
+                                     .Select(x => x.Name)
+                                     .Distinct().ToList();
+
+        return (functionNames, templateNames);
+    }
 }

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

@@ -25,6 +25,8 @@ public interface IAgentHook
 
     bool OnSamplesLoaded(List<string> samples);
 
+    void OnAgentUtilityLoaded(Agent agent);
+
     /// <summary>
     /// Triggered when agent is loaded completely.
     /// </summary>

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

@@ -59,5 +59,5 @@ public interface IAgentService
 
     PluginDef GetPlugin(string agentId);
 
-    IEnumerable<string> GetAgentUtilities();
+    IEnumerable<AgentUtility> GetAgentUtilityOptions();
 }

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

@@ -2,5 +2,5 @@ namespace BotSharp.Abstraction.Agents;
 
 public interface IAgentUtilityHook
 {
-    void AddUtilities(List<string> utilities);
+    void AddUtilities(List<AgentUtility> utilities);
 }

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

@@ -87,13 +87,17 @@ public class Agent
     /// <summary>
     /// Profile by channel
     /// </summary>
-    public List<string> Profiles { get; set; }
-        = new List<string>();
+    public List<string> Profiles { get; set; } = new();
+
+    /// <summary>
+    /// Merge utilities from entry agent
+    /// </summary>
+    public bool MergeUtility { get; set; }
 
     /// <summary>
     /// Agent utilities
     /// </summary>
-    public List<string> Utilities { get; set; } = new();
+    public List<AgentUtility> Utilities { get; set; } = new();
 
     /// <summary>
     /// Inherit from agent
@@ -173,9 +177,9 @@ public Agent SetSamples(List<string> samples)
         return this;
     }
 
-    public Agent SetUtilities(List<string> utilities)
+    public Agent SetUtilities(List<AgentUtility> utilities)
     {
-        Utilities = utilities ?? new List<string>();
+        Utilities = utilities ?? new List<AgentUtility>();
         return this;
     }
 
@@ -215,6 +219,12 @@ public Agent SetDisabled(bool disabled)
         return this;
     }
 
+    public Agent SetMergeUtility(bool merge)
+    {
+        MergeUtility = merge;
+        return this;
+    }
+
     public Agent SetAgentType(string type)
     {
         Type = type;

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

@@ -0,0 +1,56 @@
+namespace BotSharp.Abstraction.Agents.Models;
+
+public class AgentUtility
+{
+    public string Name { get; set; }
+    public bool Disabled { get; set; }
+    public IEnumerable<UtilityFunction> Functions { get; set; } = [];
+    public IEnumerable<UtilityTemplate> Templates { get; set; } = [];
+
+    public AgentUtility()
+    {
+        
+    }
+
+    public AgentUtility(
+        string name,
+        IEnumerable<UtilityFunction>? functions = null,
+        IEnumerable<UtilityTemplate>? templates = null)
+    {
+        Name = name;
+        Functions = functions ?? [];
+        Templates = templates ?? [];
+    }
+}
+
+
+public class UtilityFunction : UtilityBase
+{
+    public UtilityFunction()
+    {
+        
+    }
+
+    public UtilityFunction(string name)
+    {
+        Name = name;
+    }
+}
+
+public class UtilityTemplate : UtilityBase
+{
+    public UtilityTemplate()
+    {
+        
+    }
+
+    public UtilityTemplate(string name)
+    {
+        Name = name;
+    }
+}
+
+public class UtilityBase
+{
+    public string Name { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Routing/Planning/IExecutor.cs renamed to src/Infrastructure/BotSharp.Abstraction/Planning/IExecutor.cs

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Functions.Models;
+using BotSharp.Abstraction.Routing;
 
-namespace BotSharp.Abstraction.Routing.Planning;
+namespace BotSharp.Abstraction.Planning;
 
 public interface IExecutor
 {

src/Infrastructure/BotSharp.Abstraction/Planning/ITaskPlanner.cs

@@ -1,9 +1,19 @@
+using BotSharp.Abstraction.Functions.Models;
+
 namespace BotSharp.Abstraction.Planning;
 
 /// <summary>
 /// Planning process for Task Agent
+/// https://www.promptingguide.ai/techniques/cot
 /// </summary>
-public class ITaskPlanner
+public interface ITaskPlanner
 {
-
+    Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string messageId, List<RoleDialogModel> dialogs);
+    Task<bool> AgentExecuting(Agent router, FunctionCallFromLlm inst, RoleDialogModel message, List<RoleDialogModel> dialogs);
+    Task<bool> AgentExecuted(Agent router, FunctionCallFromLlm inst, RoleDialogModel message, List<RoleDialogModel> dialogs);
+    List<RoleDialogModel> BeforeHandleContext(FunctionCallFromLlm inst, RoleDialogModel message, List<RoleDialogModel> dialogs)
+        => dialogs;
+    bool AfterHandleContext(List<RoleDialogModel> dialogs, List<RoleDialogModel> taskAgentDialogs)
+        => true;
+    int MaxLoopCount => 5;
 }

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -33,9 +33,13 @@ public interface IBotSharpRepository : IHaveServiceProvider
     List<User> GetUserByIds(List<string> ids) => throw new NotImplementedException();
     List<User> GetUsersByAffiliateId(string affiliateId) => throw new NotImplementedException();
     User? GetUserByUserName(string userName) => throw new NotImplementedException();
+    Dashboard? GetDashboard(string id = null) => throw new NotImplementedException();
     void CreateUser(User user) => throw new NotImplementedException();
     void UpdateExistUser(string userId, User user) => throw new NotImplementedException();
     void UpdateUserVerified(string userId) => throw new NotImplementedException();
+    void AddDashboardConversation(string userId, string conversationId) => throw new NotImplementedException();
+    void RemoveDashboardConversation(string userId, string conversationId) => throw new NotImplementedException();
+    void UpdateDashboardConversation(string userId, DashboardConversation dashConv) => throw new NotImplementedException();
     void UpdateUserVerificationCode(string userId, string verficationCode) => throw new NotImplementedException();
     void UpdateUserPassword(string userId, string password) => throw new NotImplementedException();
     void UpdateUserEmail(string userId, string email) => throw new NotImplementedException();

src/Infrastructure/BotSharp.Abstraction/Routing/Enums/RuleType.cs

@@ -12,6 +12,11 @@ public class RuleType
     /// </summary>
     public const string DataValidation = "data-validation";
 
+    /// <summary>
+    /// The reasoning approach name for next step
+    /// </summary>
+    public const string Reasoner = "reasoner";
+
     /// <summary>
     /// The planning approach name for next step
     /// </summary>