Support non-auto tool_choice

Non-auto tool choices will result in a finish_reason of "stop" rather than "tool_calls". The current code assumes "stop" means there are no tool calls to be made when this isn't true. Instead, it should simply check for any available tool calls.

Author: Nick-Source

mcp_bridge/openai_clients/chatCompletion.py

@@ -50,7 +50,7 @@ async def chat_completions(
         request.messages.append(msg)
 
         logger.debug(f"finish reason: {response.choices[0].finish_reason}")
-        if response.choices[0].finish_reason.value in ["stop", "length"]:
+        if response.choices[0].finish_reason == "length" or not response.choices[0].message.tool_calls:
             logger.debug("no tool calls found")
             return response
 

mcp_bridge/openai_clients/streamChatCompletion.py

@@ -54,6 +54,7 @@ async def chat_completions(request: CreateChatCompletionRequest, http_request: R
 
         last: Optional[CreateChatCompletionStreamResponse] = None  # last message
 
+        tool_call: bool = False
         tool_call_name: str = ""
         tool_call_json: str = ""
         should_forward: bool = True
@@ -125,8 +126,10 @@ async def chat_completions(request: CreateChatCompletionRequest, http_request: R
 
                     # this manages the incoming tool call schema
                     # most of this is assertions to please mypy
-                    if len(parsed_data.choices) > 0 and parsed_data.choices[0].delta.tool_calls is not None:
+                    if len(parsed_data.choices) > 0 and parsed_data.choices[0].delta.tool_calls:
                         should_forward = False
+                        tool_call = True
+
                         assert (
                             parsed_data.choices[0].delta.tool_calls[0].function is not None
                         )
@@ -154,14 +157,15 @@ async def chat_completions(request: CreateChatCompletionRequest, http_request: R
 
         # ideally we should check this properly
         assert last is not None
-        if len(last.choices) > 0:
-            assert last.choices[0].finish_reason is not None
 
-        if len(last.choices) > 0 and last.choices[0].finish_reason.value in ["stop", "length"]:
+        if last.choices[0].finish_reason == "length" or tool_call == False:
             logger.debug("no tool calls found")
             fully_done = True
             continue
 
+        # Tool call was found, therefore we aren't done yet
+        fully_done = False
+
         logger.debug("tool calls found")
         logger.debug(
             f"{tool_call_name=} {tool_call_json=}"