From 9815732c16ca076c60b65fccd787167d6a9c5328 Mon Sep 17 00:00:00 2001 From: ubwzwd Date: Tue, 22 Sep 2026 19:39:47 +0800 Subject: [PATCH] [BugFix][Core] Make the structured-output grammar poll non-blocking (#55931) Signed-off-by: ubwzwd Co-authored-by: Claude Fable 5.1 Co-authored-by: Artem Perevedentsev --- tests/v1/structured_output/test_request.py | 30 ++++++++++++++++++++++ vllm/v1/structured_output/request.py | 8 +++--- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 tests/v1/structured_output/test_request.py diff --git a/tests/v1/structured_output/test_request.py b/tests/v1/structured_output/test_request.py new file mode 100644 index 0000000000..e3eb79a49b --- /dev/null +++ b/tests/v1/structured_output/test_request.py @@ -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) diff --git a/vllm/v1/structured_output/request.py b/vllm/v1/structured_output/request.py index dce0038782..cd044f5466 100644 --- a/vllm/v1/structured_output/request.py +++ b/vllm/v1/structured_output/request.py @@ -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