[BugFix][Core] Make the structured-output grammar poll non-blocking (#55931)

Signed-off-by: ubwzwd <ubwzwd@gmail.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Artem Perevedentsev <aperevedents@nvidia.com>
This commit is contained in:
ubwzwd
2026-09-22 14:39:47 +03:00
committed by GitHub
co-authored by Claude Fable 5.1 Artem Perevedentsev
parent 81d7293c21
commit 9815732c16
2 changed files with 33 additions and 5 deletions
@@ -0,0 +1,30 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
"""Unit tests for StructuredOutputRequest grammar-future polling."""
from concurrent.futures import Future
from vllm.sampling_params import StructuredOutputsParams
from vllm.v1.structured_output.request import StructuredOutputRequest
def _request_with_future(fut: Future) -> StructuredOutputRequest:
req = StructuredOutputRequest(params=StructuredOutputsParams(regex="a+"))
req.grammar = fut
return req
def test_pending_grammar_future_is_not_ready():
req = _request_with_future(Future())
assert not req.is_grammar_ready
assert req.grammar is None
def test_grammar_compile_raising_timeout_error_is_a_failure():
"""A compile that raised TimeoutError must be treated as a failed compile,
not as still-compiling (#53130)."""
fut: Future = Future()
fut.set_exception(TimeoutError("compiler timed out"))
req = _request_with_future(fut)
assert req.is_grammar_ready
assert isinstance(req.grammar, TimeoutError)
+3 -5
View File
@@ -4,7 +4,6 @@ import dataclasses
import functools
import json
from concurrent.futures import Future
from concurrent.futures._base import TimeoutError
from typing import TYPE_CHECKING, Any, cast
from vllm.sampling_params import SamplingParams, StructuredOutputsParams
@@ -43,11 +42,10 @@ class StructuredOutputRequest:
def _check_grammar_completion(self) -> bool:
if isinstance(self._grammar, Future):
try:
# We will check whether the future is ready within 100 us
self._grammar = self._grammar.result(timeout=0.0001)
except TimeoutError:
if not self._grammar.done():
return False
try:
self._grammar = self._grammar.result()
except Exception as e:
self._grammar = e
return True