From e1e56b596af5ebb557ef49cb79bf4c2105f52f5c Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 6 Dec 2024 01:27:57 -0600
Subject: [PATCH] rename

---
 .../Agents/Models/AgentUtility.cs             |  5 +++++
 .../BotSharp.Core/Agents/AgentPlugin.cs       |  2 +-
 .../{CommonAgentHook.cs => BasicAgentHook.cs} |  4 ++--
 .../Routing/RoutingService.InstructLoop.cs    | 20 +++++++++----------
 4 files changed, 17 insertions(+), 14 deletions(-)
 rename src/Infrastructure/BotSharp.Core/Agents/Hooks/{CommonAgentHook.cs => BasicAgentHook.cs} (96%)

diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentUtility.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentUtility.cs
index 40828944..ce39c568 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentUtility.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentUtility.cs
@@ -21,6 +21,11 @@ public class AgentUtility
         Functions = functions ?? [];
         Templates = templates ?? [];
     }
+
+    public override string ToString()
+    {
+        return Name;
+    }
 }
 
 
diff --git a/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs b/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs
index 51b0da05..b21772a1 100644
--- a/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs
+++ b/src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs
@@ -31,7 +31,7 @@ public class AgentPlugin : IBotSharpPlugin
     {
         services.AddScoped<ILlmProviderService, LlmProviderService>();
         services.AddScoped<IAgentService, AgentService>();
-        services.AddScoped<IAgentHook, CommonAgentHook>();
+        services.AddScoped<IAgentHook, BasicAgentHook>();
 
         services.AddScoped(provider =>
         {
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Hooks/CommonAgentHook.cs b/src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs
similarity index 96%
rename from src/Infrastructure/BotSharp.Core/Agents/Hooks/CommonAgentHook.cs
rename to src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs
index 78420fad..2a4a7374 100644
--- a/src/Infrastructure/BotSharp.Core/Agents/Hooks/CommonAgentHook.cs
+++ b/src/Infrastructure/BotSharp.Core/Agents/Hooks/BasicAgentHook.cs
@@ -1,10 +1,10 @@
 namespace BotSharp.Core.Agents.Hooks;
 
-public class CommonAgentHook : AgentHookBase
+public class BasicAgentHook : AgentHookBase
 {
     public override string SelfId => string.Empty;
 
-    public CommonAgentHook(IServiceProvider services, AgentSettings settings)
+    public BasicAgentHook(IServiceProvider services, AgentSettings settings)
         : base(services, settings)
     {
     }
diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingService.InstructLoop.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingService.InstructLoop.cs
index c3e1a8f4..18f330a3 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/RoutingService.InstructLoop.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/RoutingService.InstructLoop.cs
@@ -2,7 +2,6 @@ using BotSharp.Abstraction.Infrastructures.Enums;
 using BotSharp.Abstraction.Planning;
 using BotSharp.Abstraction.Routing.Enums;
 using BotSharp.Abstraction.Routing.Reasoning;
-using BotSharp.Core.Routing.Reasoning;
 
 namespace BotSharp.Core.Routing;
 
@@ -21,7 +20,7 @@ public partial class RoutingService
         var states = _services.GetRequiredService<IConversationStateService>();
         var executor = _services.GetRequiredService<IExecutor>();
 
-        var planner = GetReasoner(_router);
+        var reasoner = GetReasoner(_router);
 
         _context.Push(_router.Id);
 
@@ -46,7 +45,7 @@ public partial class RoutingService
 
         // Get first instruction
         _router.TemplateDict["conversation"] = await GetConversationContent(dialogs);
-        var inst = await planner.GetNextInstruction(_router, message.MessageId, dialogs);
+        var inst = await reasoner.GetNextInstruction(_router, message.MessageId, dialogs);
 
         int loopCount = 1;
         while (true)
@@ -63,30 +62,30 @@ public partial class RoutingService
 #else
             _logger.LogInformation($"*** Next Instruction *** {inst}");
 #endif
-            await planner.AgentExecuting(_router, inst, message, dialogs);
+            await reasoner.AgentExecuting(_router, inst, message, dialogs);
 
             // Handover to Task Agent
             if (inst.HandleDialogsByPlanner)
             {
-                var dialogWithoutContext = planner.BeforeHandleContext(inst, message, dialogs);
+                var dialogWithoutContext = reasoner.BeforeHandleContext(inst, message, dialogs);
                 response = await executor.Execute(this, inst, message, dialogWithoutContext);
-                planner.AfterHandleContext(dialogs, dialogWithoutContext);
+                reasoner.AfterHandleContext(dialogs, dialogWithoutContext);
             }
             else
             {
                 response = await executor.Execute(this, inst, message, dialogs);
             }
 
-            await planner.AgentExecuted(_router, inst, response, dialogs);
+            await reasoner.AgentExecuted(_router, inst, response, dialogs);
 
-            if (loopCount >= planner.MaxLoopCount || _context.IsEmpty)
+            if (loopCount >= reasoner.MaxLoopCount || _context.IsEmpty)
             {
                 break;
             }
 
             // Get next instruction from Planner
             _router.TemplateDict["conversation"] = await GetConversationContent(dialogs);
-            inst = await planner.GetNextInstruction(_router, message.MessageId, dialogs);
+            inst = await reasoner.GetNextInstruction(_router, message.MessageId, dialogs);
             loopCount++;
         }
 
@@ -103,8 +102,7 @@ public partial class RoutingService
             return _services.GetServices<IRoutingReasoner>().First(x => x.Name == "Naive Reasoner");
         }
 
-        var reasoner = _services.GetServices<IRoutingReasoner>().
-            FirstOrDefault(x => x.GetType().Name.EndsWith(rule.Field));
+        var reasoner = _services.GetServices<IRoutingReasoner>().FirstOrDefault(x => x.GetType().Name.EndsWith(rule.Field));
 
         if (reasoner == null)
         {