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

Generate Indication from LLM

Browse source
This commit is contained in:
Haiping Chen 2025-01-09 16:30:25 -06:00
parent 43eb549bd0
commit a6ed69c355
14 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
View file

@ -146,6 +146,7 @@ public class RoleDialogModel : ITrackableMessage
FunctionArgs = source.FunctionArgs,
FunctionName = source.FunctionName,
ToolCallId = source.ToolCallId,
Indication = source.Indication,
PostbackFunctionName = source.PostbackFunctionName,
RichContent = source.RichContent,
Payload = source.Payload,

2
src/Infrastructure/BotSharp.Abstraction/Functions/IFunctionCallback.cs
View file

@ -9,7 +9,7 @@ public interface IFunctionCallback
/// </summary>
string Indication => string.Empty;
Task<string> GetIndication(RoleDialogModel message) => Task.FromResult(Indication);
Task<string> GetIndication(RoleDialogModel message) => Task.FromResult(message.Indication ?? Indication);
Task<bool> Execute(RoleDialogModel message);
}

2
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs
View file

@ -7,7 +7,7 @@ public partial class AgentService
{
public static ConcurrentDictionary<string, Dictionary<string, string>> AgentParameterTypes = new();
[MemoryCache(10 * 60, perInstanceCache: true)]
// [MemoryCache(10 * 60, perInstanceCache: true)]
public async Task<Agent> LoadAgent(string id, bool loadUtility = true)
{
if (string.IsNullOrEmpty(id) || id == Guid.Empty.ToString())

2
src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.Rendering.cs
View file

@ -111,7 +111,7 @@ public partial class AgentService
parameterDef.Properties = JsonSerializer.Deserialize<JsonDocument>(clonedRoot.ToString());
parameterDef.Required = required;
return parameterDef; ;
return parameterDef;
}
public string RenderedTemplate(Agent agent, string templateName)

1
src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeAgent.cs
View file

@ -43,6 +43,7 @@ public partial class RoutingService
message.ToolCallId = response.ToolCallId;
message.FunctionName = response.FunctionName;
message.FunctionArgs = response.FunctionArgs;
message.Indication = response.Indication;
message.CurrentAgentId = agent.Id;
await InvokeFunction(message, dialogs);

2
src/Infrastructure/BotSharp.Logger/Hooks/VerboseLogHook.cs
View file

@ -41,7 +41,7 @@ public class VerboseLogHook : IContentGeneratingHook
var agent = await agentService.LoadAgent(message.CurrentAgentId);
var log = message.Role == AgentRole.Function ?
$"[{agent?.Name}]: {message.FunctionName}({message.FunctionArgs})" :
$"[{agent?.Name}]: {message.Indication} {message.FunctionName}({message.FunctionArgs})" :
$"[{agent?.Name}]: {message.Content}" + $" <== [msg_id: {message.MessageId}]";
_logger.LogInformation(tokenStats.Prompt);

2
src/Plugins/BotSharp.Plugin.AnthropicAI/BotSharp.Plugin.AnthropicAI.csproj
View file

@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Anthropic.SDK" Version="4.3.0" />
<PackageReference Include="Anthropic.SDK" Version="4.4.2" />
</ItemGroup>
<ItemGroup>

7
src/Plugins/BotSharp.Plugin.AnthropicAI/Providers/ChatCompletionProvider.cs
View file

@ -1,7 +1,6 @@
using Anthropic.SDK.Common;
using BotSharp.Abstraction.Conversations;
using BotSharp.Abstraction.MLTasks.Settings;
using System.Text.Json;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
@ -48,6 +47,7 @@ public class ChatCompletionProvider : IChatCompletion
if (response.StopReason == "tool_use")
{
var content = response.Content.OfType<TextContent>().FirstOrDefault();
var toolResult = response.Content.OfType<ToolUseContent>().First();
responseMessage = new RoleDialogModel(AgentRole.Function, response.FirstMessage?.Text ?? string.Empty)
@ -56,7 +56,8 @@ public class ChatCompletionProvider : IChatCompletion
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
ToolCallId = toolResult.Id,
FunctionName = toolResult.Name,
FunctionArgs = JsonSerializer.Serialize(toolResult.Input)
FunctionArgs = JsonSerializer.Serialize(toolResult.Input),
Indication = content.Text
};
}
else
@ -161,7 +162,7 @@ public class ChatCompletionProvider : IChatCompletion
new ToolResultContent()
{
ToolUseId = conv.ToolCallId,
Content = conv.Content
Content = [new TextContent() { Text = conv.Content }]
}
}
});

2
src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj
View file

@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.0.0" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>

7
src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -58,7 +58,8 @@ public class ChatCompletionProvider : IChatCompletion
CurrentAgentId = agent.Id,
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
FunctionName = toolCall?.FunctionName,
FunctionArgs = toolCall?.FunctionArguments?.ToString()
FunctionArgs = toolCall?.FunctionArguments?.ToString(),
Indication = value.Content.FirstOrDefault()?.Text
};
// Somethings LLM will generate a function name with agent name.
@ -160,8 +161,10 @@ public class ChatCompletionProvider : IChatCompletion
var funcContextIn = new RoleDialogModel(AgentRole.Function, text)
{
CurrentAgentId = agent.Id,
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
FunctionName = toolCall?.FunctionName,
FunctionArgs = toolCall?.FunctionArguments?.ToString()
FunctionArgs = toolCall?.FunctionArguments?.ToString(),
Indication = value.Content.FirstOrDefault()?.Text
};
// Somethings LLM will generate a function name with agent name.

3
src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
View file

@ -116,7 +116,8 @@ public class StreamingLogHook : ConversationHookBase, IContentGeneratingHook, IR
var agent = await _agentService.LoadAgent(message.CurrentAgentId);
message.FunctionArgs = message.FunctionArgs ?? "{}";
var args = message.FunctionArgs.FormatJson();
var log = $"{message.FunctionName} <u>executing</u>\r\n```json\r\n{args}\r\n```";
var log = $"*{message.Indication.Replace("\r", string.Empty).Replace("\n", string.Empty)}* \r\n\r\n **{message.FunctionName}**()";
log += args.Length > 5 ? $" \r\n```json\r\n{args}\r\n```" : string.Empty;
var input = new ContentLogInputModel(conversationId, message)
{

6
src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
View file

@ -1,6 +1,7 @@
using BotSharp.Abstraction.Agents;
using BotSharp.Abstraction.Agents.Enums;
using BotSharp.Abstraction.Loggers;
using Google.Protobuf.WellKnownTypes;
using Microsoft.Extensions.Logging;
using Mscc.GenerativeAI;
@ -125,6 +126,7 @@ public class GeminiChatCompletionProvider : IChatCompletion
if (!agentService.RenderFunction(agent, function)) continue;
var def = agentService.RenderFunctionProperty(agent, function);
var str = JsonSerializer.Serialize(def.Properties);
funcDeclarations.Add(new FunctionDeclaration
{
@ -132,8 +134,8 @@ public class GeminiChatCompletionProvider : IChatCompletion
Description = function.Description,
Parameters = new()
{
Type = ParameterType.Object,
Properties = def.Properties,
Type = str != "{}" ? ParameterType.Object : ParameterType.TypeUnspecified,
Properties = str != "{}" ? JsonSerializer.Deserialize<dynamic>(str) : null,
Required = def.Required
}
});

2
src/Plugins/BotSharp.Plugin.OpenAI/BotSharp.Plugin.OpenAI.csproj
View file

@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="OpenAI" Version="2.0.0" />
<PackageReference Include="OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>

7
src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
View file

@ -55,7 +55,8 @@ public class ChatCompletionProvider : IChatCompletion
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
ToolCallId = toolCall?.Id,
FunctionName = toolCall?.FunctionName,
FunctionArgs = toolCall?.FunctionArguments?.ToString()
FunctionArgs = toolCall?.FunctionArguments?.ToString(),
Indication = value.Content.FirstOrDefault()?.Text
};
// Somethings LLM will generate a function name with agent name.
@ -138,9 +139,11 @@ public class ChatCompletionProvider : IChatCompletion
var funcContextIn = new RoleDialogModel(AgentRole.Function, text)
{
CurrentAgentId = agent.Id,
MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
ToolCallId = toolCall?.Id,
FunctionName = toolCall?.FunctionName,
FunctionArgs = toolCall?.FunctionArguments?.ToString()
FunctionArgs = toolCall?.FunctionArguments?.ToString(),
Indication = value.Content.FirstOrDefault()?.Text
};
// Somethings LLM will generate a function name with agent name.