Merge branch 'SciSharp:master' into master

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs

@@ -18,6 +18,7 @@ public enum AgentField
     Sample,
     LlmConfig,
     Utility,
+    KnowledgeBase,
     MaxMessageCount
 }
 

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

@@ -18,7 +18,7 @@ public interface IAgentService
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    Task<Agent> LoadAgent(string id);
+    Task<Agent> LoadAgent(string id, bool loadUtility = true);
 
     /// <summary>
     /// Inherit from an agent

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

@@ -99,6 +99,11 @@ public class Agent
     /// </summary>
     public List<AgentUtility> Utilities { get; set; } = new();
 
+    /// <summary>
+    /// Agent knowledge bases
+    /// </summary>
+    public List<AgentKnowledgeBase> KnowledgeBases { get; set; } = [];
+
     /// <summary>
     /// Inherit from agent
     /// </summary>
@@ -118,6 +123,12 @@ public class Agent
     [JsonIgnore]
     public Dictionary<string, object> TemplateDict { get; set; } = new();
 
+    [JsonIgnore]
+    public List<FunctionDef> SecondaryFunctions { get; set; } = [];
+
+    [JsonIgnore]
+    public List<string> SecondaryInstructions { get; set; } = [];
+
     public override string ToString()
         => $"{Name} {Id}";
 

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

@@ -0,0 +1,23 @@
+namespace BotSharp.Abstraction.Agents.Models;
+
+public class AgentKnowledgeBase
+{
+    public string? Name { get; set; }
+    public bool Disabled { get; set; }
+
+    public AgentKnowledgeBase()
+    {
+        
+    }
+
+    public AgentKnowledgeBase(string name, bool enabled)
+    {
+        Name = name;
+        Disabled = enabled;
+    }
+
+    public override string ToString()
+    {
+        return Name ?? string.Empty;
+    }
+}

src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs

@@ -4,6 +4,8 @@ public class BasicAgentHook : AgentHookBase
 {
     public override string SelfId => string.Empty;
 
+    private const string UTIL_PREFIX = "util-";
+
     public BasicAgentHook(IServiceProvider services, AgentSettings settings)
         : base(services, settings)
     {
@@ -17,22 +19,23 @@ public override void OnAgentUtilityLoaded(Agent agent)
         var isConvMode = conv.IsConversationMode();
         if (!isConvMode) return;
 
-        agent.Functions ??= [];
+        agent.SecondaryFunctions ??= [];
+        agent.SecondaryInstructions ??= [];
         agent.Utilities ??= [];
 
         var (functions, templates) = GetUtilityContent(agent);
 
         foreach (var fn in functions)
         {
-            if (!agent.Functions.Any(x => x.Name.Equals(fn.Name, StringComparison.OrdinalIgnoreCase)))
+            if (!agent.SecondaryFunctions.Any(x => x.Name.Equals(fn.Name, StringComparison.OrdinalIgnoreCase)))
             {
-                agent.Functions.Add(fn);
+                agent.SecondaryFunctions.Add(fn);
             }
         }
 
         foreach (var prompt in templates)
         {
-            agent.Instruction += $"\r\n\r\n{prompt}\r\n\r\n";
+            agent.SecondaryInstructions.Add(prompt);
         }
     }
 
@@ -67,14 +70,13 @@ public override void OnAgentUtilityLoaded(Agent agent)
             return ([], []);
         }
 
-        var prefix = "util-";
         utilities = utilities?.Where(x => !string.IsNullOrEmpty(x.Name) && !x.Disabled)?.ToList() ?? [];
         var functionNames = utilities.SelectMany(x => x.Functions)
-                                     .Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.StartsWith(prefix))
+                                     .Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.StartsWith(UTIL_PREFIX))
                                      .Select(x => x.Name)
                                      .Distinct().ToList();
         var templateNames = utilities.SelectMany(x => x.Templates)
-                                     .Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.StartsWith(prefix))
+                                     .Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.StartsWith(UTIL_PREFIX))
                                      .Select(x => x.Name)
                                      .Distinct().ToList();
 

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

@@ -8,7 +8,7 @@ public partial class AgentService
     public static ConcurrentDictionary<string, Dictionary<string, string>> AgentParameterTypes = new();
 
     [MemoryCache(10 * 60, perInstanceCache: true)]
-    public async Task<Agent> LoadAgent(string id)
+    public async Task<Agent> LoadAgent(string id, bool loadUtility = true)
     {
         if (string.IsNullOrEmpty(id) || id == Guid.Empty.ToString())
         {
@@ -67,7 +67,11 @@ public async Task<Agent> LoadAgent(string id)
                 hook.OnSamplesLoaded(agent.Samples);
             }
 
-            hook.OnAgentUtilityLoaded(agent);
+            if (loadUtility)
+            {
+                hook.OnAgentUtilityLoaded(agent);
+            }
+            
             hook.OnAgentLoaded(agent);
         }
 

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

@@ -11,13 +11,18 @@ public string RenderedInstruction(Agent agent)
         var render = _services.GetRequiredService<ITemplateRender>();
         var conv = _services.GetRequiredService<IConversationService>();
 
+        // merge instructions
+        var instructions = new List<string> { agent.Instruction };
+        var secondaryInstructions = agent.SecondaryInstructions?.Where(x => !string.IsNullOrWhiteSpace(x)).ToList() ?? [];
+        instructions.AddRange(secondaryInstructions);
+
         // update states
         foreach (var t in conv.States.GetStates())
         {
             agent.TemplateDict[t.Key] = t.Value;
         }
 
-        var res = render.Render(agent.Instruction, agent.TemplateDict);
+        var res = render.Render(string.Join("\r\n", instructions), agent.TemplateDict);
         return res;
     }
 

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

@@ -39,6 +39,7 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
         record.Responses = agent.Responses ?? [];
         record.Samples = agent.Samples ?? [];
         record.Utilities = agent.Utilities ?? [];
+        record.KnowledgeBases = agent.KnowledgeBases ?? [];
         if (agent.LlmConfig != null && !agent.LlmConfig.IsInherit)
         {
             record.LlmConfig = agent.LlmConfig;

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs

@@ -57,6 +57,9 @@ public void UpdateAgent(Agent agent, AgentField field)
                 case AgentField.Utility:
                     UpdateAgentUtilities(agent.Id, agent.MergeUtility, agent.Utilities);
                     break;
+                case AgentField.KnowledgeBase:
+                    UpdateAgentKnowledgeBases(agent.Id, agent.KnowledgeBases);
+                    break;
                 case AgentField.MaxMessageCount:
                     UpdateAgentMaxMessageCount(agent.Id, agent.MaxMessageCount);
                     break;
@@ -168,6 +171,19 @@ private void UpdateAgentUtilities(string agentId, bool mergeUtility, List<AgentU
             File.WriteAllText(agentFile, json);
         }
 
+        private void UpdateAgentKnowledgeBases(string agentId, List<AgentKnowledgeBase> knowledgeBases)
+        {
+            if (knowledgeBases == null) return;
+
+            var (agent, agentFile) = GetAgentFromFile(agentId);
+            if (agent == null) return;
+
+            agent.KnowledgeBases = knowledgeBases;
+            agent.UpdatedDateTime = DateTime.UtcNow;
+            var json = JsonSerializer.Serialize(agent, _options);
+            File.WriteAllText(agentFile, json);
+        }
+
         private void UpdateAgentRoutingRules(string agentId, List<RoutingRule> rules)
         {
             if (rules == null) return;
@@ -310,6 +326,7 @@ private void UpdateAgentAllFields(Agent inputAgent)
             agent.Type = inputAgent.Type;
             agent.Profiles = inputAgent.Profiles;
             agent.Utilities = inputAgent.Utilities;
+            agent.KnowledgeBases = inputAgent.KnowledgeBases;
             agent.RoutingRules = inputAgent.RoutingRules;
             agent.LlmConfig = inputAgent.LlmConfig;
             agent.MaxMessageCount = inputAgent.MaxMessageCount;

src/Infrastructure/BotSharp.Core/Routing/Handlers/RouteToAgentRoutingHandler.cs

@@ -31,7 +31,7 @@ public class RouteToAgentRoutingHandler : RoutingHandlerBase, IRoutingHandler
             type: "boolean",
             required: true),
         new ParameterPropertyDef("is_new_task",
-            "whether the user is requesting a new task that is different from the previous topic.", 
+            "whether the user is requesting a new task that is different from the previous topic. Set the first round of conversation to false.", 
             type: "boolean")
     };