SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #624 from iceljc/master

Browse source 
minor change
This commit is contained in:
iceljc 2024-09-04 20:13:24 -05:00 committed by GitHub
parent a89f8febe6 bb49b39e82
commit 8ee452ed1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Plugins/BotSharp.Plugin.Planner/Functions/PrimaryStagePlanFn.cs
View file

@ -1,4 +1,3 @@
using BotSharp.Abstraction.Knowledges.Models;
using BotSharp.Plugin.Planner.TwoStaging.Models;
namespace BotSharp.Plugin.Planner.Functions;
@ -26,21 +25,18 @@ public class PrimaryStagePlanFn : IFunctionCallback
state.SetState("max_tokens", "4096");
var task = JsonSerializer.Deserialize<PrimaryRequirementRequest>(message.FunctionArgs);
var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;
//get knowledge from vectordb
// Get knowledge from vectordb
var knowledges = new List<string>();
foreach (var question in task.Questions)
{
var retrievalMessage = new RoleDialogModel(AgentRole.User, question)
var list = await knowledgeService.SearchVectorKnowledge(question, collectionName, new VectorSearchOptions
{
FunctionArgs = JsonSerializer.Serialize(new ExtractedKnowledge
{
Question = question
}),
Content = ""
};
await fn.InvokeFunction("knowledge_retrieval", retrievalMessage);
knowledges.Add(retrievalMessage.Content);
Confidence = 0.2f
});
knowledges.Add(string.Join("\r\n\r\n=====\r\n", list.Select(x => x.ToQuestionAnswer())));
}
// Get first stage planning prompt
@ -66,8 +62,8 @@ public class PrimaryStagePlanFn : IFunctionCallback
var render = _services.GetRequiredService<ITemplateRender>();
var knowledgeHooks = _services.GetServices<IKnowledgeHook>();
var aiAssistant = await agentService.GetAgent(BuiltInAgentId.Planner);
var template = aiAssistant.Templates.FirstOrDefault(x => x.Name == "two_stage.1st.plan")?.Content ?? string.Empty;
var agent = await agentService.GetAgent(BuiltInAgentId.Planner);
var template = agent.Templates.FirstOrDefault(x => x.Name == "two_stage.1st.plan")?.Content ?? string.Empty;
var responseFormat = JsonSerializer.Serialize(new FirstStagePlan
{
Parameters = [ JsonDocument.Parse("{}") ],

8
src/Plugins/BotSharp.Plugin.Planner/Functions/SecondaryStagePlanFn.cs
View file

@ -21,10 +21,10 @@ public class SecondaryStagePlanFn : IFunctionCallback
var agentService = _services.GetRequiredService<IAgentService>();
var knowledgeService = _services.GetRequiredService<IKnowledgeService>();
var knowledgeSettings = _services.GetRequiredService<KnowledgeBaseSettings>();
var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;
var msgSecondary = RoleDialogModel.From(message);
var taskPrimary = JsonSerializer.Deserialize<PrimaryRequirementRequest>(message.FunctionArgs);
var collectionName = knowledgeSettings.Default.CollectionName ?? KnowledgeCollectionName.BotSharp;
msgSecondary.FunctionArgs = JsonSerializer.Serialize(new SecondaryBreakdownTask
{
@ -71,8 +71,8 @@ public class SecondaryStagePlanFn : IFunctionCallback
var agentService = _services.GetRequiredService<IAgentService>();
var render = _services.GetRequiredService<ITemplateRender>();
var planner = await agentService.GetAgent(message.CurrentAgentId);
var template = planner.Templates.FirstOrDefault(x => x.Name == "two_stage.2nd.plan")?.Content ?? string.Empty;
var agent = await agentService.GetAgent(message.CurrentAgentId);
var template = agent.Templates.FirstOrDefault(x => x.Name == "two_stage.2nd.plan")?.Content ?? string.Empty;
var responseFormat = JsonSerializer.Serialize(new SecondStagePlan
{
Tool = "tool name if task solution provided",

11
src/Plugins/BotSharp.Plugin.Planner/Functions/SummaryPlanFn.cs
View file

@ -23,9 +23,8 @@ public class SummaryPlanFn : IFunctionCallback
var agentService = _services.GetRequiredService<IAgentService>();
var state = _services.GetRequiredService<IConversationStateService>();
var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
state.SetState("max_tokens", "4096");
var currentAgent = await agentService.LoadAgent(message.CurrentAgentId);
var taskRequirement = state.GetState("requirement_detail");
// Get table names
@ -45,7 +44,7 @@ public class SummaryPlanFn : IFunctionCallback
message.Data = null;
// Summarize and generate query
var summaryPlanPrompt = await GetPlanSummaryPrompt(taskRequirement, relevantKnowledge, ddlStatements);
var summaryPlanPrompt = await GetSummaryPlanPrompt(taskRequirement, relevantKnowledge, ddlStatements);
_logger.LogInformation($"Summary plan prompt:\r\n{summaryPlanPrompt}");
var plannerAgent = new Agent
@ -63,13 +62,13 @@ public class SummaryPlanFn : IFunctionCallback
return true;
}
private async Task<string> GetPlanSummaryPrompt(string taskDescription, string relevantKnowledge, string ddlStatement)
private async Task<string> GetSummaryPlanPrompt(string taskDescription, string relevantKnowledge, string ddlStatement)
{
var agentService = _services.GetRequiredService<IAgentService>();
var render = _services.GetRequiredService<ITemplateRender>();
var aiAssistant = await agentService.GetAgent(BuiltInAgentId.Planner);
var template = aiAssistant.Templates.FirstOrDefault(x => x.Name == "two_stage.summarize")?.Content ?? string.Empty;
var agent = await agentService.GetAgent(BuiltInAgentId.Planner);
var template = agent.Templates.FirstOrDefault(x => x.Name == "two_stage.summarize")?.Content ?? string.Empty;
var responseFormat = JsonSerializer.Serialize(new FirstStagePlan
{
Parameters = [JsonDocument.Parse("{}")],

6
src/Plugins/BotSharp.Plugin.SqlDriver/Functions/GetTableDefinitionFn.cs
View file

@ -25,7 +25,7 @@ public class GetTableDefinitionFn : IFunctionCallback
var settings = _services.GetRequiredService<SqlDriverSetting>();
// Get table DDL from database
var tables = message.Data as List<string>;
var tables = message.Data as IEnumerable<string>;
if (tables.IsNullOrEmpty()) return false;
var tableDdls = new List<string>();
@ -36,9 +36,9 @@ public class GetTableDefinitionFn : IFunctionCallback
{
try
{
var sql = $"select * from information_schema.tables where table_name = @tableName";
var escapedTableName = MySqlHelper.EscapeString(table);
var sql = $"select * from information_schema.tables where table_name = @tableName";
var result = connection.QueryFirstOrDefault(sql, new
{
tableName = escapedTableName
@ -60,7 +60,7 @@ public class GetTableDefinitionFn : IFunctionCallback
}
catch (Exception ex)
{
_logger.LogWarning($"Error when getting ddl statement of table {table}.");
_logger.LogWarning($"Error when getting ddl statement of table {table}. {ex.Message}\r\n{ex.InnerException}");
}
}