resolve conflicts

Author: Jicheng Lu

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

@@ -18,6 +18,7 @@ public PrimaryStagePlanFn(IServiceProvider services, ILogger<PrimaryStagePlanFn>
     public async Task<bool> Execute(RoleDialogModel message)
     {
         // Debug
+        var agentService = _services.GetRequiredService<IAgentService>();
         var state = _services.GetRequiredService<IConversationStateService>();
         var knowledgeService = _services.GetRequiredService<IKnowledgeService>();
         var knowledgeSettings = _services.GetRequiredService<KnowledgeBaseSettings>();
@@ -28,16 +29,14 @@ public async Task<bool> Execute(RoleDialogModel message)
 
         // Get knowledge from vectordb        
         var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp; ;
-        var knowledges = await knowledgeService.SearchVectorKnowledge(task.Question, collectionName, new VectorSearchOptions
+        var knowledges = await knowledgeService.SearchVectorKnowledge(task.Requirements, collectionName, new VectorSearchOptions
         {
             Confidence = 0.1f
         });
         message.Content = string.Join("\r\n\r\n=====\r\n", knowledges.Select(x => x.ToQuestionAnswer()));
 
-        var agentService = _services.GetRequiredService<IAgentService>();
-        var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
-
         // Send knowledge to AI to refine and summarize the primary planning
+        var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
         var firstPlanningPrompt = await GetFirstStagePlanPrompt(task, message);
         var plannerAgent = new Agent
         {

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

@@ -5,44 +5,65 @@ namespace BotSharp.Plugin.Planner.Functions;
 public class SummaryPlanFn : IFunctionCallback
 {
     public string Name => "plan_summary";
+
     private readonly IServiceProvider _services;
-    private readonly ILogger _logger;
-    private object aiAssistant;
+    private readonly ILogger<SummaryPlanFn> _logger;
 
-    public SummaryPlanFn(IServiceProvider services, ILogger<PrimaryStagePlanFn> logger)
+    public SummaryPlanFn(
+        IServiceProvider services,
+        ILogger<SummaryPlanFn> logger)
     {
         _services = services;
         _logger = logger;
     }
 
     public async Task<bool> Execute(RoleDialogModel message)
     {
-        //debug
+        var fn = _services.GetRequiredService<IRoutingService>();
+        var agentService = _services.GetRequiredService<IAgentService>();
         var state = _services.GetRequiredService<IConversationStateService>();
+
+        var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
         state.SetState("max_tokens", "4096");
 
         var task = state.GetState("requirement_detail");
 
-        // summarize and generate query
-        var summaryPlanningPrompt = await GetPlanSummaryPrompt(task, message);
-        _logger.LogInformation(summaryPlanningPrompt);
+        // Get DDL
+        var steps = message.Content.JsonArrayContent<SecondStagePlan>();
+
+        // Get all the related tables
+        var allTables = new List<string>();
+        foreach (var step in steps)
+        {
+            allTables.AddRange(step.Tables);
+        }
+        message.Data = allTables.Distinct().ToList();
+
+        // Get table DDL and stores in content
+        var msgCopy = RoleDialogModel.From(message);
+        await fn.InvokeFunction("get_table_definition", msgCopy);
+        var ddlStatements = msgCopy.Content;
+
+        // Summarize and generate query
+        var summaryPlanPrompt = await GetPlanSummaryPrompt(task, message.Content, ddlStatements);
+        _logger.LogInformation($"Summary plan prompt:\r\n{summaryPlanPrompt}");
 
         var plannerAgent = new Agent
         {
             Id = BuiltInAgentId.Planner,
-            Name = "planner_summary",
-            Instruction = summaryPlanningPrompt,
-            TemplateDict = new Dictionary<string, object>()
+            Name = "Planner Summary",
+            Instruction = summaryPlanPrompt,
+            LlmConfig = currentAgent.LlmConfig
         };
-        var response_summary = await GetAiResponse(plannerAgent);
 
-        message.Content = response_summary.Content;
+        var summary = await GetAiResponse(plannerAgent);
+        message.Content = summary.Content;
         message.StopCompletion = true;
 
         return true;
     }
 
-    private async Task<string> GetPlanSummaryPrompt(string task, RoleDialogModel message)
+    private async Task<string> GetPlanSummaryPrompt(string task, string knowledge, string ddlStatement)
     {
         // save to knowledge base
         var agentService = _services.GetRequiredService<IAgentService>();
@@ -58,9 +79,9 @@ private async Task<string> GetPlanSummaryPrompt(string task, RoleDialogModel mes
 
         return render.Render(template, new Dictionary<string, object>
         {
-            { "table_structure", message.SecondaryContent }, ////check
-            { "task_description", task},
-            { "relevant_knowledges", message.Content },
+            { "table_structure", ddlStatement },
+            { "task_description", task },
+            { "relevant_knowledges", knowledge },
             { "response_format", responseFormat }
         });
     }
@@ -69,17 +90,17 @@ private async Task<RoleDialogModel> GetAiResponse(Agent plannerAgent)
         var conv = _services.GetRequiredService<IConversationService>();
         var wholeDialogs = conv.GetDialogHistory();
 
-        //add "test" to wholeDialogs' last element
+        // Add "test" to wholeDialogs' last element
         if (plannerAgent.Name == "planner_summary")
         {
-            //add "test" to wholeDialogs' last element in a new paragraph
+            // Add "test" to wholeDialogs' last element in a new paragraph
             wholeDialogs.Last().Content += "\n\nIf the table structure didn't mention auto incremental, the data field id needs to insert id manually and you need to use max(id) instead of LAST_INSERT_ID function.\nFor example, you should use SET @id = select max(id) from table;";
             wholeDialogs.Last().Content += "\n\nTry if you can generate a single query to fulfill the needs";
         }
 
         if (plannerAgent.Name == "planning_1st")
         {
-            //add "test" to wholeDialogs' last element in a new paragraph
+            // Add "test" to wholeDialogs' last element in a new paragraph
             wholeDialogs.Last().Content += "\n\nYou must analyze the table description to infer the table relations.";
         }
 

src/Plugins/BotSharp.Plugin.Planner/data/agents/282a7128-69a1-44b0-878c-a9159b88f3b9/instructions/instruction.liquid

@@ -1,3 +1,3 @@
 Use the TwoStagePlanner approach to plan the overall implementation steps, call plan_primary_stage. 
 If need_additional_information is true, call plan_secondary_stage for the specific primary stage.
-Call plan_summary to summarize the final planning steps.
+You must Call plan_summary as the last step to summarize the final planning steps.

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

@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Logging;
 using MySqlConnector;
 using static Dapper.SqlMapper;
 
@@ -7,10 +8,14 @@ public class GetTableDefinitionFn : IFunctionCallback
 {
     public string Name => "get_table_definition";
     private readonly IServiceProvider _services;
+    private readonly ILogger<GetTableDefinitionFn> _logger;
 
-    public GetTableDefinitionFn(IServiceProvider services)
+    public GetTableDefinitionFn(
+        IServiceProvider services,
+        ILogger<GetTableDefinitionFn> logger)
     {
         _services = services;
+        _logger = logger;
     }
 
     public async Task<bool> Execute(RoleDialogModel message)
@@ -20,37 +25,47 @@ public async Task<bool> Execute(RoleDialogModel message)
         var settings = _services.GetRequiredService<SqlDriverSetting>();
 
         // Get table DDL from database
+        var tables = message.Data as List<string>;
+        if (tables.IsNullOrEmpty()) return false;
+
         var tableDdls = new List<string>();
         using var connection = new MySqlConnection(settings.MySqlConnectionString);
         connection.Open();
 
-        foreach (var table in (List<string>)message.Data)
+        foreach (var table in tables)
         {
-            var escapedTableName = MySqlHelper.EscapeString(table);
-
-            var sql = $"select * from information_schema.tables where table_name = @tableName";
-            var result = connection.QueryFirstOrDefault(sql, new
+            try
             {
-                tableName = escapedTableName
-            });
+                var escapedTableName = MySqlHelper.EscapeString(table);
+
+                var sql = $"select * from information_schema.tables where table_name = @tableName";
+                var result = connection.QueryFirstOrDefault(sql, new
+                {
+                    tableName = escapedTableName
+                });
 
-            if (result == null) continue;
+                if (result == null) continue;
 
-            sql = $"SHOW CREATE TABLE `{escapedTableName}`";
-            using var command = new MySqlCommand(sql, connection);
-            using var reader = command.ExecuteReader();
-            if (reader.Read())
+                sql = $"SHOW CREATE TABLE `{escapedTableName}`";
+                using var command = new MySqlCommand(sql, connection);
+                using var reader = command.ExecuteReader();
+                if (reader.Read())
+                {
+                    result = reader.GetString(1);
+                    tableDdls.Add(result);
+                }
+
+                reader.Close();
+                command.Dispose();
+            }
+            catch (Exception ex)
             {
-                result = reader.GetString(1);
-                tableDdls.Add(result);
+                _logger.LogWarning($"Error when getting ddl statement of table {table}.");
             }
-
-            reader.Close();
-            command.Dispose();
         }
 
         connection.Close();
-        message.Content = string.Join("\r\n", tableDdls);
+        message.Content = string.Join("\r\n\r\n", tableDdls);
         return true;
     }
 }

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

@@ -94,21 +94,21 @@ private string GetTableStructure(string table)
         using var connection = new MySqlConnection(settings.MySqlConnectionString);
         connection.Open();
 
-        var result = string.Empty;
+        var ddl = string.Empty;
         var escapedTableName = MySqlHelper.EscapeString(table);
         var sql = $"SHOW CREATE TABLE `{escapedTableName}`";
 
         using var command = new MySqlCommand(sql, connection);
         using var reader = command.ExecuteReader();
         if (reader.Read())
         {
-            result = reader.GetString(1);
+            ddl = reader.GetString(1);
         }
 
         reader.Close();
         command.Dispose();
         connection.Close();
-        return result;
+        return ddl;
     }
 
     private async Task<string> GetPrompt(string content)