xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2025-12-14 19:25:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] ensure tool_choice is popped when tool_choice:null is passed in json payload (#19679)

Browse Source 
Signed-off-by: Guillaume Calmettes <gcalmettes@scaleway.com>
This commit is contained in:
Guillaume Calmettes 2025-07-23 09:30:05 +02:00 committed by GitHub
parent 2f5c14de6a
commit 7aaa2bd5a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vllm/entrypoints/openai/protocol.py
View File

@ -841,7 +841,7 @@ class ChatCompletionRequest(OpenAIBaseModel):
return data return data
# if "tool_choice" is specified -- validation # if "tool_choice" is specified -- validation
if "tool_choice" in data: if "tool_choice" in data and data["tool_choice"] is not None:
# ensure that if "tool choice" is specified, tools are present # ensure that if "tool choice" is specified, tools are present
if "tools" not in data or data["tools"] is None: if "tools" not in data or data["tools"] is None:
@ -853,7 +853,7 @@ class ChatCompletionRequest(OpenAIBaseModel):
if data["tool_choice"] not in [ if data["tool_choice"] not in [
"auto", "required" "auto", "required"
] and not isinstance(data["tool_choice"], dict): ] and not isinstance(data["tool_choice"], dict):
raise NotImplementedError( raise ValueError(
f'Invalid value for `tool_choice`: {data["tool_choice"]}! '\ f'Invalid value for `tool_choice`: {data["tool_choice"]}! '\
'Only named tools, "none", "auto" or "required" '\ 'Only named tools, "none", "auto" or "required" '\
'are supported.' 'are supported.'