Merge pull request #157 from Deep-Blue-2013/master

Add GetChatCompletions and clean routing code.

Author: Deep-Blue-2013

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

@@ -13,6 +13,9 @@ public interface IChatCompletion
     /// <param name="model"></param>
     void SetModelName(string model);
 
+    RoleDialogModel GetChatCompletions(Agent agent,
+        List<RoleDialogModel> conversations);
+
     Task<bool> GetChatCompletionsAsync(Agent agent, 
         List<RoleDialogModel> conversations, 
         Func<RoleDialogModel, Task> onMessageReceived,

src/Infrastructure/BotSharp.Abstraction/MLTasks/IChatCompletion.cs

@@ -0,0 +1,13 @@
+using BotSharp.Abstraction.Routing.Models;
+
+namespace BotSharp.Abstraction.Routing;
+
+public interface IRouterInstance
+{
+    string AgentId { get; }
+    Agent Router { get; }
+    List<RoutingHandlerDef> GetHandlers();
+    IRouterInstance Load();
+    IRouterInstance WithDialogs(List<RoleDialogModel> dialogs);
+    RoutingRule[] GetRulesByName(string name);
+}

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

@@ -13,11 +13,7 @@ public interface IRoutingHandler
 
     void SetRouter(Agent router) { }
 
-    void SetDialogs(List<RoleDialogModel> dialogs) { }        
+    void SetDialogs(List<RoleDialogModel> dialogs) { }
 
-    Task<FunctionCallFromLlm> GetNextInstructionFromReasoner(string prompt) 
-        => throw new NotImplementedException(""); 
-
-    Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
-        => throw new NotImplementedException("");
+    Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst);
 }

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

@@ -1,9 +1,12 @@
+using BotSharp.Abstraction.Functions.Models;
+
 namespace BotSharp.Abstraction.Routing;
 
 public interface IRoutingService
 {
-    Agent LoadRouter();
     List<RoleDialogModel> Dialogs { get; }
+    Task<FunctionCallFromLlm> GetNextInstruction(string prompt);
+    Task<RoleDialogModel> InvokeAgent(string agentId);
     Task<RoleDialogModel> InstructLoop();
     Task<RoleDialogModel> ExecuteOnce(Agent agent);
 }

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

@@ -0,0 +1,32 @@
+using BotSharp.Abstraction.Routing.Settings;
+using Microsoft.Extensions.Logging;
+
+namespace BotSharp.Abstraction.Routing;
+
+public abstract class RoutingHandlerBase
+{
+    protected Agent _router;
+    protected readonly IServiceProvider _services;
+    protected readonly ILogger _logger;
+    protected RoutingSettings _settings;
+    protected List<RoleDialogModel> _dialogs;
+
+    public RoutingHandlerBase(IServiceProvider services,
+        ILogger logger,
+        RoutingSettings settings)
+    {
+        _services = services;
+        _logger = logger;
+        _settings = settings;
+    }
+
+    public void SetRouter(Agent router)
+    {
+        _router = router;
+    }
+
+    public void SetDialogs(List<RoleDialogModel> dialogs)
+    {
+        _dialogs = dialogs;
+    }
+}

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

@@ -23,10 +23,10 @@ join u in _db.Users on ua.UserId equals u.Id
     public async Task<Agent> GetAgent(string id)
     {
         var settings = _services.GetRequiredService<RoutingSettings>();
-        var routingService = _services.GetRequiredService<IRoutingService>();
+        var routerInstance = _services.GetRequiredService<IRouterInstance>();
         if (settings.RouterId == id)
         {
-            return routingService.LoadRouter();
+            return routerInstance.Load().Router;
         }
 
         var profile = _db.GetAgent(id);

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

@@ -52,7 +52,7 @@ public static IServiceCollection AddBotSharp(this IServiceCollection services, I
         config.Bind("Router", routingSettings);
         services.AddSingleton((IServiceProvider x) => routingSettings);
 
-        services.AddScoped<IAgentRouting, Router>();
+        services.AddScoped<IRouterInstance, RouterInstance>();
         services.AddScoped<IRoutingService, RoutingService>();
 
         if (myDatabaseSettings.Default == "FileRepository")

src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs

@@ -26,9 +26,8 @@ public ContinueExecuteTaskRoutingHandler(IServiceProvider services, ILogger<Cont
     {
     }
 
-    public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
+    public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
     {
-        var routing = _services.GetRequiredService<IAgentRouting>();
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var record = db.Agents.First(x => x.Name.ToLower() == inst.AgentName.ToLower());
 

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

@@ -23,7 +23,7 @@ public ConversationEndRoutingHandler(IServiceProvider services, ILogger<Conversa
     {
     }
 
-    public Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
+    public Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
     {
         throw new NotImplementedException();
     }

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

@@ -24,7 +24,7 @@ public InterruptTaskExecutionRoutingHandler(IServiceProvider services, ILogger<I
     {
     }
 
-    public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
+    public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
     {
         var result = new RoleDialogModel(AgentRole.User, inst.Reason)
         {

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

@@ -24,7 +24,7 @@ public ResponseToUserRoutingHandler(IServiceProvider services, ILogger<ResponseT
     {
     }
 
-    public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
+    public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
     {
         var result = new RoleDialogModel(AgentRole.Assistant, inst.Answer)
         {

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

@@ -27,17 +27,12 @@ public RetrieveDataFromAgentRoutingHandler(IServiceProvider services, ILogger<Re
     {
     }
 
-    public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
+    public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
     {
-        if (string.IsNullOrEmpty(inst.AgentName))
-        {
-            inst = await GetNextInstructionFromReasoner($"What's the next step? your response must have agent name.");
-        }
-
         // Retrieve information from specific agent
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var record = db.Agents.First(x => x.Name.ToLower() == inst.AgentName.ToLower());
-        var response = await InvokeAgent(record.Id);
+        var response = await routing.InvokeAgent(record.Id);
 
         inst.Answer = response.Content;
 
@@ -60,7 +55,7 @@ public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
         _router.Instruction += $"\r\n{AgentRole.Function}: {response.Content}";
 
         // Got the response from agent, then send to reasoner again to make the decision
-        inst = await GetNextInstructionFromReasoner($"What's the next step based on user's original goal and function result?");
+        // inst = await GetNextInstructionFromReasoner($"What's the next step based on user's original goal and function result?");
 
         return null;
     }

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

@@ -27,7 +27,7 @@ public RouteToAgentRoutingHandler(IServiceProvider services, ILogger<RouteToAgen
     {
     }
 
-    public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
+    public async Task<RoleDialogModel> Handle(IRoutingService routing, FunctionCallFromLlm inst)
     {
         var function = _services.GetServices<IFunctionCallback>().FirstOrDefault(x => x.Name == inst.Function);
         var message = new RoleDialogModel(AgentRole.Function, inst.Question)
@@ -41,7 +41,7 @@ public async Task<RoleDialogModel> Handle(FunctionCallFromLlm inst)
 
         var ret = await function.Execute(message);
 
-        var result = await InvokeAgent(message.CurrentAgentId);
+        var result = await routing.InvokeAgent(message.CurrentAgentId);
         result.ExecutionData = result.ExecutionData ?? message.ExecutionData;
 
         return result;