biondizzle/vllm
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[MISC] fixed tool_parser mypy errors (#35640)

Browse Source 
Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Taneem Ibrahim
2026-03-04 06:23:12 -06:00
committed by GitHub
parent 1659b2e058
commit 1aaec59d79
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/pre_commit/mypy.py
View File

@@ -42,7 +42,6 @@ EXCLUDE = [
"vllm/benchmarks", "vllm/benchmarks",
"vllm/config", "vllm/config",
"vllm/reasoning", "vllm/reasoning",
"vllm/tool_parser",
] ]

2
vllm/tool_parsers/functiongemma_tool_parser.py
View File

@@ -72,7 +72,7 @@ class FunctionGemmaToolParser(ToolParser):
def _parse_arguments(self, args_str: str) -> dict: def _parse_arguments(self, args_str: str) -> dict:
"""Parse FunctionGemma argument string into a dictionary.""" """Parse FunctionGemma argument string into a dictionary."""
arguments = {} arguments: dict = {}
if not args_str: if not args_str:
return arguments return arguments

15
vllm/tool_parsers/glm4_moe_tool_parser.py
View File

@@ -355,12 +355,9 @@ class Glm4MoeModelToolParser(ToolParser):
self._buffer = self._buffer[val_end + len(self.arg_val_end) :] self._buffer = self._buffer[val_end + len(self.arg_val_end) :]
self._pending_key = None self._pending_key = None
frag = self._append_arg_fragment( frag_or_none = self._append_arg_fragment(key=key, raw_val=raw_val)
key=key, if frag_or_none:
raw_val=raw_val, return self._emit_tool_args_delta(frag_or_none)
)
if frag:
return self._emit_tool_args_delta(frag)
continue continue
# Parse next arg or close # Parse next arg or close
@@ -368,7 +365,7 @@ class Glm4MoeModelToolParser(ToolParser):
key_pos = self._buffer.find(self.arg_key_start) key_pos = self._buffer.find(self.arg_key_start)
if end_pos != -1 and (key_pos == -1 or end_pos < key_pos): 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) :] 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 # Finalize prev_tool_call_arr with complete parsed arguments
if self._current_tool_name: if self._current_tool_name:
try: try:
@@ -387,7 +384,9 @@ class Glm4MoeModelToolParser(ToolParser):
e, e,
) )
self._finish_tool_call() 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: if key_pos == -1:
return None return None

6
vllm/tool_parsers/step3p5_tool_parser.py
View File

@@ -23,10 +23,7 @@ from vllm.entrypoints.openai.engine.protocol import (
) )
from vllm.logger import init_logger from vllm.logger import init_logger
from vllm.tokenizers import TokenizerLike from vllm.tokenizers import TokenizerLike
from vllm.tool_parsers.abstract_tool_parser import ( from vllm.tool_parsers.abstract_tool_parser import ToolParser
ToolParser,
ToolParserManager,
)
logger = init_logger(__name__) logger = init_logger(__name__)
@@ -1367,7 +1364,6 @@ class StreamingXMLToolCallParser:
self.deferred_param_raw_value = "" self.deferred_param_raw_value = ""
@ToolParserManager.register_module("step3p5")
class Step3p5ToolParser(ToolParser): class Step3p5ToolParser(ToolParser):
def __init__(self, tokenizer: TokenizerLike): def __init__(self, tokenizer: TokenizerLike):
super().__init__(tokenizer) super().__init__(tokenizer)