Merge pull request #856 from iceljc/features/refine-agent-filter

iceljc · web-flow · commit 7c5383343c99 · 2025-01-30T15:59:19.000-06:00
Features/refine agent filter
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs
@@ -9,7 +9,8 @@ public enum AgentField
     Disabled,
     Type,
     InheritAgentId,
-    Profiles,
+    Profile,
+    Label,
     RoutingRule,
     Instruction,
     Function,
@@ -30,5 +31,5 @@ public enum AgentTaskField
     Description,
     Enabled,
     Content,
-    DirectAgentId
+    Status
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
@@ -89,6 +89,11 @@ public class Agent
     /// </summary>
     public List<string> Profiles { get; set; } = new();
 
+    /// <summary>
+    /// Agent labels
+    /// </summary>
+    public List<string> Labels { get; set; } = new();
+
     /// <summary>
     /// Merge utilities from entry agent
     /// </summary>
@@ -158,6 +163,7 @@ public static Agent Clone(Agent agent)
             MergeUtility = agent.MergeUtility,
             MaxMessageCount = agent.MaxMessageCount,
             Profiles = agent.Profiles,
+            Labels = agent.Labels,
             RoutingRules = agent.RoutingRules,
             Rules = agent.Rules,
             LlmConfig = agent.LlmConfig,
@@ -269,6 +275,12 @@ public Agent SetProfiles(List<string> profiles)
         return this;
     }
 
+    public Agent SetLables(List<string> labels)
+    {
+        Labels = labels ?? [];
+        return this;
+    }
+
     public Agent SetRoutingRules(List<RoutingRule> rules)
     {
         RoutingRules = rules ?? [];
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/AgentFilter.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/AgentFilter.cs
@@ -3,13 +3,14 @@ namespace BotSharp.Abstraction.Repositories.Filters;
 public class AgentFilter
 {
     public Pagination Pager { get; set; } = new Pagination();
-    public string? AgentName { get; set; }
+    public List<string>? AgentIds { get; set; }
+    public List<string>? AgentNames { get; set; }
     public string? SimilarName { get; set; }
     public bool? Disabled { get; set; }
     public bool? Installed { get; set; }
-    public string? Type { get; set; }
+    public List<string>? Types { get; set; }
+    public List<string>? Labels { get; set; }
     public bool? IsPublic { get; set; }
-    public List<string>? AgentIds { get; set; }
 
     public static AgentFilter Empty()
     {
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs b/src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs
@@ -14,13 +14,13 @@ You may obtain a copy of the License at
   limitations under the License.
 ******************************************************************************/
 
+using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Repositories;
 using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Tasks;
 using BotSharp.Abstraction.Tasks.Models;
 using BotSharp.Abstraction.Utilities;
 using BotSharp.Core.Infrastructures;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.Extensions.Logging;
 using System.Text.RegularExpressions;
 
@@ -60,31 +60,30 @@ public async Task<List<CrontabItem>> GetCrontable()
 
     public async Task<List<AgentTask>> GetTasks()
     {
-        var agentService = _services.GetRequiredService<IAgentService>();
         var tasks = new List<AgentTask>();
+        var agentService = _services.GetRequiredService<IAgentService>();
         var cronsources = _services.GetServices<ICrontabSource>();
-        foreach (var source in cronsources)
-        {
-            var cron = source.GetCrontabItem();
 
-            // Get all agent subscribed to this cron
-            
-            var agents = await agentService.GetAgents(new AgentFilter
+        // Get all agent subscribed to this cron
+        var agents = await agentService.GetAgents(new AgentFilter
+        {
+            Pager = new Pagination
             {
-                Pager = new Pagination
-                {
-                    Size = 1000
-                }
-            });
+                Size = 1000
+            }
+        });
 
+        foreach (var source in cronsources)
+        {
+            var cron = source.GetCrontabItem();
             var preFilteredAgents = agents.Items.Where(x =>
                 x.Rules.Exists(r => r.TriggerName == cron.Title)).ToList();
 
             tasks.AddRange(preFilteredAgents.Select(x => new AgentTask
             {
                 Id = Guid.Empty.ToString(),
                 AgentId = x.Id,
-                Agent = new BotSharp.Abstraction.Agents.Models.Agent
+                Agent = new Agent
                 {
                     Name = x.Name,
                     Description = x.Description
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
@@ -31,6 +31,7 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
         record.MaxMessageCount = agent.MaxMessageCount;
         record.Type = agent.Type;
         record.Profiles = agent.Profiles ?? [];
+        record.Labels = agent.Labels ?? [];
         record.RoutingRules = agent.RoutingRules ?? [];
         record.Instruction = agent.Instruction ?? string.Empty;
         record.ChannelInstructions = agent.ChannelInstructions ?? [];
@@ -96,6 +97,7 @@ public async Task<string> UpdateAgentFromFile(string id)
                        .SetMergeUtility(foundAgent.MergeUtility)
                        .SetAgentType(foundAgent.Type)
                        .SetProfiles(foundAgent.Profiles)
+                       .SetLables(foundAgent.Labels)
                        .SetRoutingRules(foundAgent.RoutingRules)
                        .SetInstruction(foundAgent.Instruction)
                        .SetChannelInstructions(foundAgent.ChannelInstructions)
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs
@@ -136,6 +136,7 @@ public IConversationStateService SetState<T>(string name, T value, bool isNeedVe
     public Dictionary<string, string> Load(string conversationId, bool isReadOnly = false)
     {
         _conversationId = !isReadOnly ? conversationId : null;
+        Reset();
 
         var routingCtx = _services.GetRequiredService<IRoutingContext>();
         var curMsgId = routingCtx.MessageId;
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
@@ -30,9 +30,12 @@ public void UpdateAgent(Agent agent, AgentField field)
                 case AgentField.InheritAgentId:
                     UpdateAgentInheritAgentId(agent.Id, agent.InheritAgentId);
                     break;
-                case AgentField.Profiles:
+                case AgentField.Profile:
                     UpdateAgentProfiles(agent.Id, agent.Profiles);
                     break;
+                case AgentField.Label:
+                    UpdateAgentLabels(agent.Id, agent.Labels);
+                    break;
                 case AgentField.RoutingRule:
                     UpdateAgentRoutingRules(agent.Id, agent.RoutingRules);
                     break;
@@ -160,6 +163,20 @@ private void UpdateAgentProfiles(string agentId, List<string> profiles)
             File.WriteAllText(agentFile, json);
         }
 
+        public bool UpdateAgentLabels(string agentId, List<string> labels)
+        {
+            if (labels == null) return false;
+
+            var (agent, agentFile) = GetAgentFromFile(agentId);
+            if (agent == null) return false;
+
+            agent.Labels = labels;
+            agent.UpdatedDateTime = DateTime.UtcNow;
+            var json = JsonSerializer.Serialize(agent, _options);
+            File.WriteAllText(agentFile, json);
+            return true;
+        }
+
         private void UpdateAgentUtilities(string agentId, bool mergeUtility, List<AgentUtility> utilities)
         {
             if (utilities == null) return;
@@ -341,6 +358,7 @@ private void UpdateAgentAllFields(Agent inputAgent)
             agent.MergeUtility = inputAgent.MergeUtility;
             agent.Type = inputAgent.Type;
             agent.Profiles = inputAgent.Profiles;
+            agent.Labels = inputAgent.Labels;
             agent.Utilities = inputAgent.Utilities;
             agent.KnowledgeBases = inputAgent.KnowledgeBases;
             agent.RoutingRules = inputAgent.RoutingRules;
@@ -417,9 +435,14 @@ public List<Agent> GetAgents(AgentFilter filter)
             }
 
             var query = Agents;
-            if (!string.IsNullOrEmpty(filter.AgentName))
+            if (filter.AgentIds != null)
+            {
+                query = query.Where(x => filter.AgentIds.Contains(x.Id));
+            }
+
+            if (!filter.AgentNames.IsNullOrEmpty())
             {
-                query = query.Where(x => x.Name.ToLower() == filter.AgentName.ToLower());
+                query = query.Where(x => filter.AgentNames.Contains(x.Name));
             }
 
             if (!string.IsNullOrEmpty(filter.SimilarName))
@@ -433,20 +456,19 @@ public List<Agent> GetAgents(AgentFilter filter)
                 query = query.Where(x => x.Disabled == filter.Disabled);
             }
 
-            if (filter.Type != null)
+            if (!filter.Types.IsNullOrEmpty())
             {
-                var types = filter.Type.Split(",");
-                query = query.Where(x => types.Contains(x.Type));
+                query = query.Where(x => filter.Types.Contains(x.Type));
             }
 
-            if (filter.IsPublic.HasValue)
+            if (!filter.Labels.IsNullOrEmpty())
             {
-                query = query.Where(x => x.IsPublic == filter.IsPublic);
+                query = query.Where(x => x.Labels.Any(y => filter.Labels.Contains(y)));
             }
 
-            if (filter.AgentIds != null)
+            if (filter.IsPublic.HasValue)
             {
-                query = query.Where(x => filter.AgentIds.Contains(x.Id));
+                query = query.Where(x => x.IsPublic == filter.IsPublic);
             }
 
             return query.ToList();
@@ -515,6 +537,22 @@ public bool PatchAgentTemplate(string agentId, AgentTemplate template)
             return true;
         }
 
+        public bool AppendAgentLabels(string agentId, List<string> labels)
+        {
+            if (labels.IsNullOrEmpty()) return false;
+
+            var (agent, agentFile) = GetAgentFromFile(agentId);
+            if (agent == null) return false;
+
+            var prevLabels = agent.Labels ?? [];
+            var curLabels = prevLabels.Concat(labels).Distinct().ToList();
+            agent.Labels = curLabels;
+            agent.UpdatedDateTime = DateTime.UtcNow;
+            var json = JsonSerializer.Serialize(agent, _options);
+            File.WriteAllText(agentFile, json);
+            return true;
+        }
+
         public void BulkInsertAgents(List<Agent> agents)
         {
             if (agents.IsNullOrEmpty()) return;
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentTask.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentTask.cs
@@ -50,6 +50,11 @@ public PagedItems<AgentTask> GetAgentTasks(AgentTaskFilter filter)
                     matched = matched && task.Enabled == filter.Enabled;
                 }
 
+                if (!string.IsNullOrEmpty(filter?.Status))
+                {
+                    matched = matched && task.Status == filter.Status;
+                }
+
                 if (!matched) continue;
                 
                 totalCount++;
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Functions/FallbackToRouterFn.cs b/src/Infrastructure/BotSharp.Core/Routing/Functions/FallbackToRouterFn.cs
@@ -18,7 +18,7 @@ public async Task<bool> Execute(RoleDialogModel message)
         var agentService = _services.GetRequiredService<IAgentService>();
         var agents = await agentService.GetAgents(new AgentFilter
         {
-            AgentName = args.AgentName
+            AgentNames = [args.AgentName]
         });
         var targetAgent = agents.Items.FirstOrDefault();
         if (targetAgent == null)
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs b/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
@@ -47,7 +47,7 @@ public async Task<bool> Execute(RoleDialogModel message)
             }
 
             var db = _services.GetRequiredService<IBotSharpRepository>();
-            var filter = new AgentFilter { AgentName = args.OriginalAgent };
+            var filter = new AgentFilter { AgentNames = [args.OriginalAgent] };
             var originalAgent = db.GetAgents(filter).FirstOrDefault();
             if (originalAgent != null)
             {
@@ -69,7 +69,7 @@ public async Task<bool> Execute(RoleDialogModel message)
         else
         {
             var db = _services.GetRequiredService<IBotSharpRepository>();
-            var filter = new AgentFilter { AgentName = args.AgentName };
+            var filter = new AgentFilter { AgentNames = [args.AgentName] };
             var targetAgent = db.GetAgents(filter).FirstOrDefault();
             if (targetAgent == null)
             {
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Handlers/ContinueExecuteTaskRoutingHandler.cs b/src/Infrastructure/BotSharp.Core/Routing/Handlers/ContinueExecuteTaskRoutingHandler.cs
@@ -38,7 +38,7 @@ public ContinueExecuteTaskRoutingHandler(IServiceProvider services, ILogger<Cont
     public async Task<bool> Handle(IRoutingService routing, FunctionCallFromLlm inst, RoleDialogModel message)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var filter = new AgentFilter { AgentName = inst.AgentName };
+        var filter = new AgentFilter { AgentNames = [inst.AgentName] };
         var record = db.GetAgents(filter).FirstOrDefault();
 
         message.FunctionName = inst.Function;
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Reasoning/HFReasoner.cs b/src/Infrastructure/BotSharp.Core/Routing/Reasoning/HFReasoner.cs
@@ -87,7 +87,7 @@ public async Task<bool> AgentExecuting(Agent router, FunctionCallFromLlm inst, R
         if (!string.IsNullOrEmpty(inst.AgentName))
         {
             var db = _services.GetRequiredService<IBotSharpRepository>();
-            var filter = new AgentFilter { AgentName = inst.AgentName };
+            var filter = new AgentFilter { AgentNames = [inst.AgentName] };
             var agent = db.GetAgents(filter).FirstOrDefault();
 
             var context = _services.GetRequiredService<IRoutingContext>();
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Reasoning/ReasonerHelper.cs b/src/Infrastructure/BotSharp.Core/Routing/Reasoning/ReasonerHelper.cs
@@ -11,7 +11,7 @@ public static void FixMalformedResponse(IServiceProvider services, FunctionCallF
         var agentService = services.GetRequiredService<IAgentService>();
         var agents = agentService.GetAgents(new AgentFilter
         {
-            Type = AgentType.Task
+            Types = [AgentType.Task]
         }).Result.Items.ToList();
         var malformed = false;
 
diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
@@ -41,7 +41,7 @@ public string OriginAgentId
                 var agentService = _services.GetRequiredService<IAgentService>();
                 _routerAgentIds = agentService.GetAgents(new AgentFilter
                 {
-                    Type = AgentType.Routing,
+                    Types = [AgentType.Routing],
                     Pager = new Pagination { Size = 100 }
                 }).Result.Items.Select(x => x.Id).ToArray();
             }
@@ -86,7 +86,7 @@ public void Push(string agentId, string? reason = null)
             var agentService = _services.GetRequiredService<IAgentService>();
             agentId = agentService.GetAgents(new AgentFilter
             {
-                AgentName = agentId
+                AgentNames = [agentId]
             }).Result.Items.First().Id;
         }
 
diff --git a/src/Infrastructure/BotSharp.Core/Tasks/Services/AgentTaskService.cs b/src/Infrastructure/BotSharp.Core/Tasks/Services/AgentTaskService.cs
@@ -21,11 +21,18 @@ public async Task<PagedItems<AgentTask>> GetTasks(AgentTaskFilter filter)
         if (filter.Status == TaskStatus.Scheduled)
         {
             var taskFeeders = _services.GetServices<ITaskFeeder>();
-            var items = taskFeeders.SelectMany(x => x.GetTasks().Result);
+            var items = new List<AgentTask>();
+
+            foreach (var feeder in taskFeeders)
+            {
+                var tasks = await feeder.GetTasks();
+                items.AddRange(tasks);
+            }
 
             return new PagedItems<AgentTask>
             {
-                Items = items,
+                Items = items.OrderByDescending(x => x.UpdatedDateTime)
+                            .Skip(filter.Pager.Offset).Take(filter.Pager.Size),
                 Count = items.Count()
             };
         }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentTaskController.cs
@@ -39,11 +39,11 @@ public async Task<AgentTaskViewModel> GetAgentTask([FromRoute] string agentId, [
     public async Task<PagedItems<AgentTaskViewModel>> GetAgentTasks([FromQuery] AgentTaskFilter filter)
     {
         filter.Status = TaskStatus.Scheduled;
-        var tasks = await _agentTaskService.GetTasks(filter);
+        var page = await _agentTaskService.GetTasks(filter);
         return new PagedItems<AgentTaskViewModel>
         {
-            Items = tasks.Items.Select(AgentTaskViewModel.From),
-            Count = tasks.Count
+            Items = page.Items.Select(AgentTaskViewModel.From),
+            Count = page.Count
         };
     }
 
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs
@@ -48,6 +48,8 @@ public class AgentCreationModel
     /// </summary>
     public List<string> Profiles { get; set; } = new();
 
+    public List<string> Labels { get; set; } = new();
+
     public bool MergeUtility { get; set; }
 
     public int? MaxMessageCount { get; set; }
@@ -77,6 +79,7 @@ public Agent ToAgent()
             MergeUtility = MergeUtility,
             MaxMessageCount = MaxMessageCount,
             Profiles = Profiles,
+            Labels = Labels,
             LlmConfig = LlmConfig,
             KnowledgeBases = KnowledgeBases,
             Rules = Rules,
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentDocument.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentDocument.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentTaskDocument.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentTaskDocument.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.AgentTask.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.AgentTask.cs

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ public IConversationStateService SetState<T>(string name, T value, bool isNeedVe`
`136`	`136`	`public Dictionary<string, string> Load(string conversationId, bool isReadOnly = false)`
`137`	`137`	`{`
`138`	`138`	`_conversationId = !isReadOnly ? conversationId : null;`
	`139`	`+ Reset();`
`139`	`140`
`140`	`141`	`var routingCtx = _services.GetRequiredService<IRoutingContext>();`
`141`	`142`	`var curMsgId = routingCtx.MessageId;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public async Task<bool> Execute(RoleDialogModel message)`
`18`	`18`	`var agentService = _services.GetRequiredService<IAgentService>();`
`19`	`19`	`var agents = await agentService.GetAgents(new AgentFilter`
`20`	`20`	`{`
`21`		`- AgentName = args.AgentName`
	`21`	`+ AgentNames = [args.AgentName]`
`22`	`22`	`});`
`23`	`23`	`var targetAgent = agents.Items.FirstOrDefault();`
`24`	`24`	`if (targetAgent == null)`