Merge pull request #822 from hchen2020/master

Generate Indication from LLM
SciSharp · Jan 13, 2025 · 14bbb3c · 14bbb3c
2 parents 5473713 + 48d2e43
commit 14bbb3c
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 14 deletions.
diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs
@@ -146,6 +146,7 @@ public static RoleDialogModel From(RoleDialogModel source,
             FunctionArgs = source.FunctionArgs,
             FunctionName = source.FunctionName,
             ToolCallId = source.ToolCallId,
+            Indication = source.Indication,
             PostbackFunctionName = source.PostbackFunctionName,
             RichContent = source.RichContent,
             Payload = source.Payload,

diff --git a/src/Infrastructure/BotSharp.Abstraction/Functions/IFunctionCallback.cs b/src/Infrastructure/BotSharp.Abstraction/Functions/IFunctionCallback.cs
@@ -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);
 }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.Rendering.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.Rendering.cs
@@ -111,7 +111,7 @@ public bool RenderFunction(Agent agent, FunctionDef def)
 
         parameterDef.Properties = JsonSerializer.Deserialize<JsonDocument>(clonedRoot.ToString());
         parameterDef.Required = required;
-        return parameterDef; ;
+        return parameterDef;
     }
 
     public string RenderedTemplate(Agent agent, string templateName)

diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeAgent.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingService.InvokeAgent.cs
@@ -43,6 +43,7 @@ public async Task<bool> InvokeAgent(string agentId, List<RoleDialogModel> dialog
             message.ToolCallId = response.ToolCallId;
             message.FunctionName = response.FunctionName;
             message.FunctionArgs = response.FunctionArgs;
+            message.Indication = response.Indication;
             message.CurrentAgentId = agent.Id;
 
             await InvokeFunction(message, dialogs);

diff --git a/src/Infrastructure/BotSharp.Logger/Hooks/RateLimitConversationHook.cs b/src/Infrastructure/BotSharp.Logger/Hooks/RateLimitConversationHook.cs
@@ -52,7 +52,7 @@ public override async Task OnMessageReceived(RoleDialogModel message)
         var channel = states.GetState("channel");
 
         // Check the number of conversations
-        if (channel != ConversationChannel.Phone && channel != ConversationChannel.Email)
+        if (channel != ConversationChannel.Phone && channel != ConversationChannel.Email && channel != ConversationChannel.Database)
         {
             var user = _services.GetRequiredService<IUserIdentity>();
             var convService = _services.GetRequiredService<IConversationService>();

diff --git a/src/Infrastructure/BotSharp.Logger/Hooks/VerboseLogHook.cs b/src/Infrastructure/BotSharp.Logger/Hooks/VerboseLogHook.cs
@@ -41,7 +41,7 @@ public async Task AfterGenerated(RoleDialogModel message, TokenStatsModel tokenS
         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);

diff --git a/src/Plugins/BotSharp.Plugin.AnthropicAI/BotSharp.Plugin.AnthropicAI.csproj b/src/Plugins/BotSharp.Plugin.AnthropicAI/BotSharp.Plugin.AnthropicAI.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Anthropic.SDK" Version="4.3.0" />
+    <PackageReference Include="Anthropic.SDK" Version="4.4.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Plugins/BotSharp.Plugin.AnthropicAI/Providers/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AnthropicAI/Providers/ChatCompletionProvider.cs
@@ -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,15 +47,16 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
 
         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)
+            responseMessage = new RoleDialogModel(AgentRole.Function, content?.Text ?? string.Empty)
             {
                 CurrentAgentId = agent.Id,
                 MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
                 ToolCallId = toolResult.Id,
                 FunctionName = toolResult.Name,
-                FunctionArgs = JsonSerializer.Serialize(toolResult.Input)
+                FunctionArgs = JsonSerializer.Serialize(toolResult.Input),
             };
         }
         else
@@ -161,7 +161,7 @@ public Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleDialogM
                         new ToolResultContent()
                         {
                             ToolUseId = conv.ToolCallId,
-                            Content = conv.Content
+                            Content = [new TextContent() { Text = conv.Content }]
                         }
                     }
                 });

diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj b/src/Plugins/BotSharp.Plugin.AzureOpenAI/BotSharp.Plugin.AzureOpenAI.csproj
@@ -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>
 

diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -160,6 +160,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent,
             var funcContextIn = new RoleDialogModel(AgentRole.Function, text)
             {
                 CurrentAgentId = agent.Id,
+                MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
                 FunctionName = toolCall?.FunctionName,
                 FunctionArgs = toolCall?.FunctionArguments?.ToString()
             };

diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
@@ -116,7 +116,8 @@ public override async Task OnFunctionExecuting(RoleDialogModel message)
         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)
         {

diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
@@ -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,15 +126,16 @@ public void SetModelName(string model)
             if (!agentService.RenderFunction(agent, function)) continue;
 
             var def = agentService.RenderFunctionProperty(agent, function);
+            var str = JsonSerializer.Serialize(def.Properties);
 
             funcDeclarations.Add(new FunctionDeclaration
             {
                 Name = function.Name,
                 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
                 }
             });

diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/BotSharp.Plugin.OpenAI.csproj b/src/Plugins/BotSharp.Plugin.OpenAI/BotSharp.Plugin.OpenAI.csproj
@@ -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>
 

diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -138,6 +138,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent,
             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()