Merge pull request #761 from iceljc/features/merge-origin-agent

Features/merge origin agent

Author: iceljc

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/IRoutingContext.cs

@@ -6,6 +6,7 @@ public interface IRoutingContext
     string FirstGoalAgentId();
     bool ContainsAgentId(string agentId);
     string OriginAgentId { get; }
+    string EntryAgentId { get; }
     string ConversationId { get; }
     string MessageId { get; }
     void SetMessageId(string conversationId, string messageId);

src/Infrastructure/BotSharp.Abstraction/Templating/ITemplateRender.cs

@@ -3,4 +3,5 @@ namespace BotSharp.Abstraction.Templating;
 public interface ITemplateRender
 {
     string Render(string template, Dictionary<string, object> dict);
+    void Register(Type type);
 }

src/Infrastructure/BotSharp.Abstraction/Users/Enums/UserAction.cs

@@ -1,5 +1,8 @@
 namespace BotSharp.Abstraction.Users.Enums;
 
+/// <summary>
+/// User actions on agent level
+/// </summary>
 public static class UserAction
 {
     public const string Edit = "edit";

src/Infrastructure/BotSharp.Abstraction/Users/Enums/UserPermission.cs

@@ -1,5 +1,8 @@
 namespace BotSharp.Abstraction.Users.Enums;
 
+/// <summary>
+/// User permission
+/// </summary>
 public static class UserPermission
 {
     public const string CreateAgent = "create-agent";