Merge pull request #1349 from iceljc/master

refine tool choice

Author: iceljc

src/Infrastructure/BotSharp.Core/Routing/Reasoning/OneStepForwardReasoner.cs

@@ -121,15 +121,15 @@ private async Task<RoleDialogModel> GetChatCompletionsWithScopedState(
         string stateValue)
     {
         var states = _services.GetRequiredService<IConversationStateService>();
-        states.SetState(stateKey, stateValue, source: StateSource.Application);
+        states.SetState(stateKey, stateValue, source: StateSource.Application, isNeedVersion: false);
 
         try
         {
             return await completion.GetChatCompletions(agent, dialogs);
         }
         finally
         {
-            states.RemoveState(stateKey);
+            states.SetState(stateKey, string.Empty, source: StateSource.Application, isNeedVersion: false);
         }
     }
 

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.Chat.cs

@@ -2,6 +2,7 @@
 using BotSharp.Abstraction.MessageHub.Models;
 using BotSharp.Core.Infrastructures.Streams;
 using BotSharp.Core.MessageHub;
+using Microsoft.Extensions.Options;
 using OpenAI.Chat;
 using System.Net.Http;
 
@@ -405,11 +406,7 @@ private async Task<RoleDialogModel> InnerGetChatCompletionsStreamingAsync(Agent
             }
         }
 
-        // Apply tool_choice only when tools are present; tool_choice is rejected by the API otherwise.
-        if (!options.Tools.IsNullOrEmpty() && _state.GetState("tool_choice") == "required")
-        {
-            options.ToolChoice = ChatToolChoice.CreateRequiredChoice();
-        }
+        AddChatToolChoice(options);
 
         if (!string.IsNullOrEmpty(agent.Knowledges))
         {
@@ -706,5 +703,19 @@ private ChatImageDetailLevel ParseChatImageDetailLevel(string? level)
 
         return imageLevel;
     }
+
+    private void AddChatToolChoice(ChatCompletionOptions options)
+    {
+        if (options.Tools.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        // Apply tool_choice only when tools are present; tool_choice is rejected by the API otherwise.
+        if (_state.GetState("tool_choice").IsEqualTo("required"))
+        {
+            options.ToolChoice = ChatToolChoice.CreateRequiredChoice();
+        }
+    }
     #endregion
 }

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.Response.cs

@@ -2,6 +2,7 @@
 using BotSharp.Abstraction.MessageHub.Models;
 using BotSharp.Core.Infrastructures.Streams;
 using BotSharp.Core.MessageHub;
+using OpenAI.Chat;
 using OpenAI.Responses;
 
 namespace BotSharp.Plugin.OpenAI.Providers.Chat;
@@ -471,6 +472,7 @@ private async Task<RoleDialogModel> InnerCreateResponseStreamingAsync(Agent agen
         }
 
         AddBuiltInTools(options.Tools, settings);
+        AddResponseToolChoice(options);
 
         if (!string.IsNullOrEmpty(agent.Knowledges))
         {
@@ -751,5 +753,19 @@ private void AddBuiltInTools(IList<ResponseTool> tools, LlmModelSetting? modelSe
         return null;
     }
     #endregion
+
+    private void AddResponseToolChoice(CreateResponseOptions options)
+    {
+        if (options.Tools.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        // Apply tool_choice only when tools are present; tool_choice is rejected by the API otherwise.
+        if (_state.GetState("tool_choice").IsEqualTo("required"))
+        {
+            options.ToolChoice = ResponseToolChoice.CreateRequiredChoice();
+        }
+    }
     #endregion
 }