Merge pull request #146 from hchen2020/master

Eliminate route file configuration.

Author: Oceania2018

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

@@ -6,7 +6,5 @@ public interface IAgentRouting
 {
     string AgentId { get; }
     Task<Agent> LoadRouter();
-    RoutingItem[] GetRoutingRecords();
-    RoutingItem GetRecordByAgentId(string id);
-    RoutingItem GetRecordByName(string name);
+    RoutingRule[] GetRulesByName(string name);
 }

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

@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using BotSharp.Abstraction.Routing.Models;
 
 namespace BotSharp.Abstraction.Agents.Models;
 
@@ -48,6 +48,22 @@ public class Agent
 
     public bool IsPublic { get; set; }
 
+    /// <summary>
+    /// Allow to be routed
+    /// </summary>
+    public bool AllowRouting {  get; set; }
+
+    public bool Disabled { get; set; }
+
+    /// <summary>
+    /// Profile by channel
+    /// </summary>
+    public List<string> Profiles { get; set; }
+        = new List<string>();
+
+    public List<RoutingRule> RoutingRules { get; set; }
+        = new List<RoutingRule>();
+
     public override string ToString()
         => $"{Name} {Id}";
 

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

@@ -1,5 +1,3 @@
-using BotSharp.Abstraction.Agents.Enums;
-using BotSharp.Abstraction.Routing.Models;
 using BotSharp.Abstraction.Users.Models;
 
 namespace BotSharp.Abstraction.Repositories;
@@ -10,8 +8,6 @@ public interface IBotSharpRepository
     IQueryable<Agent> Agents { get; }
     IQueryable<UserAgent> UserAgents { get; }
     IQueryable<Conversation> Conversations { get; }
-    IQueryable<RoutingItem> RoutingItems { get; }
-    IQueryable<RoutingProfile> RoutingProfiles { get; }
 
     int Transaction<TTableInterface>(Action action);
     void Add<TTableInterface>(object entity);
@@ -37,11 +33,4 @@ public interface IBotSharpRepository
     Conversation GetConversation(string conversationId);
     List<Conversation> GetConversations(string userId);
     #endregion
-
-    #region Routing
-    List<RoutingItem> CreateRoutingItems(List<RoutingItem> routingItems);
-    List<RoutingProfile> CreateRoutingProfiles(List<RoutingProfile> profiles);
-    void DeleteRoutingItems();
-    void DeleteRoutingProfiles();
-    #endregion    
 }

src/Infrastructure/BotSharp.Abstraction/Routing/IRoutingService.cs

@@ -1,11 +1,7 @@
-using BotSharp.Abstraction.Routing.Models;
-
 namespace BotSharp.Abstraction.Routing;
 
 public interface IRoutingService
 {
-    Task<List<RoutingItem>> CreateRoutingItems(List<RoutingItem> routingItems);
-    Task<List<RoutingProfile>> CreateRoutingProfiles(List<RoutingProfile> routingProfiles);
     Task DeleteRoutingItems();
     Task DeleteRoutingProfiles();
 }

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingItem.cs

@@ -1,11 +1,7 @@
-using System.Text.Json.Serialization;
-
 namespace BotSharp.Abstraction.Routing.Models;
 
 public class RoutingItem
 {
-    public string Id { get; set; }
-
     [JsonPropertyName("agent_id")]
     public string AgentId { get; set; } = string.Empty;
 
@@ -16,16 +12,5 @@ public class RoutingItem
     public string Description { get; set; } = string.Empty;
 
     [JsonPropertyName("required")]
-    public List<string> RequiredFields { get; set; } = new List<string>();
-
-    [JsonPropertyName("redirect_to")]
-    public string? RedirectTo { get; set; }
-
-    [JsonPropertyName("disabled")]
-    public bool Disabled { get; set; }
-
-    public override string ToString()
-    {
-        return Name;
-    }
+    public string[] RequiredFields { get; set; } = new string[0];
 }

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingProfile.cs

@@ -0,0 +1,21 @@
+namespace BotSharp.Abstraction.Routing.Models;
+
+public class RoutingRule
+{
+    [JsonIgnore]
+    public string AgentId { get; set; }
+
+    [JsonIgnore]
+    public string AgentName { get; set; }
+
+    public string Field { get; set; }
+
+    public bool Required { get; set; }
+
+    public string? RedirectTo { get; set; }
+
+    public override string ToString()
+    {
+        return $"{AgentName} {Field}";
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingRule.cs

@@ -4,6 +4,7 @@
 global using System.Linq;
 global using System.Threading.Tasks;
 global using System.ComponentModel.DataAnnotations;
+global using System.Text.Json.Serialization;
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.Conversations.Models;
 global using BotSharp.Abstraction.Agents.Enums;

src/Infrastructure/BotSharp.Abstraction/Using.cs

@@ -9,7 +9,6 @@
 using BotSharp.Core.Instructs;
 using BotSharp.Abstraction.Instructs;
 using BotSharp.Abstraction.Routing;
-using BotSharp.Core.Routing.Services;
 
 namespace BotSharp.Core;
 
@@ -20,7 +19,6 @@ public static IServiceCollection AddBotSharp(this IServiceCollection services, I
         services.AddScoped<IUserService, UserService>();
 
         services.AddScoped<IAgentService, AgentService>();
-        services.AddScoped<IRoutingService, RoutingService>();
 
         var agentSettings = new AgentSettings();
         config.Bind("Agent", agentSettings);

src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs

@@ -77,7 +77,10 @@ private async Task<bool> GetChatCompletionsAsyncRecursively(Agent agent,
                 var agentService = _services.GetRequiredService<IAgentService>();
                 agent = await agentService.LoadAgent(fn.CurrentAgentId);
 
-                wholeDialogs.Add(fn);
+                if (fn.FunctionName != "route_to_agent")
+                {
+                    wholeDialogs.Add(fn);
+                }
 
                 await GetChatCompletionsAsyncRecursively(agent,
                     wholeDialogs,
@@ -99,13 +102,16 @@ await GetChatCompletionsAsyncRecursively(agent,
 
                     return;
                 }
-                
+
                 // Add to dialog history
                 // The server had an error processing your request. Sorry about that!
                 // _storage.Append(conversationId, preAgentId, fn);
 
                 // After function is executed, pass the result to LLM to get a natural response
-                wholeDialogs.Add(fn);
+                if (fn.FunctionName != "route_to_agent")
+                {
+                    wholeDialogs.Add(fn);
+                }
 
                 await GetChatCompletionsAsyncRecursively(agent,
                     wholeDialogs,