Skip to content

fix: handle tool_calls correctly in streaming mode for OpenAI provider #6354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LovieCode wants to merge 3 commits into from
Closed

fix: handle tool_calls correctly in streaming mode for OpenAI provider #6354

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc7b934
fix: handle tool_calls correctly in streaming mode for OpenAI provider
LovieCode Mar 15, 2026
8dab4b2
refactor: simplify tool call matching condition
LovieCode Mar 15, 2026
48400e1
Merge branch 'master' into fix/streaming-tool-call
LovieCode Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions astrbot/core/provider/sources/openai_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ async def _query_stream(
state.handle_chunk(chunk)
except Exception as e:
logger.warning("Saving chunk state error: " + str(e))

if len(chunk.choices) == 0:
continue
delta = chunk.choices[0].delta
Expand Down Expand Up @@ -507,23 +508,30 @@ async def _parse_openai_completion(
# Should be unreachable
raise Exception("工具集未提供")
for tool in tools.func_list:
# Fix: Both ParsedFunctionToolCall(type=None) and ChatCompletionMessageFunctionToolCall(type='function')
# can be returned by get_final_completion(). Check function.name instead of type.
tool_func = getattr(tool_call, "function", None)
tool_call_id = getattr(tool_call, "id", None)
if (
tool_call.type == "function"
and tool.name == tool_call.function.name
tool_func is not None
and hasattr(tool_func, "name")
and tool.name == tool_func.name
):
Comment thread
LovieCode marked this conversation as resolved.
Outdated
tool_func_args = getattr(tool_func, "arguments", None)
# workaround for #1454
if isinstance(tool_call.function.arguments, str):
args = json.loads(tool_call.function.arguments)
if isinstance(tool_func_args, str):
args = json.loads(tool_func_args)
else:
args = tool_call.function.arguments
args = tool_func_args
args_ls.append(args)
func_name_ls.append(tool_call.function.name)
tool_call_ids.append(tool_call.id)
func_name_ls.append(tool_func.name)
if tool_call_id is not None:
tool_call_ids.append(tool_call_id)

# gemini-2.5 / gemini-3 series extra_content handling
extra_content = getattr(tool_call, "extra_content", None)
if extra_content is not None:
tool_call_extra_content_dict[tool_call.id] = extra_content
if extra_content is not None and tool_call_id is not None:
tool_call_extra_content_dict[tool_call_id] = extra_content
llm_response.role = "tool"
llm_response.tools_call_args = args_ls
llm_response.tools_call_name = func_name_ls
Expand Down