squall/vllm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Bugfix] Internal Server Error when tool_choice is incorrect. (#10567)

Browse Source 
Signed-off-by: Varun Shenoy <varun.vinayak.shenoy@oracle.com>
This commit is contained in:
Varun Vinayak Shenoy 2024-11-22 21:13:29 -08:00 committed by GitHub
parent 4aba6e3d1a
commit 7d8ffb344f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/entrypoints/openai/test_chat.py
View File

@ -829,6 +829,20 @@ async def test_inconsistent_tool_choice_and_tools(client: openai.AsyncOpenAI,
"name": "nondefined_function_name" "name": "nondefined_function_name"
} }
}) })
with pytest.raises(openai.BadRequestError):
await client.chat.completions.create(
model=MODEL_NAME,
messages=messages,
max_completion_tokens=1000,
tools=[{
"type": "function",
"function": {
"name": "dummy_function_name",
"description": "This is a dummy function",
"parameters": sample_json_schema
}
}],
tool_choice={})
@pytest.mark.asyncio @pytest.mark.asyncio

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

@ -478,17 +478,17 @@ class ChatCompletionRequest(OpenAIBaseModel):
# it matches a valid tool # it matches a valid tool
if isinstance(data["tool_choice"], dict): if isinstance(data["tool_choice"], dict):
valid_tool = False valid_tool = False
specified_function = data["tool_choice"]["function"] specified_function = data["tool_choice"].get("function")
if not specified_function: if not specified_function:
raise ValueError( raise ValueError(
"Incorrectly formatted `tool_choice`. Should be like " "Expected field `function` in `tool_choice`."
"`{\"type\": \"function\"," " Correct usage: `{\"type\": \"function\","
" \"function\": {\"name\": \"my_function\"}}`") " \"function\": {\"name\": \"my_function\"}}`")
specified_function_name = specified_function["name"] specified_function_name = specified_function.get("name")
if not specified_function_name: if not specified_function_name:
raise ValueError( raise ValueError(
"Incorrectly formatted `tool_choice`. Should be like " "Expected field `name` in `function` in `tool_choice`."
"`{\"type\": \"function\", " "Correct usage: `{\"type\": \"function\", "
"\"function\": {\"name\": \"my_function\"}}`") "\"function\": {\"name\": \"my_function\"}}`")
for tool in data["tools"]: for tool in data["tools"]:
if tool["function"]["name"] == specified_function_name: if tool["function"]["name"] == specified_function_name: