change terms

src/Plugins/BotSharp.Plugin.Planner/Functions/PrimaryStagePlanFn.cs

@@ -6,10 +6,13 @@ public class PrimaryStagePlanFn : IFunctionCallback
 {
     public string Name => "plan_primary_stage";
     public string Indication => "Currently analyzing and breaking down user requirements.";
+
     private readonly IServiceProvider _services;
     private readonly ILogger<PrimaryStagePlanFn> _logger;
 
-    public PrimaryStagePlanFn(IServiceProvider services, ILogger<PrimaryStagePlanFn> logger)
+    public PrimaryStagePlanFn(
+        IServiceProvider services,
+        ILogger<PrimaryStagePlanFn> logger)
     {
         _services = services;
         _logger = logger;
@@ -38,12 +41,12 @@ public class PrimaryStagePlanFn : IFunctionCallback
 
         // Get first stage planning prompt
         var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
-        var firstPlanningPrompt = await GetFirstStagePlanPrompt(message, task.Requirements, knowledges);
+        var prompt = await GetFirstStagePlanPrompt(message, task.Requirements, knowledges);
         var plannerAgent = new Agent
         {
             Id = BuiltInAgentId.Planner,
-            Name = "planning_1st",
-            Instruction = firstPlanningPrompt,
+            Name = "FirstStagePlanner",
+            Instruction = prompt,
             TemplateDict = new Dictionary<string, object>(),
             LlmConfig = currentAgent.LlmConfig
         };

src/Plugins/BotSharp.Plugin.Planner/Functions/SecondaryStagePlanFn.cs

@@ -1,5 +1,4 @@
 using BotSharp.Plugin.Planner.TwoStaging.Models;
-using System.Threading.Tasks;
 
 namespace BotSharp.Plugin.Planner.Functions;
 
@@ -7,10 +6,13 @@ public class SecondaryStagePlanFn : IFunctionCallback
 {
     public string Name => "plan_secondary_stage";
     public string Indication => "Further analyzing and breaking down user sub-needs.";
+
     private readonly IServiceProvider _services;
     private readonly ILogger<SecondaryStagePlanFn> _logger;
 
-    public SecondaryStagePlanFn(IServiceProvider services, ILogger<SecondaryStagePlanFn> logger)
+    public SecondaryStagePlanFn(
+        IServiceProvider services,
+        ILogger<SecondaryStagePlanFn> logger)
     {
         _services = services;
         _logger = logger;
@@ -25,7 +27,7 @@ public class SecondaryStagePlanFn : IFunctionCallback
 
         var msgSecondary = RoleDialogModel.From(message);
         var collectionName = knowledgeSettings.Default.CollectionName;
-        var planPrimary = states.GetState("planning_result");
+        var planResult = states.GetState("planning_result");
 
         var taskSecondary = JsonSerializer.Deserialize<SecondaryBreakdownTask>(msgSecondary.FunctionArgs);
 
@@ -43,14 +45,14 @@ public class SecondaryStagePlanFn : IFunctionCallback
 
         // Get second stage planning prompt
         var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
-        var secondPlanningPrompt = await GetSecondStagePlanPrompt(taskSecondary.TaskDescription, planPrimary, knowledgeResults, message);
-        _logger.LogInformation(secondPlanningPrompt);
+        var prompt = await GetSecondStagePlanPrompt(taskSecondary.TaskDescription, planResult, knowledgeResults, message);
+        _logger.LogInformation(prompt);
 
         var plannerAgent = new Agent
         {
             Id = BuiltInAgentId.Planner,
-            Name = "planning_2nd",
-            Instruction = secondPlanningPrompt,
+            Name = "SecondStagePlanner",
+            Instruction = prompt,
             TemplateDict = new Dictionary<string, object>(),
             LlmConfig = currentAgent.LlmConfig
         };
@@ -63,7 +65,7 @@ public class SecondaryStagePlanFn : IFunctionCallback
         return true;
     }
 
-    private async Task<string> GetSecondStagePlanPrompt(string taskDescription, string planPrimary, string knowledgeResults, RoleDialogModel message)
+    private async Task<string> GetSecondStagePlanPrompt(string taskDescription, string planResult, string knowledgeResults, RoleDialogModel message)
     {
         var agentService = _services.GetRequiredService<IAgentService>();
         var render = _services.GetRequiredService<ITemplateRender>();
@@ -79,7 +81,7 @@ public class SecondaryStagePlanFn : IFunctionCallback
         return render.Render(template, new Dictionary<string, object>
         {
             { "task_description", taskDescription },
-            { "primary_plan", planPrimary },
+            { "primary_plan", planResult },
             { "additional_knowledge", knowledgeResults },
             { "response_format",  responseFormat }
         });

src/Plugins/BotSharp.Plugin.Planner/Functions/SummaryPlanFn.cs

@@ -8,6 +8,7 @@ public class SummaryPlanFn : IFunctionCallback
 {
     public string Name => "plan_summary";
     public string Indication => "Organizing and summarizing the final output results.";
+
     private readonly IServiceProvider _services;
     private readonly ILogger<SummaryPlanFn> _logger;
 
@@ -34,7 +35,7 @@ public class SummaryPlanFn : IFunctionCallback
         var steps = states.GetState("planning_result").JsonArrayContent<SecondStagePlan>();
         var allTables = new List<string>();
         var ddlStatements = string.Empty;
-        var relevantKnowledge = states.GetState("planning_result");
+        var planResult = states.GetState("planning_result");
         var dictionaryItems = states.GetState("dictionary_items");
         var excelImportResult = states.GetState("excel_import_result");
 
@@ -53,14 +54,14 @@ public class SummaryPlanFn : IFunctionCallback
         ddlStatements += "\r\n" + msgCopy.Content;
 
         // Summarize and generate query
-        var summaryPlanPrompt = await GetSummaryPlanPrompt(msgCopy, taskRequirement, relevantKnowledge, dictionaryItems, ddlStatements, excelImportResult);
-        _logger.LogInformation($"Summary plan prompt:\r\n{summaryPlanPrompt}");
+        var prompt = await GetSummaryPlanPrompt(msgCopy, taskRequirement, planResult, dictionaryItems, ddlStatements, excelImportResult);
+        _logger.LogInformation($"Summary plan prompt:\r\n{prompt}");
 
         var plannerAgent = new Agent
         {
             Id = BuiltInAgentId.Planner,
-            Name = "Planner Summary",
-            Instruction = summaryPlanPrompt,
+            Name = "SummaryPlanner",
+            Instruction = prompt,
             LlmConfig = currentAgent.LlmConfig
         };
 
@@ -105,7 +106,7 @@ public class SummaryPlanFn : IFunctionCallback
             { "relevant_knowledges", relevantKnowledge },
             { "dictionary_items", dictionaryItems },
             { "table_structure", ddlStatement },
-            { "excel_import_result",excelImportResult }
+            { "excel_import_result", excelImportResult }
         });
     }
     private async Task<RoleDialogModel> GetAiResponse(Agent plannerAgent)

src/Plugins/BotSharp.Plugin.SqlDriver/BotSharp.Plugin.SqlDriver.csproj

@@ -17,12 +17,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\sql_dictionary_lookup.json" />
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\sql_select.json" />
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\sql_table_definition.json" />
-    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\sql_dictionary_lookup.fn.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\verify_dictionary_term.json" />
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\sql_executor.fn.liquid" />
     <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\sql_table_definition.fn.liquid" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\verify_dictionary_term.fn.liquid" />
     <None Remove="data\agents\beda4c12-e1ec-4b4b-b328-3df4a6687c4f\agent.json" />
     <None Remove="data\agents\beda4c12-e1ec-4b4b-b328-3df4a6687c4f\functions\execute_sql.json" />
     <None Remove="data\agents\beda4c12-e1ec-4b4b-b328-3df4a6687c4f\functions\lookup_dictionary.json" />
@@ -37,10 +37,10 @@
     <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\sql_table_definition.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\sql_dictionary_lookup.json">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\verify_dictionary_term.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\sql_dictionary_lookup.fn.liquid">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\verify_dictionary_term.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="data\agents\beda4c12-e1ec-4b4b-b328-3df4a6687c4f\functions\sql_table_definition.json">

src/Plugins/BotSharp.Plugin.SqlDriver/Functions/VerifyDictionaryTerm.cs

@@ -7,12 +7,15 @@ using static Dapper.SqlMapper;
 
 namespace BotSharp.Plugin.SqlDriver.Functions;
 
-public class LookupDictionaryFn : IFunctionCallback
+public class VerifyDictionaryTerm : IFunctionCallback
 {
     public string Name => "verify_dictionary_term";
+    public string Indication => "Verifying dictionary term";
+
+
     private readonly IServiceProvider _services;
 
-    public LookupDictionaryFn(IServiceProvider services)
+    public VerifyDictionaryTerm(IServiceProvider services)
     {
         _services = services;
     }