[Bugfix][Frontend] Build tool-call grammars from the tools the prompt renders (#59879)

Signed-off-by: Rongjie Jiang <j1870831863@outlook.com>
Signed-off-by: sfeng33 <4florafeng@gmail.com>
Co-authored-by: Flora Feng <4florafeng@gmail.com>
This commit is contained in:
RomeJay
2026-10-05 22:01:03 +00:00
committed by GitHub
co-authored by Flora Feng
parent 3fb1cd796b
commit 2e06395fd3
6 changed files with 247 additions and 43 deletions
@@ -13,6 +13,7 @@ from vllm.entrypoints.openai.chat_completion.protocol import (
ChatCompletionNamedToolChoiceParam,
ChatCompletionToolsParam,
)
from vllm.exceptions import VLLMValidationError
from vllm.tool_parsers.streaming import extract_required_tool_call_streaming
from vllm.tool_parsers.utils import (
find_tool_properties,
@@ -403,6 +404,11 @@ class TestNonFunctionToolsSkipped:
assert len(any_of) == 1
assert any_of[0]["properties"]["name"]["enum"] == ["get_weather"]
def test_get_json_schema_rejects_only_non_function_tools(self):
# An empty anyOf would compile to a grammar no output can satisfy.
with pytest.raises(VLLMValidationError, match="no function tool"):
get_json_schema_from_tools(tools=[WEB_SEARCH_TOOL], tool_choice="required")
class TestParallelToolCallsConstraint:
"""`parallel_tool_calls=false` must be enforced by the decoding grammar.