Merge pull request #196 from hchen2020/master

Clean code.

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationStateService.cs

@@ -1,3 +1,5 @@
+using System.Text.Json;
+
 namespace BotSharp.Abstraction.Conversations;
 
 /// <summary>
@@ -11,6 +13,7 @@ public interface IConversationStateService
     bool ContainsState(string name);
     ConversationState GetStates();
     IConversationStateService SetState<T>(string name, T value);
+    void SaveStateByArgs(JsonDocument args);
     void CleanState();
     void Save();
 }

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

@@ -1,8 +1,14 @@
+using BotSharp.Abstraction.Routing.Models;
+
 namespace BotSharp.Abstraction.Routing;
 
 public interface IRoutingService
 {
     Agent Router { get; }
+    RoutingItem[] GetRoutingItems();
+    RoutingRule[] GetRulesByName(string name);
+    RoutingRule[] GetRulesByAgentId(string id);
+    List<RoutingHandlerDef> GetHandlers();
     void ResetRecursiveCounter();
     Task<bool> InvokeAgent(string agentId, List<RoleDialogModel> dialogs);
     Task<RoleDialogModel> InstructLoop(RoleDialogModel message);

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

@@ -81,7 +81,6 @@ public static IServiceCollection AddBotSharp(this IServiceCollection services, I
         });
 
         services.AddScoped<IExecutor, InstructExecutor>();
-        services.AddScoped<IRouterInstance, RouterInstance>();
         services.AddScoped<IRoutingService, RoutingService>();
 
         if (myDatabaseSettings.Default == "FileRepository")

src/Infrastructure/BotSharp.Core/BotSharpServiceCollectionExtensions.cs

@@ -128,4 +128,23 @@ public bool ContainsState(string name)
     {
         return _states.ContainsKey(name) && !string.IsNullOrEmpty(_states[name]);
     }
+
+    public void SaveStateByArgs(JsonDocument args)
+    {
+        if (args == null)
+        {
+            return;
+        }
+
+        if (args.RootElement is JsonElement root)
+        {
+            foreach (JsonProperty property in root.EnumerateObject())
+            {
+                if (!string.IsNullOrEmpty(property.Value.ToString()))
+                {
+                    SetState(property.Name, property.Value);
+                }
+            }
+        }
+    }
 }

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationStateService.cs

@@ -3,7 +3,6 @@
 using BotSharp.Abstraction.Planning;
 using BotSharp.Abstraction.Repositories;
 using BotSharp.Abstraction.Routing.Models;
-using BotSharp.Abstraction.Routing.Settings;
 using BotSharp.Abstraction.Templating;
 
 namespace BotSharp.Core.Planning;
@@ -36,13 +35,14 @@ public async Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string m
         {
             try
             {
-                response = completion.GetChatCompletions(router, new List<RoleDialogModel>
+                var dialogs = new List<RoleDialogModel>
                 {
                     new RoleDialogModel(AgentRole.User, next)
                     {
                         MessageId = messageId
                     }
-                });
+                };
+                response = completion.GetChatCompletions(router, dialogs);
 
                 inst = response.Content.JsonContent<FunctionCallFromLlm>();
                 break;
@@ -80,18 +80,15 @@ public async Task<bool> AgentExecuting(FunctionCallFromLlm inst, RoleDialogModel
     public async Task<bool> AgentExecuted(FunctionCallFromLlm inst, RoleDialogModel message)
     {
         var context = _services.GetRequiredService<RoutingContext>();
-        context.Pop();
-
+        context.Empty();
         return true;
     }
 
     private string GetNextStepPrompt(Agent router)
     {
         var template = router.Templates.First(x => x.Name == "next_step_prompt").Content;
-
         var render = _services.GetRequiredService<ITemplateRender>();
-        return render.Render(template, new Dictionary<string, object>
-        {
-        });
+        var prompt = render.Render(template, router.TemplateDict);
+        return prompt.Trim();
     }
 }

src/Infrastructure/BotSharp.Core/Planning/HFPlanner.cs

@@ -3,7 +3,6 @@
 using BotSharp.Abstraction.Planning;
 using BotSharp.Abstraction.Routing.Models;
 using BotSharp.Abstraction.Templating;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
 
 namespace BotSharp.Core.Planning;
 
@@ -24,26 +23,33 @@ public async Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string m
 
         var inst = new FunctionCallFromLlm();
 
-        var agentService = _services.GetRequiredService<IAgentService>();
+        // text completion
+        /*var agentService = _services.GetRequiredService<IAgentService>();
         var instruction = agentService.RenderedInstruction(router);
         var content = $"{instruction}\r\n###\r\n{next}";
-
-        // text completion
         content =  content + "\r\nResponse: ";
+        var completion = CompletionProvider.GetTextCompletion(_services);*/
 
-        var completion = CompletionProvider.GetTextCompletion(_services);
+        // chat completion
+        var completion = CompletionProvider.GetChatCompletion(_services);
 
         int retryCount = 0;
         while (retryCount < 3)
         {
             string text = string.Empty;
             try
             {
-                text = await completion.GetCompletion(content, router.Id, messageId);
-                var response = new RoleDialogModel(AgentRole.Assistant, text)
+                // text completion
+                // text = await completion.GetCompletion(content, router.Id, messageId);
+                var dialogs = new List<RoleDialogModel> 
                 {
-                    MessageId = messageId
+                    new RoleDialogModel(AgentRole.User, next)
+                    {
+                        MessageId = messageId
+                    }
                 };
+                var response = completion.GetChatCompletions(router, dialogs);
+
                 inst = response.Content.JsonContent<FunctionCallFromLlm>();
                 break;
             }

src/Infrastructure/BotSharp.Core/Planning/NaivePlanner.cs

@@ -81,9 +81,9 @@ public async Task<bool> Execute(RoleDialogModel message)
     private bool HasMissingRequiredField(RoleDialogModel message, out string agentId)
     {
         var args = JsonSerializer.Deserialize<RoutingArgs>(message.FunctionArgs);
-        var router = _services.GetRequiredService<IRouterInstance>();
+        var routing = _services.GetRequiredService<IRoutingService>();
 
-        var routingRules = router.GetRulesByName(args.AgentName);
+        var routingRules = routing.GetRulesByName(args.AgentName);
 
         if (routingRules == null || !routingRules.Any())
         {

src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs

@@ -19,9 +19,9 @@ public override bool OnInstructionLoaded(string template, Dictionary<string, obj
     {
         dict["router"] = _agent;
 
-        var router = _services.GetRequiredService<IRouterInstance>();
-        dict["routing_agents"] = router.GetRoutingItems();
-        dict["routing_handlers"] = router.GetHandlers();
+        var routing = _services.GetRequiredService<IRoutingService>();
+        dict["routing_agents"] = routing.GetRoutingItems();
+        dict["routing_handlers"] = routing.GetHandlers();
 
         return base.OnInstructionLoaded(template, dict);
     }

src/Infrastructure/BotSharp.Core/Routing/Hooks/RoutingAgentHook.cs

@@ -41,7 +41,8 @@ private async Task<bool> InvokeFunction(Agent agent, RoleDialogModel message, Li
     {
         // execute function
         // Save states
-        SaveStateByArgs(JsonSerializer.Deserialize<JsonDocument>(message.FunctionArgs));
+        var states = _services.GetRequiredService<IConversationStateService>();
+        states.SaveStateByArgs(message.FunctionArgs?.JsonContent<JsonDocument>());
 
         var conversationService = _services.GetRequiredService<IConversationService>();
         // Call functions