[Refactor] Remove dead code from parser infrastructure

tests/parser/test_streaming.py

@@ -7,7 +7,7 @@
 
 from vllm.entrypoints.openai.chat_completion.protocol import ChatCompletionRequest
 from vllm.entrypoints.openai.engine.protocol import DeltaMessage
-from vllm.parser.abstract_parser import _WrappedParser
+from vllm.parser.abstract_parser import DelegatingParser
 from vllm.reasoning.basic_parsers import BaseThinkingReasoningParser
 from vllm.tool_parsers.hermes_tool_parser import Hermes2ProToolParser
 
@@ -45,9 +45,11 @@ def request_obj():
 
 
 def make_parser(tokenizer, reasoning=False, tool=False):
-    _WrappedParser.reasoning_parser_cls = ThinkReasoningParser if reasoning else None
-    _WrappedParser.tool_parser_cls = Hermes2ProToolParser if tool else None
-    return _WrappedParser(tokenizer)
+    class TestParser(DelegatingParser):
+        reasoning_parser_cls = ThinkReasoningParser if reasoning else None
+        tool_parser_cls = Hermes2ProToolParser if tool else None
+
+    return TestParser(tokenizer)
 
 
 def stream_text(parser, tokenizer, text, request, prompt_token_ids=None):

vllm/parser/__init__.py

@@ -4,29 +4,11 @@
 from vllm.parser.abstract_parser import (
     DelegatingParser,
     Parser,
-    _WrappedParser,
 )
 from vllm.parser.parser_manager import ParserManager
 
 __all__ = [
     "Parser",
     "DelegatingParser",
     "ParserManager",
-    "_WrappedParser",
 ]
-
-_PARSERS_TO_REGISTER = {
-    "minimax_m2": (  # name
-        "minimax_m2_parser",  # filename
-        "MiniMaxM2Parser",  # class_name
-    ),
-}
-
-
-def register_lazy_parsers():
-    for name, (file_name, class_name) in _PARSERS_TO_REGISTER.items():
-        module_path = f"vllm.parser.{file_name}"
-        ParserManager.register_lazy_module(name, module_path, class_name)
-
-
-register_lazy_parsers()

vllm/parser/abstract_parser.py

@@ -37,12 +37,11 @@
 from vllm.logger import init_logger
 from vllm.reasoning.abs_reasoning_parsers import ReasoningParser
 from vllm.tokenizers import TokenizerLike
-from vllm.tool_parsers.abstract_tool_parser import ToolParser
+from vllm.tool_parsers.abstract_tool_parser import Tool, ToolParser
 from vllm.tool_parsers.streaming import (
     extract_named_tool_call_streaming,
     extract_required_tool_call_streaming,
 )
-from vllm.tool_parsers.utils import Tool
 from vllm.utils import random_uuid
 
 logger = init_logger(__name__)
@@ -90,19 +89,25 @@ class Parser:
     reasoning_parser_cls: type[ReasoningParser] | None = None
     tool_parser_cls: type[ToolParser] | None = None
 
-    def __init__(self, tokenizer: TokenizerLike, *args, **kwargs):
-        """
-        Initialize the Parser.
-
-        Args:
-            tokenizer: The tokenizer used by the model. This is required for
-                token-based parsing operations.
-        """
+    def __init__(
+        self,
+        tokenizer: TokenizerLike,
+        tools: list[Tool] | None = None,
+        *args,
+        **kwargs,
+    ):
         self.model_tokenizer = tokenizer
         self._reasoning_parser: ReasoningParser | None = None
         self._tool_parser: ToolParser | None = None
         self._stream_state = StreamState()
 
+        if self.__class__.reasoning_parser_cls is not None:
+            self._reasoning_parser = self.__class__.reasoning_parser_cls(
+                tokenizer, *args, **kwargs
+            )
+        if self.__class__.tool_parser_cls is not None:
+            self._tool_parser = self.__class__.tool_parser_cls(tokenizer, tools)
+
     @cached_property
     def vocab(self) -> dict[str, int]:
         """Get the vocabulary mapping from tokens to IDs."""
@@ -767,34 +772,3 @@ def parse_delta(
             self._append_unstreamed_tool_args(delta_message)
 
         return delta_message
-
-
-class _WrappedParser(DelegatingParser):
-    """
-    A DelegatingParser subclass that instantiates parsers from class attributes.
-
-    This class is used to dynamically create a parser that wraps individual
-    ReasoningParser and ToolParser classes. The class attributes
-    `reasoning_parser_cls` and `tool_parser_cls` should be set before
-    instantiation.
-
-    Usage:
-        _WrappedParser.reasoning_parser_cls = MyReasoningParser
-        _WrappedParser.tool_parser_cls = MyToolParser
-        parser = _WrappedParser(tokenizer)
-    """
-
-    reasoning_parser_cls: type[ReasoningParser] | None = None
-    tool_parser_cls: type[ToolParser] | None = None
-
-    def __init__(
-        self, tokenizer: TokenizerLike, tools: list[Tool] | None = None, **kwargs
-    ):
-        super().__init__(tokenizer)
-        # Instantiate the underlying parsers from class attributes
-        if self.__class__.reasoning_parser_cls is not None:
-            self._reasoning_parser = self.__class__.reasoning_parser_cls(
-                tokenizer, **kwargs
-            )
-        if self.__class__.tool_parser_cls is not None:
-            self._tool_parser = self.__class__.tool_parser_cls(tokenizer, tools)