From 1aaec59d79b8b61c515027320e276d617c4df746 Mon Sep 17 00:00:00 2001 From: Taneem Ibrahim Date: Wed, 4 Mar 2026 06:23:12 -0600 Subject: [PATCH] [MISC] fixed tool_parser mypy errors (#35640) Signed-off-by: Taneem Ibrahim Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> --- tools/pre_commit/mypy.py | 1 - vllm/tool_parsers/functiongemma_tool_parser.py | 2 +- vllm/tool_parsers/glm4_moe_tool_parser.py | 15 +++++++-------- vllm/tool_parsers/step3p5_tool_parser.py | 6 +----- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tools/pre_commit/mypy.py b/tools/pre_commit/mypy.py index 7d4b373055..717d9cf539 100755 --- a/tools/pre_commit/mypy.py +++ b/tools/pre_commit/mypy.py @@ -42,7 +42,6 @@ EXCLUDE = [ "vllm/benchmarks", "vllm/config", "vllm/reasoning", - "vllm/tool_parser", ] diff --git a/vllm/tool_parsers/functiongemma_tool_parser.py b/vllm/tool_parsers/functiongemma_tool_parser.py index 22fa8d981f..599019b1b2 100644 --- a/vllm/tool_parsers/functiongemma_tool_parser.py +++ b/vllm/tool_parsers/functiongemma_tool_parser.py @@ -72,7 +72,7 @@ class FunctionGemmaToolParser(ToolParser): def _parse_arguments(self, args_str: str) -> dict: """Parse FunctionGemma argument string into a dictionary.""" - arguments = {} + arguments: dict = {} if not args_str: return arguments diff --git a/vllm/tool_parsers/glm4_moe_tool_parser.py b/vllm/tool_parsers/glm4_moe_tool_parser.py index a07cdbff91..d6942e854c 100644 --- a/vllm/tool_parsers/glm4_moe_tool_parser.py +++ b/vllm/tool_parsers/glm4_moe_tool_parser.py @@ -355,12 +355,9 @@ class Glm4MoeModelToolParser(ToolParser): self._buffer = self._buffer[val_end + len(self.arg_val_end) :] self._pending_key = None - frag = self._append_arg_fragment( - key=key, - raw_val=raw_val, - ) - if frag: - return self._emit_tool_args_delta(frag) + frag_or_none = self._append_arg_fragment(key=key, raw_val=raw_val) + if frag_or_none: + return self._emit_tool_args_delta(frag_or_none) continue # Parse next arg or close @@ -368,7 +365,7 @@ class Glm4MoeModelToolParser(ToolParser): key_pos = self._buffer.find(self.arg_key_start) if end_pos != -1 and (key_pos == -1 or end_pos < key_pos): self._buffer = self._buffer[end_pos + len(self.tool_call_end_token) :] - frag = self._close_args_if_needed() + frag_or_none = self._close_args_if_needed() # Finalize prev_tool_call_arr with complete parsed arguments if self._current_tool_name: try: @@ -387,7 +384,9 @@ class Glm4MoeModelToolParser(ToolParser): e, ) self._finish_tool_call() - return self._emit_tool_args_delta(frag) if frag else None + return ( + self._emit_tool_args_delta(frag_or_none) if frag_or_none else None + ) if key_pos == -1: return None diff --git a/vllm/tool_parsers/step3p5_tool_parser.py b/vllm/tool_parsers/step3p5_tool_parser.py index e52c0a706d..34394b9142 100644 --- a/vllm/tool_parsers/step3p5_tool_parser.py +++ b/vllm/tool_parsers/step3p5_tool_parser.py @@ -23,10 +23,7 @@ from vllm.entrypoints.openai.engine.protocol import ( ) from vllm.logger import init_logger from vllm.tokenizers import TokenizerLike -from vllm.tool_parsers.abstract_tool_parser import ( - ToolParser, - ToolParserManager, -) +from vllm.tool_parsers.abstract_tool_parser import ToolParser logger = init_logger(__name__) @@ -1367,7 +1364,6 @@ class StreamingXMLToolCallParser: self.deferred_param_raw_value = "" -@ToolParserManager.register_module("step3p5") class Step3p5ToolParser(ToolParser): def __init__(self, tokenizer: TokenizerLike): super().__init__(tokenizer)