From c6e19b3be24338759a443e03c8325d76da9ee202 Mon Sep 17 00:00:00 2001 From: Chauncey Date: Fri, 21 Aug 2026 10:01:06 +0800 Subject: [PATCH] [Bugfix][Structured Output] Avoid spurious FSM errors after speculative reasoning end (#53046) Signed-off-by: chaunceyjiang --- tests/v1/spec_decode/test_mtp_structured_output.py | 3 ++- vllm/v1/structured_output/__init__.py | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/v1/spec_decode/test_mtp_structured_output.py b/tests/v1/spec_decode/test_mtp_structured_output.py index 8bd599733a..1fce9037d4 100644 --- a/tests/v1/spec_decode/test_mtp_structured_output.py +++ b/tests/v1/spec_decode/test_mtp_structured_output.py @@ -189,7 +189,7 @@ def test_bitmask_constrained_when_reasoning_ends_midwindow(backend): @pytest.mark.parametrize("backend", ["xgrammar", "guidance"]) -def test_bitmask_post_reasoning_end_drafts_skip_grammar_advance(backend): +def test_bitmask_post_reasoning_end_drafts_skip_grammar_advance(backend, caplog): """Post-marker drafts predate the bitmask and may be grammar-invalid; grammar_bitmask must skip the grammar advance instead of asserting. """ @@ -235,6 +235,7 @@ def test_bitmask_post_reasoning_end_drafts_skip_grammar_advance(backend): assert not (bitmask[2] == -1).all() # Grammar must not have advanced through the unvalidated draft. assert not grammar.is_terminated() + assert "Failed to advance FSM" not in caplog.text @pytest.mark.parametrize("backend", ["xgrammar", "guidance"]) diff --git a/vllm/v1/structured_output/__init__.py b/vllm/v1/structured_output/__init__.py index 2fe1399d4d..d0ec080d84 100644 --- a/vllm/v1/structured_output/__init__.py +++ b/vllm/v1/structured_output/__init__.py @@ -326,7 +326,12 @@ class StructuredOutputManager: advance_grammar = False post_reasoning_end_in_window = True if advance_grammar and not grammar.is_terminated(): - accepted = grammar.accept_tokens(req_id, [token]) + if post_reasoning_end_in_window: + accepted = bool(grammar.validate_tokens([token])) + if accepted: + accepted = grammar.accept_tokens(req_id, [token]) + else: + accepted = grammar.accept_tokens(req_id, [token]) if accepted: state_advancements += 1 elif not post_reasoning_end_in_window: