Skip to content
1 change: 0 additions & 1 deletion tools/pre_commit/mypy.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"vllm/benchmarks",
"vllm/config",
"vllm/reasoning",
"vllm/tool_parser",
]


Expand Down
2 changes: 1 addition & 1 deletion vllm/tool_parsers/functiongemma_tool_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def __init__(self, tokenizer: TokenizerLike):

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

Expand Down
15 changes: 7 additions & 8 deletions vllm/tool_parsers/glm4_moe_tool_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,20 +355,17 @@ def extract_tool_calls_streaming(
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
end_pos = self._buffer.find(self.tool_call_end_token)
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:
Expand All @@ -387,7 +384,9 @@ def extract_tool_calls_streaming(
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
Expand Down
6 changes: 1 addition & 5 deletions vllm/tool_parsers/step3p5_tool_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
)
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__)

Expand Down Expand Up @@ -1367,7 +1364,6 @@ def _reset_xml_parser_after_tool_call(self):
self.deferred_param_raw_value = ""


@ToolParserManager.register_module("step3p5")
class Step3p5ToolParser(ToolParser):
def __init__(self, tokenizer: TokenizerLike):
super().__init__(tokenizer)
Expand Down