Merge branch 'master' of https://github.com/iceljc/BotSharp

Jicheng Lu · Jicheng Lu · commit bec8f6ec1be8 · 2025-02-03T10:09:53.000-06:00
diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -161,6 +161,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent,
             {
                 CurrentAgentId = agent.Id,
                 MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,
+                ToolCallId = toolCall?.Id,
                 FunctionName = toolCall?.FunctionName,
                 FunctionArgs = toolCall?.FunctionArguments?.ToString()
             };
diff --git a/src/Plugins/BotSharp.Plugin.DeepSeekAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.DeepSeekAI/Providers/Chat/ChatCompletionProvider.cs
@@ -245,10 +245,10 @@ public void SetModelName(string model)
             {
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
-                    ChatToolCall.CreateFunctionToolCall(message.ToolCallId, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
+                    ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
                 }));
 
-                messages.Add(new ToolChatMessage(message.ToolCallId, message.Content));
+                messages.Add(new ToolChatMessage(message.FunctionName, message.Content));
             }
             else if (message.Role == AgentRole.User)
             {
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -252,10 +252,10 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD
             {
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
-                    ChatToolCall.CreateFunctionToolCall(message.ToolCallId, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
+                    ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
                 }));
 
-                messages.Add(new ToolChatMessage(message.ToolCallId, message.Content));
+                messages.Add(new ToolChatMessage(message.FunctionName, message.Content));
             }
             else if (message.Role == AgentRole.User)
             {

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ public async Task<bool> GetChatCompletionsAsync(Agent agent,`
`161`	`161`	`{`
`162`	`162`	`CurrentAgentId = agent.Id,`
`163`	`163`	`MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty,`
	`164`	`+ ToolCallId = toolCall?.Id,`
`164`	`165`	`FunctionName = toolCall?.FunctionName,`
`165`	`166`	`FunctionArgs = toolCall?.FunctionArguments?.ToString()`
`166`	`167`	`};`
Original file line number	Diff line number	Diff line change
`@@ -245,10 +245,10 @@ public void SetModelName(string model)`
`245`	`245`	`{`
`246`	`246`	`messages.Add(new AssistantChatMessage(new List<ChatToolCall>`
`247`	`247`	`{`
`248`		`- ChatToolCall.CreateFunctionToolCall(message.ToolCallId, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))`
	`248`	`+ ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))`
`249`	`249`	`}));`
`250`	`250`
`251`		`- messages.Add(new ToolChatMessage(message.ToolCallId, message.Content));`
	`251`	`+ messages.Add(new ToolChatMessage(message.FunctionName, message.Content));`
`252`	`252`	`}`
`253`	`253`	`else if (message.Role == AgentRole.User)`
`254`	`254`	`{`
Original file line number	Diff line number	Diff line change
`@@ -252,10 +252,10 @@ public async Task<bool> GetChatCompletionsStreamingAsync(Agent agent, List<RoleD`
`252`	`252`	`{`
`253`	`253`	`messages.Add(new AssistantChatMessage(new List<ChatToolCall>`
`254`	`254`	`{`
`255`		`- ChatToolCall.CreateFunctionToolCall(message.ToolCallId, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))`
	`255`	`+ ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))`
`256`	`256`	`}));`
`257`	`257`
`258`		`- messages.Add(new ToolChatMessage(message.ToolCallId, message.Content));`
	`258`	`+ messages.Add(new ToolChatMessage(message.FunctionName, message.Content));`
`259`	`259`	`}`
`260`	`260`	`else if (message.Role == AgentRole.User)`
`261`	`261`	`{`