Add AgentFilter.

Oceania2018 · Oceania2018 · commit 1286f35d8be3 · 2023-12-28T09:20:18.000-06:00
diff --git a/docs/static/screenshots/agent-builder-agents.png b/docs/static/screenshots/agent-builder-agents.png
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentService.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentService.cs
@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Repositories.Filters;
+
 namespace BotSharp.Abstraction.Agents;
 
 /// <summary>
@@ -7,7 +9,7 @@ public interface IAgentService
 {
     Task<Agent> CreateAgent(Agent agent);
     Task RefreshAgents();
-    Task<List<Agent>> GetAgents(bool? allowRouting = null);
+    Task<List<Agent>> GetAgents(AgentFilter filter);
 
     /// <summary>
     /// Load agent configurations and trigger hooks
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
@@ -62,6 +62,7 @@ public class Agent
     public bool AllowRouting {  get; set; }
 
     public bool Disabled { get; set; }
+    public string IconUrl { get; set; }
 
     /// <summary>
     /// Profile by channel
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/AgentFilter.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/AgentFilter.cs
@@ -6,5 +6,6 @@ public class AgentFilter
     public bool? Disabled { get; set; }
     public bool? AllowRouting { get; set; }
     public bool? IsPublic { get; set; }
+    public bool? IsRouter { get; set; }
     public List<string>? AgentIds { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
@@ -8,9 +8,8 @@ public partial class AgentService
 #if !DEBUG
     [MemoryCache(10 * 60)]
 #endif
-    public async Task<List<Agent>> GetAgents(bool? allowRouting = null)
+    public async Task<List<Agent>> GetAgents(AgentFilter filter)
     {
-        var filter = new AgentFilter { AllowRouting = allowRouting };
         var agents = _db.GetAgents(filter);
         return await Task.FromResult(agents);
     }
diff --git a/src/Infrastructure/BotSharp.Core/Planning/NaivePlanner.cs b/src/Infrastructure/BotSharp.Core/Planning/NaivePlanner.cs
@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Planning;
+using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Routing.Models;
 using BotSharp.Abstraction.Routing.Settings;
 using BotSharp.Abstraction.Templating;
@@ -108,7 +109,10 @@ private string GetNextStepPrompt(Agent router)
     private void FixMalformedResponse(FunctionCallFromLlm args)
     {
         var agentService = _services.GetRequiredService<IAgentService>();
-        var agents = agentService.GetAgents(allowRouting: true).Result;
+        var agents = agentService.GetAgents(new AgentFilter 
+        { 
+            AllowRouting = true
+        }).Result;
         var malformed = false;
 
         // Sometimes it populate malformed Function in Agent name
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository.cs
@@ -6,24 +6,26 @@
 using MongoDB.Driver;
 using BotSharp.Abstraction.Routing.Models;
 using BotSharp.Abstraction.Repositories.Filters;
-using BotSharp.Abstraction.Utilities;
-using BotSharp.Abstraction.Conversations.Models;
 using BotSharp.Abstraction.Repositories.Models;
+using BotSharp.Abstraction.Routing.Settings;
 
 namespace BotSharp.Core.Repository;
 
 public class FileRepository : IBotSharpRepository
 {
+    private readonly IServiceProvider _services;
     private readonly BotSharpDatabaseSettings _dbSettings;
     private readonly AgentSettings _agentSettings;
     private readonly ConversationSetting _conversationSettings;
     private JsonSerializerOptions _options;
 
     public FileRepository(
+        IServiceProvider services,
         BotSharpDatabaseSettings dbSettings,
         AgentSettings agentSettings,
         ConversationSetting conversationSettings)
     {
+        _services = services;
         _dbSettings = dbSettings;
         _agentSettings = agentSettings;
         _conversationSettings = conversationSettings;
@@ -542,6 +544,14 @@ public List<Agent> GetAgents(AgentFilter filter)
             query = query.Where(x => x.IsPublic == filter.IsPublic);
         }
 
+        if (filter.IsRouter.HasValue)
+        {
+            var route = _services.GetRequiredService<RoutingSettings>();
+            query = filter.IsRouter.Value ?
+                query.Where(x => x.Id == route.AgentId) :
+                query.Where(x => x.Id != route.AgentId);
+        }
+
         if (filter.AgentIds != null)
         {
             query = query.Where(x => filter.AgentIds.Contains(x.Id));
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -21,9 +21,9 @@ public async Task<AgentViewModel> GetAgent([FromRoute] string id)
     }
 
     [HttpGet("/agents")]
-    public async Task<List<AgentViewModel>> GetAgents()
+    public async Task<List<AgentViewModel>> GetAgents([FromQuery] AgentFilter filter)
     {
-        var agents = await _agentService.GetAgents();
+        var agents = await _agentService.GetAgents(filter);
          return agents.Select(x => AgentViewModel.FromAgent(x)).ToList();
     }
 
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
@@ -21,6 +21,8 @@ public class AgentViewModel
     [JsonPropertyName("allow_routing")]
     public bool AllowRouting { get; set; }
     public bool Disabled { get; set; }
+    [JsonPropertyName("icon_url")]
+    public string IconUrl { get; set; }
     public List<string> Profiles { get; set; }
 
     [JsonPropertyName("routing_rules")]
@@ -51,6 +53,7 @@ public static AgentViewModel FromAgent(Agent agent)
             Samples = agent.Samples,
             IsPublic= agent.IsPublic,
             Disabled = agent.Disabled,
+            IconUrl = agent.IconUrl,
             AllowRouting = agent.AllowRouting,
             Profiles = agent.Profiles,
             RoutingRules = agent.RoutingRules,
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs
@@ -4,6 +4,7 @@
 using BotSharp.Abstraction.Repositories.Filters;
 using BotSharp.Abstraction.Repositories.Models;
 using BotSharp.Abstraction.Routing.Models;
+using BotSharp.Abstraction.Routing.Settings;
 using BotSharp.Abstraction.Users.Models;
 using BotSharp.Plugin.MongoStorage.Collections;
 using BotSharp.Plugin.MongoStorage.Models;
@@ -461,6 +462,14 @@ public List<Agent> GetAgents(AgentFilter filter)
             query = query.Where(x => x.IsPublic == filter.IsPublic);
         }
 
+        if (filter.IsRouter.HasValue)
+        {
+            var route = _services.GetRequiredService<RoutingSettings>();
+            query = filter.IsRouter.Value ?
+                query.Where(x => x.Id == route.AgentId) :
+                query.Where(x => x.Id != route.AgentId);
+        }
+
         if (filter.AgentIds != null)
         {
             query = query.Where(x => filter.AgentIds.Contains(x.Id));
diff --git a/src/WebStarter/Program.cs b/src/WebStarter/Program.cs
@@ -71,4 +71,9 @@
 app.UseCors("MyCorsPolicy");
 #endif
 
+// Host BotSharp UI built in adapter-static
+app.UseFileServer();
+app.UseDefaultFiles();
+app.UseStaticFiles();
+
 app.Run();
diff --git a/src/WebStarter/WebStarter.csproj b/src/WebStarter/WebStarter.csproj
@@ -68,5 +68,9 @@
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.ChatHub\BotSharp.Plugin.ChatHub.csproj" />
     <ProjectReference Include="..\Plugins\BotSharp.Plugin.TelegramBots\BotSharp.Plugin.TelegramBots.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/WebStarter/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/agent.json b/src/WebStarter/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/agent.json
@@ -4,5 +4,6 @@
   "createdDateTime": "2023-08-18T14:39:32.2349685Z",
   "updatedDateTime": "2023-08-18T14:39:32.2349686Z",
   "id": "01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a",
+  "iconUrl": "https://cdn.iconscout.com/icon/premium/png-256-thumb/route-1613278-1368497.png",
   "isPublic": true
 }
diff --git a/src/WebStarter/wwwroot/favicon.ico b/src/WebStarter/wwwroot/favicon.ico
diff --git a/tests/BotSharp.Plugin.PizzaBot/documents/RDD-ChicagoThinCrust.pdf b/tests/BotSharp.Plugin.PizzaBot/documents/RDD-ChicagoThinCrust.pdf
diff --git a/tests/BotSharp.Plugin.PizzaBot/documents/pizza-recipebooklet-1.pdf b/tests/BotSharp.Plugin.PizzaBot/documents/pizza-recipebooklet-1.pdf

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ public class AgentFilter`
`6`	`6`	`public bool? Disabled { get; set; }`
`7`	`7`	`public bool? AllowRouting { get; set; }`
`8`	`8`	`public bool? IsPublic { get; set; }`
	`9`	`+ public bool? IsRouter { get; set; }`
`9`	`10`	`public List<string>? AgentIds { get; set; }`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,8 @@ public partial class AgentService`
`8`	`8`	`#if !DEBUG`
`9`	`9`	`[MemoryCache(10 * 60)]`
`10`	`10`	`#endif`
`11`		`- public async Task<List<Agent>> GetAgents(bool? allowRouting = null)`
	`11`	`+ public async Task<List<Agent>> GetAgents(AgentFilter filter)`
`12`	`12`	`{`
`13`		`- var filter = new AgentFilter { AllowRouting = allowRouting };`
`14`	`13`	`var agents = _db.GetAgents(filter);`
`15`	`14`	`return await Task.FromResult(agents);`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public async Task<AgentViewModel> GetAgent([FromRoute] string id)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`[HttpGet("/agents")]`
`24`		`- public async Task<List<AgentViewModel>> GetAgents()`
	`24`	`+ public async Task<List<AgentViewModel>> GetAgents([FromQuery] AgentFilter filter)`
`25`	`25`	`{`
`26`		`- var agents = await _agentService.GetAgents();`
	`26`	`+ var agents = await _agentService.GetAgents(filter);`
`27`	`27`	`return agents.Select(x => AgentViewModel.FromAgent(x)).ToList();`
`28`	`28`	`}`
`29`	`29`