[Bugfix][Structured Output] Preserve reasoning adapters for shared parser engines (#52830)

Signed-off-by: sfeng33 <4florafeng@gmail.com>
This commit is contained in:
Flora Feng
2026-08-26 00:37:36 -04:00
committed by GitHub
parent 044b05220e
commit 46638857fd
2 changed files with 27 additions and 49 deletions
+25 -19
View File
@@ -893,7 +893,7 @@ class _CombinedDelegating(DelegatingParser):
tool_parser_cls = _CombinedToolAdapter
def test_parser_manager_uses_shared_engine_directly(monkeypatch):
def test_parser_manager_preserves_shared_engine_adapters(monkeypatch):
monkeypatch.setattr(
ParserManager,
"get_reasoning_parser",
@@ -912,17 +912,38 @@ def test_parser_manager_uses_shared_engine_directly(monkeypatch):
)
assert parser_cls is not None
assert parser_cls is _CombinedTestEngine
assert issubclass(parser_cls, DelegatingParser)
parser = parser_cls(make_mock_tokenizer(_VOCAB))
assert parser.reasoning_parser is not None
assert parser.tool_parser is not None
assert parser.reasoning_parser._parser_engine_cls is _CombinedTestEngine
assert parser.tool_parser._parser_engine_cls is _CombinedTestEngine
request = _make_delegating_request()
token_ids = [ord("a"), ord("b"), 201, ord("c")]
reasoning, content, _ = parser.parse(
"ab</think>c",
request,
model_output_token_ids=[ord("a"), ord("b"), 201, ord("c")],
model_output_token_ids=token_ids,
)
assert reasoning == "ab"
assert content == "c"
assert parser.count_reasoning_tokens([]) == 2
assert parser.count_reasoning_tokens(token_ids) == 2
def test_parser_manager_preserves_shared_engine_reasoning_wiring():
parser_cls = ParserManager.get_parser(
tool_parser_name="qwen3_xml",
reasoning_parser_name="qwen3",
enable_auto_tools=True,
)
assert parser_cls is not None
parser = parser_cls(
make_mock_tokenizer(_VOCAB),
chat_template_kwargs={"enable_thinking": False},
)
assert parser.reasoning_parser is not None
assert parser.reasoning_parser._parser_engine.thinking_enabled is False
def test_parser_manager_preserves_reasoning_only_adapter(monkeypatch):
@@ -983,21 +1004,6 @@ def test_parser_manager_preserves_tool_only_adapter(monkeypatch):
assert tool_calls == []
def test_parser_manager_rejects_non_engine_adapter_metadata():
class TraditionalParser:
pass
class InvalidEngineAdapter:
_parser_engine_cls = TraditionalParser
assert ParserManager._get_parser_engine_cls(TraditionalParser) is None
assert ParserManager._get_parser_engine_cls(InvalidEngineAdapter) is None
assert (
ParserManager._get_parser_engine_cls(_CombinedReasoningAdapter)
is _CombinedTestEngine
)
def test_reasoning_adapter_counts_after_final_non_streaming_parse():
parser = _CombinedReasoningAdapter(make_mock_tokenizer(_VOCAB))
request = _make_delegating_request()
+2 -30
View File
@@ -9,7 +9,6 @@ from vllm.logger import init_logger
if TYPE_CHECKING:
from vllm.parser.abstract_parser import Parser
from vllm.parser.engine.parser_engine import ParserEngine
from vllm.reasoning import ReasoningParser
from vllm.tool_parsers import ToolParser
@@ -18,30 +17,9 @@ logger = init_logger(__name__)
class ParserManager:
"""
Provides a unified Parser from the reasoning and tool parser registries.
Parser engine adapters backed by the same engine are collapsed back into
that engine. Other parser pairs are composed through ``DelegatingParser``.
Provides a unified Parser by composing reasoning and tool parser adapters.
"""
@staticmethod
def _get_parser_engine_cls(
parser_cls: type[object] | None,
) -> type[ParserEngine] | None:
if parser_cls is None:
return None
parser_engine_cls = getattr(parser_cls, "_parser_engine_cls", None)
if parser_engine_cls is None:
return None
from vllm.parser.engine.parser_engine import ParserEngine
if not isinstance(parser_engine_cls, type) or not issubclass(
parser_engine_cls, ParserEngine
):
return None
return parser_engine_cls
@classmethod
def get_tool_parser(
cls,
@@ -105,8 +83,7 @@ class ParserManager:
"""
Get a Parser that handles both reasoning and tool parsing.
Reuses a shared parser engine when possible, otherwise composes the
individual parsers into a ``DelegatingParser`` subclass.
Composes the individual parsers into a ``DelegatingParser`` subclass.
Args:
tool_parser_name: The name of the tool parser.
@@ -137,11 +114,6 @@ class ParserManager:
HarmonyParser.tool_parser_cls = tool_parser_cls
return HarmonyParser
reasoning_engine_cls = cls._get_parser_engine_cls(reasoning_parser_cls)
tool_engine_cls = cls._get_parser_engine_cls(tool_parser_cls)
if reasoning_engine_cls is not None and reasoning_engine_cls is tool_engine_cls:
return reasoning_engine_cls
if reasoning_parser_name == "kimi_k3" or tool_parser_name == "kimi_k3":
from vllm.parser.kimi_k3 import KimiK3Parser