Skip to content

[BugFix] Fix tool call finish reason in streaming case #9209

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

Merged
merged 7 commits into from
Oct 12, 2024
+15 −11
Merged

[BugFix] Fix tool call finish reason in streaming case #9209

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b75e4f
Fix tool call finish reason in streaming case
maxdebayser Oct 9, 2024
70bc2b8
fix formatting
maxdebayser Oct 10, 2024
a4fcd58
Merge branch 'vllm-project:main' into tool_call_finish_reason
maxdebayser Oct 10, 2024
a2e141e
fix editing mistake
maxdebayser Oct 10, 2024
c08c599
make tool call finish reason consistent with OpenAI platform behavior
maxdebayser Oct 10, 2024
07e94c9
Merge branch 'vllm-project:main' into tool_call_finish_reason
maxdebayser Oct 11, 2024
f4992fc
Add comments and improve variable name
maxdebayser Oct 11, 2024
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
13 changes: 6 additions & 7 deletions vllm/entrypoints/openai/serving_chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,12 @@ async def chat_completion_stream_generator(
# any tokens that were generated but previously
# matched by partial json parsing
# only happens if we are NOT using guided decoding
tools_called = False
if tool_parser:
index = len(
tool_parser.prev_tool_call_arr) - 1 if len(
tool_parser.prev_tool_call_arr) > 0 else 0
tools_called = len(
tool_parser.prev_tool_call_arr) > 0
index = len(tool_parser.prev_tool_call_arr
) - 1 if tools_called else 0
else:
index = 0

Expand Down Expand Up @@ -576,9 +578,7 @@ async def chat_completion_stream_generator(
delta=delta_message,
logprobs=logprobs,
finish_reason=output.finish_reason
if not (tool_parser
and len(tool_parser.prev_tool_call_arr))
else "tool_calls",
if not tools_called else "tool_calls",
stop_reason=output.stop_reason)
chunk = ChatCompletionStreamResponse(
id=request_id,
Expand Down Expand Up @@ -703,7 +703,6 @@ async def chat_completion_full_generator(
name=request.tool_choice.function.name,
arguments=output.text))
])
tools_called = True

# if the request doesn't use tool choice
# OR specifies to not use a tool
Expand Down