refine tool call and response

Jicheng Lu · Jicheng Lu · commit d91a55232bea · 2025-05-16T10:49:09.000-05:00
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -305,10 +305,10 @@ await onMessageReceived(new RoleDialogModel(choice.Role?.ToString() ?? ChatMessa
             {
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
-                    ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
+                    ChatToolCall.CreateFunctionToolCall(message.ToolCallId ?? message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? "{}"))
                 }));
 
-                messages.Add(new ToolChatMessage(message.FunctionName, message.Content));
+                messages.Add(new ToolChatMessage(message.ToolCallId ?? message.FunctionName, message.Content));
             }
             else if (message.Role == AgentRole.User)
             {
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
@@ -271,6 +271,7 @@ public void SetModelName(string model)
                     {
                         FunctionCall = new FunctionCall
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName,
                             Args = JsonNode.Parse(message.FunctionArgs ?? "{}")
                         }
@@ -282,6 +283,7 @@ public void SetModelName(string model)
                     {
                         FunctionResponse = new FunctionResponse
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName,
                             Response = new JsonObject()
                             {
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -512,6 +512,7 @@ await hook.AfterGenerated(new RoleDialogModel(AgentRole.Assistant, text)
                     {
                         FunctionCall = new FunctionCall
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName,
                             Args = JsonNode.Parse(message.FunctionArgs ?? "{}")
                         }
@@ -523,6 +524,7 @@ await hook.AfterGenerated(new RoleDialogModel(AgentRole.Assistant, text)
                     {
                         FunctionResponse = new FunctionResponse
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName ?? string.Empty,
                             Response = new JsonObject()
                             {
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Hooks;
 using OpenAI.Chat;
 
@@ -273,10 +272,10 @@ await onMessageReceived(new RoleDialogModel(choice.Role?.ToString() ?? ChatMessa
             {
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
-                    ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
+                    ChatToolCall.CreateFunctionToolCall(message.ToolCallId ?? message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? "{}"))
                 }));
 
-                messages.Add(new ToolChatMessage(message.FunctionName, message.Content));
+                messages.Add(new ToolChatMessage(message.ToolCallId ?? message.FunctionName, message.Content));
             }
             else if (message.Role == AgentRole.User)
             {

Original file line number	Diff line number	Diff line change
`@@ -305,10 +305,10 @@ await onMessageReceived(new RoleDialogModel(choice.Role?.ToString() ?? ChatMessa`
`305`	`305`	`{`
`306`	`306`	`messages.Add(new AssistantChatMessage(new List<ChatToolCall>`
`307`	`307`	`{`
`308`		`- ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))`
	`308`	`+ ChatToolCall.CreateFunctionToolCall(message.ToolCallId ?? message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? "{}"))`
`309`	`309`	`}));`
`310`	`310`
`311`		`- messages.Add(new ToolChatMessage(message.FunctionName, message.Content));`
	`311`	`+ messages.Add(new ToolChatMessage(message.ToolCallId ?? message.FunctionName, message.Content));`
`312`	`312`	`}`
`313`	`313`	`else if (message.Role == AgentRole.User)`
`314`	`314`	`{`
Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@ public void SetModelName(string model)`
`271`	`271`	`{`
`272`	`272`	`FunctionCall = new FunctionCall`
`273`	`273`	`{`
	`274`	`+ Id = message.ToolCallId,`
`274`	`275`	`Name = message.FunctionName,`
`275`	`276`	`Args = JsonNode.Parse(message.FunctionArgs ?? "{}")`
`276`	`277`	`}`
`@@ -282,6 +283,7 @@ public void SetModelName(string model)`
`282`	`283`	`{`
`283`	`284`	`FunctionResponse = new FunctionResponse`
`284`	`285`	`{`
	`286`	`+ Id = message.ToolCallId,`
`285`	`287`	`Name = message.FunctionName,`
`286`	`288`	`Response = new JsonObject()`
`287`	`289`	`{`
Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,7 @@ await hook.AfterGenerated(new RoleDialogModel(AgentRole.Assistant, text)`
`512`	`512`	`{`
`513`	`513`	`FunctionCall = new FunctionCall`
`514`	`514`	`{`
	`515`	`+ Id = message.ToolCallId,`
`515`	`516`	`Name = message.FunctionName,`
`516`	`517`	`Args = JsonNode.Parse(message.FunctionArgs ?? "{}")`
`517`	`518`	`}`
`@@ -523,6 +524,7 @@ await hook.AfterGenerated(new RoleDialogModel(AgentRole.Assistant, text)`
`523`	`524`	`{`
`524`	`525`	`FunctionResponse = new FunctionResponse`
`525`	`526`	`{`
	`527`	`+ Id = message.ToolCallId,`
`526`	`528`	`Name = message.FunctionName ?? string.Empty,`
`527`	`529`	`Response = new JsonObject()`
`528`	`530`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using BotSharp.Abstraction.Agents.Models;`
`2`	`1`	`using BotSharp.Abstraction.Hooks;`
`3`	`2`	`using OpenAI.Chat;`
`4`	`3`
`@@ -273,10 +272,10 @@ await onMessageReceived(new RoleDialogModel(choice.Role?.ToString() ?? ChatMessa`
`273`	`272`	`{`
`274`	`273`	`messages.Add(new AssistantChatMessage(new List<ChatToolCall>`
`275`	`274`	`{`
`276`		`- ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))`
	`275`	`+ ChatToolCall.CreateFunctionToolCall(message.ToolCallId ?? message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? "{}"))`
`277`	`276`	`}));`
`278`	`277`
`279`		`- messages.Add(new ToolChatMessage(message.FunctionName, message.Content));`
	`278`	`+ messages.Add(new ToolChatMessage(message.ToolCallId ?? message.FunctionName, message.Content));`
`280`	`279`	`}`
`281`	`280`	`else if (message.Role == AgentRole.User)`
`282`	`281`	`{`