official tweax

Dockerfile

@@ -1,8 +1,7 @@
 #FROM vllm/vllm-openai:v0.19.0-cu130
-FROM vllm/vllm-openai:cu130-nightly-x86_64
-
-# Fix the broken ass nightly build that forgot to include pandas
-RUN pip install --no-cache-dir pandas
+#vllm says version 0.20.2rc1.dev9+g01d4d1ad3
+FROM vllm/vllm-openai:nightly
+#FROM vllm/vllm-openai:glm51-cu130
 
 # Install LMCache for KV cache offloading / sharing across nodes
 # Build with system CUDA 13.0 for Blackwell (B200)
@@ -15,21 +14,17 @@ RUN apt-get update && apt-get install -y git \
     libnvjitlink-dev-13-0 && \
     git clone https://github.com/biondizzle/LMCache.git /tmp/lmcache && \
     cd /tmp/lmcache && \
-    git checkout feat/redis-ttl && \
+    git checkout dream-build && \
     CUDA_HOME=/usr/local/cuda \
     TORCH_CUDA_ARCH_LIST="10.0" \
     pip install --no-cache-dir --no-build-isolation . && \
-    rm -rf /tmp/lmcache
+    rm -rf /tmp/lmcache && export CACHE_BUSTER=4
 
-# Copy over nemotron reasonong parser
-COPY ./super_v3_reasoning_parser.py /opt/super_v3_reasoning_parser.py
+# Make sure we have the latest up to date chat template
+COPY glm_5.1_chat_template.jinja /opt/chat_template.jinja
 
-# Copy over deepseek tool call parser with MTP fixes
-COPY deepseekv32_tool_parser.py /usr/local/lib/python3.12/dist-packages/vllm/tool_parsers/deepseekv32_tool_parser.py
+# GLM 5.1 LMCache config
+COPY lmcache-config-glm-51.yaml /opt/lmcache-config-glm-51.yaml
 
-# Copy over minimax tool call parser with kwargs fixes
-COPY minimax_tool_parser.py /usr/local/lib/python3.12/dist-packages/vllm/tool_parsers/minimax_tool_parser.py
-
-# Copy over minimax parsers with kwargs fixes
-COPY minimax_tool_parser.py /usr/local/lib/python3.12/dist-packages/vllm/tool_parsers/minimax_tool_parser.py
-COPY minimax_m2_parser.py /usr/local/lib/python3.12/dist-packages/vllm/parser/minimax_m2_parser.py
+# DEEPSEEK v4 LMCache config
+COPY lmcache-config-dsv4.yaml /opt/lmcache-config-dsv4.yaml

deepseekv32_tool_parser.py

@@ -1,616 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
-"""
-DeepSeek-V3.2 Tool Call Parser — re-parse-and-diff version.
-
-Adapted from the GLM-4 streaming fix to make the streaming path robust
-against multi-token deltas produced by MTP speculative decoding.
-
-Instead of maintaining incremental state that advances one token at a
-time, the streaming path re-parses the *entire* current_text on every
-call, finds all <｜DSML｜invoke> regions (complete and in-progress),
-builds a JSON arguments string for each, and diffs against what was
-previously sent.  This makes the parser agnostic to how many tokens
-arrive per step.
-
-Key changes vs. the upstream buffer-until-complete parser:
-  1. _extract_content() handles partial tag overlaps so content text
-     is never swallowed or duplicated when a tag boundary lands inside
-     a multi-token chunk.
-  2. _extract_invoke_regions() finds both complete and incomplete
-     invoke blocks, enabling streaming of partial arguments.
-  3. _build_args_json_so_far() constructs the JSON arguments string
-     incrementally from complete + partial <｜DSML｜parameter> tags.
-  4. _compute_args_diff() emits only the newly-added characters.
-
-Drop-in replacement: same class name, same interface.
-"""
-
-import json
-import uuid
-from collections.abc import Sequence
-from typing import Any
-
-import regex as re
-
-from vllm.entrypoints.openai.chat_completion.protocol import (
-    ChatCompletionRequest,
-)
-from vllm.entrypoints.openai.engine.protocol import (
-    DeltaFunctionCall,
-    DeltaMessage,
-    DeltaToolCall,
-    ExtractedToolCallInformation,
-    FunctionCall,
-    ToolCall,
-)
-from vllm.entrypoints.openai.responses.protocol import ResponsesRequest
-from vllm.logger import init_logger
-from vllm.tokenizers import TokenizerLike
-from vllm.tool_parsers.abstract_tool_parser import (
-    Tool,
-    ToolParser,
-)
-logger = init_logger(__name__)
-
-
-def partial_tag_overlap(text: str, tag: str) -> int:
-    """Length of the longest prefix of *tag* that matches a suffix of *text*.
-
-    E.g. text ending in ``"<tool_"`` returns 6 when tag is ``"<tool_call>"``.
-    Returns 0 when there is no overlap.
-    """
-    max_check = min(len(tag) - 1, len(text))
-    for k in range(max_check, 0, -1):
-        if text.endswith(tag[:k]):
-            return k
-    return 0
-
-
-class DeepSeekV32ToolParser(ToolParser):
-    """
-    Re-parse-and-diff tool parser for DeepSeek-V3.2 DSML format.
-
-    On every streaming call the parser re-parses ``current_text`` to
-    find ``<｜DSML｜invoke>`` regions, builds the JSON arguments string
-    for each tool call, and diffs against what was previously sent to
-    emit only new content.  This is robust against multi-token deltas
-    from MTP / EAGLE speculative decoding.
-
-    Example tool call format::
-
-        <｜DSML｜function_calls>
-        <｜DSML｜invoke name="get_weather">
-        <｜DSML｜parameter name="location" string="true">杭州</｜DSML｜parameter>
-        <｜DSML｜parameter name="date" string="true">2024-01-16</｜DSML｜parameter>
-        </｜DSML｜invoke>
-        </｜DSML｜function_calls>
-    """
-
-    def __init__(self, tokenizer: TokenizerLike, tools: list[Tool] | None = None):
-        super().__init__(tokenizer, tools)
-
-        # ----- Tag constants -----
-        self.tool_call_start_token: str = "<｜DSML｜function_calls>"
-        self.tool_call_end_token: str = "</｜DSML｜function_calls>"
-        self.invoke_end_token: str = "</｜DSML｜invoke>"
-        self.param_end_token: str = "</｜DSML｜parameter>"
-
-        # Alias expected by ToolParser base / adjust_request
-        self.tool_calls_start_token = self.tool_call_start_token
-
-        # ----- Compiled regexes -----
-        # Matches a complete <｜DSML｜function_calls>…</｜DSML｜function_calls>
-        self.tool_call_complete_regex = re.compile(
-            r"<｜DSML｜function_calls>(.*?)</｜DSML｜function_calls>", re.DOTALL
-        )
-        # Opening tag of an invoke block — captures the function name.
-        self.invoke_start_regex = re.compile(
-            r'<｜DSML｜invoke\s+name="([^"]+)"\s*>', re.DOTALL
-        )
-        # Complete invoke block.
-        self.invoke_complete_regex = re.compile(
-            r'<｜DSML｜invoke\s+name="([^"]+)"\s*>(.*?)</｜DSML｜invoke>',
-            re.DOTALL,
-        )
-        # Complete parameter tag — captures (name, string_attr, value).
-        self.parameter_complete_regex = re.compile(
-            r'<｜DSML｜parameter\s+name="([^"]+)"\s+string="(true|false)"\s*>'
-            r"(.*?)"
-            r"</｜DSML｜parameter>",
-            re.DOTALL,
-        )
-        # Just the opening header of a parameter tag (for partial params).
-        self.parameter_header_regex = re.compile(
-            r'<｜DSML｜parameter\s+name="([^"]+)"\s+string="(true|false)"\s*>',
-            re.DOTALL,
-        )
-
-        # ----- Streaming state (reset per request) -----
-        self._sent_content_idx: int = 0
-        self._tool_call_ids: list[str] = []
-        self.streamed_args_for_tool: list[str] = []
-        self.prev_tool_call_arr: list[dict[str, Any]] = []
-        self.current_tool_id: int = -1
-
-        if not self.model_tokenizer:
-            raise ValueError(
-                "The model tokenizer must be passed to the ToolParser "
-                "constructor during construction."
-            )
-
-        logger.debug(
-            "Successfully initialized %s", self.__class__.__name__
-        )
-
-    # ------------------------------------------------------------------
-    # Request adjustment
-    # ------------------------------------------------------------------
-
-    def adjust_request(
-        self, request: ChatCompletionRequest | ResponsesRequest
-    ) -> ChatCompletionRequest | ResponsesRequest:
-        request = super().adjust_request(request)
-        if request.tools and request.tool_choice != "none":
-            # Ensure DSML tokens are not stripped during decoding.
-            request.skip_special_tokens = False
-        return request
-
-    # ------------------------------------------------------------------
-    # Static / utility helpers
-    # ------------------------------------------------------------------
-
-    @staticmethod
-    def _tools_enabled(request: ChatCompletionRequest) -> bool:
-        """Check whether tool calling is active for this request."""
-        try:
-            tools = getattr(request, "tools", None)
-            tool_choice = getattr(request, "tool_choice", None)
-            return bool(tools) and tool_choice != "none"
-        except Exception:
-            logger.exception("Failed to determine if tools are enabled.")
-            return False
-
-    def _generate_tool_call_id(self) -> str:
-        return f"call_{uuid.uuid4().hex[:24]}"
-
-    @staticmethod
-    def _json_escape_string_content(s: str) -> str:
-        """JSON-escape a string value (without surrounding quotes)."""
-        if not s:
-            return ""
-        return json.dumps(s, ensure_ascii=False)[1:-1]
-
-    # ------------------------------------------------------------------
-    # Type conversion helpers
-    # ------------------------------------------------------------------
-
-    def _convert_param_value_checked(self, value: str, param_type: str) -> Any:
-        """Convert a raw string value to the type indicated by *param_type*.
-
-        Raises on failure so the caller can try the next candidate type.
-        """
-        if value.lower() == "null":
-            return None
-
-        param_type = param_type.lower()
-        if param_type in ("string", "str", "text"):
-            return value
-        elif param_type in ("integer", "int"):
-            return int(value)
-        elif param_type in ("number", "float"):
-            val = float(value)
-            return val if val != int(val) else int(val)
-        elif param_type in ("boolean", "bool"):
-            normed = value.strip().lower()
-            if normed not in ("false", "0", "true", "1"):
-                raise ValueError(f"Invalid boolean value: {value!r}")
-            return normed in ("true", "1")
-        elif param_type in ("object", "array"):
-            return json.loads(value)
-        else:
-            return json.loads(value)
-
-    def _convert_param_value(self, value: str, param_type: str | list[str]) -> Any:
-        """Try each candidate type in turn; fall back to the raw string."""
-        if not isinstance(param_type, list):
-            param_type = [param_type]
-        for current_type in param_type:
-            try:
-                return self._convert_param_value_checked(value, current_type)
-            except Exception:
-                continue
-        return value
-
-    def _get_param_schema_type(
-        self, func_name: str, param_name: str
-    ) -> str | list[str]:
-        """Look up the JSON-schema type for a parameter, defaulting to
-        ``"string"``."""
-        if self.tools:
-            for tool in self.tools:
-                if (
-                    hasattr(tool, "function")
-                    and tool.function.name == func_name
-                    and hasattr(tool.function, "parameters")
-                ):
-                    schema = tool.function.parameters
-                    if isinstance(schema, dict) and "properties" in schema:
-                        prop = schema["properties"].get(param_name, {})
-                        if isinstance(prop, dict):
-                            return prop.get("type", "string")
-                    break
-        return "string"
-
-    def _convert_with_schema(
-        self, func_name: str, param_name: str, value: str
-    ) -> Any:
-        """Convert *value* using the tool schema for *func_name*.*param_name*."""
-        param_type = self._get_param_schema_type(func_name, param_name)
-        return self._convert_param_value(value, param_type)
-
-    def _is_string_type(self, func_name: str, param_name: str) -> bool:
-        """Return True if the schema says this parameter is a string."""
-        ptype = self._get_param_schema_type(func_name, param_name)
-        if isinstance(ptype, list):
-            return "string" in ptype
-        return ptype in ("string", "str", "text")
-
-    # ------------------------------------------------------------------
-    # Non-streaming extraction (unchanged logic, shared helpers)
-    # ------------------------------------------------------------------
-
-    def extract_tool_calls(
-        self,
-        model_output: str,
-        request: ChatCompletionRequest,
-    ) -> ExtractedToolCallInformation:
-        """Extract tool calls from complete model output (non-streaming)."""
-        if self.tool_call_start_token not in model_output:
-            return ExtractedToolCallInformation(
-                tools_called=False, tool_calls=[], content=model_output
-            )
-
-        try:
-            tool_calls: list[ToolCall] = []
-
-            for fc_block in self.tool_call_complete_regex.findall(model_output):
-                for invoke_name, invoke_body in self.invoke_complete_regex.findall(
-                    fc_block
-                ):
-                    # Parse all parameters in this invoke.
-                    raw_params: dict[str, str] = {}
-                    for pname, _str_attr, pval in (
-                        self.parameter_complete_regex.findall(invoke_body)
-                    ):
-                        raw_params[pname] = pval
-
-                    # Convert types via schema.
-                    converted: dict[str, Any] = {}
-                    for pname, pval in raw_params.items():
-                        converted[pname] = self._convert_with_schema(
-                            invoke_name, pname, pval
-                        )
-
-                    tool_calls.append(
-                        ToolCall(
-                            type="function",
-                            function=FunctionCall(
-                                name=invoke_name,
-                                arguments=json.dumps(
-                                    converted, ensure_ascii=False
-                                ),
-                            ),
-                        )
-                    )
-
-            if not tool_calls:
-                return ExtractedToolCallInformation(
-                    tools_called=False, tool_calls=[], content=model_output
-                )
-
-            first_idx = model_output.find(self.tool_call_start_token)
-            content = model_output[:first_idx] if first_idx > 0 else None
-
-            return ExtractedToolCallInformation(
-                tools_called=True, tool_calls=tool_calls, content=content
-            )
-
-        except Exception:
-            logger.exception("Error extracting tool calls from complete output")
-            return ExtractedToolCallInformation(
-                tools_called=False, tool_calls=[], content=model_output
-            )
-
-    # ------------------------------------------------------------------
-    # Streaming helpers — re-parse-and-diff
-    # ------------------------------------------------------------------
-
-    def _reset_streaming_state(self) -> None:
-        self._sent_content_idx = 0
-        self._tool_call_ids.clear()
-        self.streamed_args_for_tool.clear()
-        self.prev_tool_call_arr.clear()
-        self.current_tool_id = -1
-
-    def _extract_content(self, current_text: str) -> str | None:
-        """Return any non-tool-call text that hasn't been sent yet.
-
-        Walks *current_text* from ``_sent_content_idx``, collecting text
-        outside ``<｜DSML｜function_calls>`` regions.  Uses
-        ``partial_tag_overlap`` to avoid emitting bytes that might turn
-        out to be the start of the function-calls tag once the next
-        chunk arrives.
-        """
-        content_segments: list[str] = []
-        pos = self._sent_content_idx
-
-        while pos < len(current_text):
-            start = current_text.find(self.tool_call_start_token, pos)
-            if start == -1:
-                # No (more) tool-call regions — send the tail, minus
-                # any suffix that could be the beginning of the tag.
-                tail = current_text[pos:]
-                overlap = partial_tag_overlap(tail, self.tool_call_start_token)
-                sendable = tail[: len(tail) - overlap] if overlap else tail
-                if sendable:
-                    content_segments.append(sendable)
-                pos = len(current_text) - overlap
-                break
-
-            # Text between previous position and the tag start is content.
-            if start > pos:
-                content_segments.append(current_text[pos:start])
-
-            # Skip past the tool-call region.
-            end = current_text.find(self.tool_call_end_token, start)
-            if end != -1:
-                pos = end + len(self.tool_call_end_token)
-            else:
-                # Region still open — park cursor at start, stop.
-                pos = start
-                break
-
-        if content_segments:
-            self._sent_content_idx = pos
-            return "".join(content_segments)
-        if pos > self._sent_content_idx:
-            self._sent_content_idx = pos
-        return None
-
-    def _extract_invoke_regions(
-        self, text: str
-    ) -> list[tuple[str, str, bool]]:
-        """Find all invoke blocks inside the function_calls region.
-
-        Returns a list of ``(func_name, inner_text, is_complete)``
-        tuples.  *inner_text* is everything between the invoke open
-        tag and the close tag (or the end of available text for the
-        last, potentially incomplete, invoke).
-        """
-        results: list[tuple[str, str, bool]] = []
-
-        fc_start = text.find(self.tool_call_start_token)
-        if fc_start == -1:
-            return results
-
-        region_start = fc_start + len(self.tool_call_start_token)
-        fc_end = text.find(self.tool_call_end_token, region_start)
-        region = text[region_start:fc_end] if fc_end != -1 else text[region_start:]
-
-        pos = 0
-        while pos < len(region):
-            inv_match = self.invoke_start_regex.search(region, pos)
-            if not inv_match:
-                break
-
-            func_name = inv_match.group(1)
-            body_start = inv_match.end()
-
-            inv_end_pos = region.find(self.invoke_end_token, body_start)
-            if inv_end_pos != -1:
-                # Complete invoke block.
-                body = region[body_start:inv_end_pos]
-                results.append((func_name, body, True))
-                pos = inv_end_pos + len(self.invoke_end_token)
-            else:
-                # Incomplete — still being generated.
-                body = region[body_start:]
-                overlap = partial_tag_overlap(body, self.invoke_end_token)
-                if overlap:
-                    body = body[:-overlap]
-                results.append((func_name, body, False))
-                break
-
-        return results
-
-    def _build_args_json_so_far(
-        self,
-        func_name: str,
-        inner_text: str,
-        is_complete: bool,
-    ) -> str:
-        """Build a JSON arguments string from the parameters found so far.
-
-        Handles both fully-closed ``<｜DSML｜parameter>`` tags and the
-        single trailing partial parameter whose value is still being
-        streamed.
-        """
-        # ---- Collect all fully-closed parameters ----
-        complete_params = self.parameter_complete_regex.findall(inner_text)
-        parts: list[str] = []
-
-        for param_name, string_attr, param_value in complete_params:
-            key_json = json.dumps(param_name, ensure_ascii=False)
-            if string_attr == "true":
-                val_json = json.dumps(param_value, ensure_ascii=False)
-            else:
-                converted = self._convert_with_schema(
-                    func_name, param_name, param_value
-                )
-                val_json = json.dumps(converted, ensure_ascii=False)
-            parts.append(f"{key_json}: {val_json}")
-
-        # ---- Handle a trailing partial parameter ----
-        last_param_open = inner_text.rfind("<｜DSML｜parameter")
-        last_param_close = inner_text.rfind(self.param_end_token)
-        has_partial = last_param_open != -1 and (
-            last_param_close == -1 or last_param_close < last_param_open
-        )
-
-        if has_partial:
-            partial_text = inner_text[last_param_open:]
-            header_match = self.parameter_header_regex.search(partial_text)
-
-            if header_match:
-                param_name = header_match.group(1)
-                string_attr = header_match.group(2)
-                partial_value = partial_text[header_match.end():]
-
-                # Strip any bytes that might be the beginning of the
-                # closing </｜DSML｜parameter> tag.
-                overlap = partial_tag_overlap(
-                    partial_value, self.param_end_token
-                )
-                if overlap:
-                    partial_value = partial_value[:-overlap]
-
-                key_json = json.dumps(param_name, ensure_ascii=False)
-
-                if is_complete:
-                    # Invoke is closed — treat whatever we have as final.
-                    if string_attr == "true":
-                        val_json = json.dumps(
-                            partial_value, ensure_ascii=False
-                        )
-                    else:
-                        converted = self._convert_with_schema(
-                            func_name, param_name, partial_value
-                        )
-                        val_json = json.dumps(converted, ensure_ascii=False)
-                    parts.append(f"{key_json}: {val_json}")
-                elif string_attr == "true" or self._is_string_type(
-                    func_name, param_name
-                ):
-                    # Stream as an open JSON string (no closing quote).
-                    escaped = self._json_escape_string_content(partial_value)
-                    parts.append(f'{key_json}: "{escaped}')
-                else:
-                    # Non-string — emit raw partial value.
-                    parts.append(f"{key_json}: {partial_value}")
-
-        # ---- Assemble ----
-        if not parts:
-            return "{}" if is_complete else ""
-
-        joined = "{" + ", ".join(parts)
-        if is_complete:
-            joined += "}"
-        return joined
-
-    def _compute_args_diff(self, index: int, args_so_far: str) -> str | None:
-        """Return only the characters in *args_so_far* that haven't been
-        sent yet, or ``None`` if there's nothing new."""
-        prev = self.streamed_args_for_tool[index]
-        if not args_so_far or len(args_so_far) <= len(prev):
-            return None
-        diff = args_so_far[len(prev):]
-        self.streamed_args_for_tool[index] = args_so_far
-        self.prev_tool_call_arr[index]["arguments"] = args_so_far
-        return diff
-
-    def _ensure_tool_state_for(self, index: int) -> None:
-        """Grow the streaming-state arrays so *index* is valid."""
-        while len(self._tool_call_ids) <= index:
-            self._tool_call_ids.append(self._generate_tool_call_id())
-        while len(self.streamed_args_for_tool) <= index:
-            self.streamed_args_for_tool.append("")
-        while len(self.prev_tool_call_arr) <= index:
-            self.prev_tool_call_arr.append({})
-
-    # ------------------------------------------------------------------
-    # Main streaming entry point
-    # ------------------------------------------------------------------
-
-    def extract_tool_calls_streaming(
-        self,
-        previous_text: str,
-        current_text: str,
-        delta_text: str,
-        previous_token_ids: Sequence[int],
-        current_token_ids: Sequence[int],
-        delta_token_ids: Sequence[int],
-        request: ChatCompletionRequest,
-    ) -> DeltaMessage | None:
-        """Extract tool calls from streaming output using re-parse-and-diff.
-
-        On every call we:
-          1. Re-scan *current_text* for content outside tool-call regions.
-          2. Find all ``<｜DSML｜invoke>`` regions (complete + partial).
-          3. Build JSON args for each, diff against previous, emit deltas.
-
-        Because the entire text is re-parsed each time, the result is
-        correct regardless of how many tokens arrived in this step.
-        """
-        # First chunk of a new stream — reset state.
-        if not previous_text:
-            self._reset_streaming_state()
-
-        # If tools aren't enabled, just forward content.
-        if not self._tools_enabled(request):
-            return DeltaMessage(content=delta_text) if delta_text else None
-
-        # 1. Extract any content outside tool-call regions.
-        content = self._extract_content(current_text)
-
-        # 2. Find all invoke regions.
-        regions = self._extract_invoke_regions(current_text)
-        tool_call_deltas: list[DeltaToolCall] = []
-
-        for i, (func_name, inner_text, is_complete) in enumerate(regions):
-            self._ensure_tool_state_for(i)
-
-            # Emit the tool name (once per tool call).
-            if "name" not in self.prev_tool_call_arr[i]:
-                self.prev_tool_call_arr[i]["name"] = func_name
-                tool_call_deltas.append(
-                    DeltaToolCall(
-                        index=i,
-                        id=self._tool_call_ids[i],
-                        type="function",
-                        function=DeltaFunctionCall(
-                            name=func_name,
-                            arguments="",
-                        ),
-                    )
-                )
-
-            # Build the JSON args so far and emit the diff.
-            args_so_far = self._build_args_json_so_far(
-                func_name, inner_text, is_complete
-            )
-            diff = self._compute_args_diff(i, args_so_far)
-            if diff:
-                tool_call_deltas.append(
-                    DeltaToolCall(
-                        index=i,
-                        function=DeltaFunctionCall(arguments=diff),
-                    )
-                )
-
-        if regions:
-            self.current_tool_id = len(regions) - 1
-
-        # 3. Return a delta if we have content or tool-call updates.
-        if content or tool_call_deltas:
-            return DeltaMessage(
-                content=content,
-                tool_calls=tool_call_deltas,
-            )
-
-        # Empty delta with token ids means EOS or closing tag — return
-        # non-None so the serving framework can finalize finish_reason.
-        if not delta_text and delta_token_ids and self.prev_tool_call_arr:
-            return DeltaMessage(content="")
-
-        return None

glm_5.1_chat_template.jinja

@@ -0,0 +1,119 @@
+[gMASK]<sop>
+{%- if tools -%}
+{%- macro tool_to_json(tool) -%}
+    {%- set ns_tool = namespace(first=true) -%}
+    {{ '{' -}}
+    {%- for k, v in tool.items() -%}
+        {%- if k != 'defer_loading' and k != 'strict' -%}
+            {%- if not ns_tool.first -%}{{- ', ' -}}{%- endif -%}
+            {%- set ns_tool.first = false -%}
+            "{{ k }}": {{ v | tojson(ensure_ascii=False) }}
+        {%- endif -%}
+    {%- endfor -%}
+    {{- '}' -}}
+{%- endmacro -%}
+<|system|>
+# Tools
+
+You may call one or more functions to assist with the user query.
+
+You are provided with function signatures within <tools></tools> XML tags:
+<tools>
+{% for tool in tools %}
+{%- if 'function' in tool -%}
+    {%- set tool = tool['function'] -%}
+{%- endif -%}
+{% if tool.defer_loading is not defined or not tool.defer_loading %}
+{{ tool_to_json(tool) }}
+{% endif %}
+{% endfor %}
+</tools>
+
+For each function call, output the function name and arguments within the following XML format:
+<tool_call>{function-name}<arg_key>{arg-key-1}</arg_key><arg_value>{arg-value-1}</arg_value><arg_key>{arg-key-2}</arg_key><arg_value>{arg-value-2}</arg_value>...</tool_call>{%- endif -%}
+{%- macro visible_text(content) -%}
+    {%- if content is string -%}
+        {{- content }}
+    {%- elif content is iterable and content is not mapping -%}
+        {%- for item in content -%}
+            {%- if item is mapping and item.type == 'text' -%}
+                {{- item.text }}
+            {%- elif item is string -%}
+                {{- item }}
+            {%- endif -%}
+        {%- endfor -%}
+    {%- else -%}
+        {{- content }}
+    {%- endif -%}
+{%- endmacro -%}
+{%- set ns = namespace(last_user_index=-1, thinking_indices='') -%}
+{%- for m in messages %}
+    {%- if m.role == 'user' %}
+        {%- set ns.last_user_index = loop.index0 -%}
+    {%- elif m.role == 'assistant' %}
+        {%- if m.reasoning_content is string %}
+            {%- set ns.thinking_indices = ns.thinking_indices ~ ',' ~ ns.last_user_index ~ ',' -%}
+        {%- endif %}
+    {%- endif %}
+{%- endfor %}
+{%- set ns.has_thinking = false -%}
+{%- for m in messages -%}
+{%- if m.role == 'user' -%}<|user|>{{ visible_text(m.content) }}{% set ns.has_thinking = (',' ~ loop.index0 ~ ',') in ns.thinking_indices -%}
+{%- elif m.role == 'assistant' -%}
+<|assistant|>
+{%- set content = visible_text(m.content) %}
+{%- if m.reasoning_content is string %}
+    {%- set reasoning_content = m.reasoning_content %}
+{%- elif '</think>' in content %}
+    {%- set reasoning_content = content.split('</think>')[0].split('<think>')[-1] %}
+    {%- set content = content.split('</think>')[-1] %}
+{%- elif loop.index0 > ns.last_user_index and not (enable_thinking is defined and not enable_thinking) %}
+    {%- set reasoning_content = '' %}
+{%- elif loop.index0 < ns.last_user_index and ns.has_thinking %}
+    {%- set reasoning_content = '' %}
+{%- endif %}
+{%- if ((clear_thinking is defined and not clear_thinking) or loop.index0 > ns.last_user_index) and reasoning_content is defined -%}
+{{ '<think>' + reasoning_content +  '</think>'}}
+{%- else -%}
+{{ '</think>' }}
+{%- endif -%}
+{%- if content.strip() -%}
+{{ content.strip() }}
+{%- endif -%}
+{% if m.tool_calls %}
+{% for tc in m.tool_calls %}
+{%- if tc.function %}
+    {%- set tc = tc.function %}
+{%- endif %}
+{{- '<tool_call>' + tc.name -}}
+{% set _args = tc.arguments %}{% for k, v in _args.items() %}<arg_key>{{ k }}</arg_key><arg_value>{{ v | tojson(ensure_ascii=False) if v is not string else v }}</arg_value>{% endfor %}</tool_call>{% endfor %}
+{% endif %}
+{%- elif m.role == 'tool' -%}
+{%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
+    {{- '<|observation|>' -}}
+{%- endif %}
+{%- if m.content is string -%}
+    {{- '<tool_response>' + m.content + '</tool_response>' -}}
+{%- elif m.content is iterable and m.content is not mapping and m.content and m.content.0.type == "tool_reference" -%}
+    {{- '<tool_response><tools>\n' -}}
+    {% for tr in m.content %}
+        {%- for tool in tools -%}
+            {%- if 'function' in tool -%}
+                {%- set tool = tool['function'] -%}
+            {%- endif -%}
+            {%- if tool.name == tr.name -%}
+                {{- tool_to_json(tool) + '\n' -}}
+            {%- endif -%}
+        {%- endfor -%}
+    {%- endfor -%}
+    {{- '</tools></tool_response>' -}}
+{%- else -%}
+    {{- '<tool_response>' + visible_text(m.content) + '</tool_response>' -}}
+{% endif -%}
+{%- elif m.role == 'system' -%}
+<|system|>{{ visible_text(m.content) }}
+{%- endif -%}
+{%- endfor -%}
+{%- if add_generation_prompt -%}
+    <|assistant|>{{- '</think>' if (enable_thinking is defined and not enable_thinking) else '<think>' -}}
+{%- endif -%}

lmcache-config-dsv4.yaml

@@ -0,0 +1,13 @@
+chunk_size: 256
+local_cpu: true
+max_local_cpu_size: 512.0
+enable_lazy_memory_allocator: true
+lazy_memory_initial_ratio: 0.2
+remote_url: "redis://10.66.0.100:6379"
+remote_serde: naive
+remote_ttl: 1800
+save_decode_cache: true
+use_layerwise: true
+save_unfull_chunk: true
+blocking_timeout_secs: 60
+cache_policy: LRU

lmcache-config-glm-51.yaml

@@ -0,0 +1,10 @@
+chunk_size: 256
+local_cpu: true
+max_local_cpu_size: 256.0
+save_decode_cache: true
+enable_lazy_memory_allocator: true
+lazy_memory_initial_ratio: 1.0
+use_gpu_connector_v3: true
+remote_url: "redis://10.66.0.100:6379"
+remote_serde: naive
+remote_ttl: 1800

minimax_m2_parser.py

@@ -1,61 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
-
-"""
-MiniMax M2 Parser - A unified parser for MiniMax M2 models.
-
-This parser combines the existing MiniMaxM2ReasoningParser and
-MinimaxM2ToolParser into a single unified interface by delegating
-to those implementations.
-"""
-
-from vllm.logger import init_logger
-from vllm.parser.abstract_parser import DelegatingParser
-from vllm.reasoning.minimax_m2_reasoning_parser import MiniMaxM2ReasoningParser
-from vllm.tokenizers import TokenizerLike
-from vllm.tool_parsers.abstract_tool_parser import (
-    Tool,
-)
-from vllm.tool_parsers.minimax_m2_tool_parser import MinimaxM2ToolParser
-
-logger = init_logger(__name__)
-
-
-class MiniMaxM2Parser(DelegatingParser):
-    """
-    Unified parser for MiniMax M2 models that handles both reasoning
-    extraction and tool call parsing.
-
-    This parser delegates to the existing implementations:
-    - MiniMaxM2ReasoningParser for reasoning extraction
-    - MinimaxM2ToolParser for tool call parsing
-
-    MiniMax M2 models have two special behaviors:
-    1. Reasoning: They don't generate <think> start token, only </think> end
-       token. All content before </think> is reasoning, content after is the
-       actual response.
-    2. Tool Calls: They use <minimax:tool_call>...</minimax:tool_call> tags
-       with <invoke name="...">...</invoke> and <parameter name="...">...</parameter>
-       syntax.
-    """
-
-    # Class-level parser classes for compatibility
-    reasoning_parser_cls = MiniMaxM2ReasoningParser
-    tool_parser_cls = MinimaxM2ToolParser
-
-    def __init__(
-        self,
-        tokenizer: TokenizerLike,
-        tools: list[Tool] | None = None,
-        *args,
-        **kwargs,
-    ):
-        super().__init__(tokenizer, *args, **kwargs)
-
-        # Initialize the underlying parsers
-        self._reasoning_parser = MiniMaxM2ReasoningParser(tokenizer, *args, **kwargs)
-        self._tool_parser = MinimaxM2ToolParser(tokenizer, tools)
-
-        logger.debug(
-            "vLLM Successfully initialized parser %s!", self.__class__.__name__
-        )

minimax_tool_parser.py

@@ -1,852 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
-
-import json
-from collections.abc import Sequence
-from typing import Any
-
-import regex as re
-
-from vllm.entrypoints.chat_utils import make_tool_call_id
-from vllm.entrypoints.openai.chat_completion.protocol import (
-    ChatCompletionRequest,
-)
-from vllm.entrypoints.openai.engine.protocol import (
-    DeltaFunctionCall,
-    DeltaMessage,
-    DeltaToolCall,
-    ExtractedToolCallInformation,
-    FunctionCall,
-    ToolCall,
-)
-from vllm.logger import init_logger
-from vllm.tokenizers import TokenizerLike
-from vllm.tool_parsers.abstract_tool_parser import (
-    Tool,
-    ToolParser,
-)
-from vllm.tool_parsers.utils import extract_intermediate_diff
-
-logger = init_logger(__name__)
-
-
-class MinimaxToolParser(ToolParser):
-    def __init__(self, tokenizer: TokenizerLike, tools: list[Tool] | None = None, **kwargs):
-        super().__init__(tokenizer, tools)
-
-        # Initialize streaming state for tracking tool call progress
-        self.streaming_state: dict[str, Any] = {
-            "current_tool_index": -1,  # Index of current tool being processed
-            "tool_ids": [],  # List of tool call IDs
-            "sent_tools": [],  # List of tools that have been sent
-        }
-
-        # Define tool call tokens and patterns
-        self.tool_call_start_token = "<tool_calls>"
-        self.tool_call_end_token = "</tool_calls>"
-        self.tool_call_regex = re.compile(
-            r"<tool_calls>(.*?)</tool_calls>|<tool_calls>(.*)", re.DOTALL
-        )
-        self.thinking_tag_pattern = r"<think>(.*?)</think>"
-        self.tool_name_pattern = re.compile(r'"name":\s*"([^"]+)"')
-        self.tool_args_pattern = re.compile(r'"arguments":\s*')
-
-        # Buffer for handling partial tool calls during streaming
-        self.pending_buffer = ""
-        self.in_thinking_tag = False
-
-        if not self.model_tokenizer:
-            raise ValueError(
-                "The model tokenizer must be passed to the ToolParser "
-                "constructor during construction."
-            )
-
-        # Get token IDs for tool call start/end tokens
-        self.tool_call_start_token_id = self.vocab.get(self.tool_call_start_token)
-        self.tool_call_end_token_id = self.vocab.get(self.tool_call_end_token)
-
-        if self.tool_call_start_token_id is None or self.tool_call_end_token_id is None:
-            logger.warning(
-                "Minimax Tool parser could not locate tool call start/end "
-                "tokens in the tokenizer. Falling back to string matching."
-            )
-
-    def preprocess_model_output(self, model_output: str) -> str:
-        """
-        Preprocess model output by removing tool calls from thinking tags.
-
-        Args:
-            model_output: Raw model output string
-
-        Returns:
-            Preprocessed model output with tool calls removed from thinking tags
-        """
-
-        def remove_tool_calls_from_think(match):
-            think_content = match.group(1)
-            cleaned_content = re.sub(
-                r"<tool_calls>.*?</tool_calls>", "", think_content, flags=re.DOTALL
-            )
-            return f"<think>{cleaned_content}</think>"
-
-        return re.sub(
-            self.thinking_tag_pattern,
-            remove_tool_calls_from_think,
-            model_output,
-            flags=re.DOTALL,
-        )
-
-    def _clean_duplicate_braces(self, args_text: str) -> str:
-        """
-        Clean duplicate closing braces from arguments text.
-
-        Args:
-            args_text: Raw arguments text
-
-        Returns:
-            Cleaned arguments text with proper JSON formatting
-        """
-        args_text = args_text.strip()
-        if not args_text:
-            return args_text
-
-        try:
-            json.loads(args_text)
-            return args_text
-        except json.JSONDecodeError:
-            pass
-
-        while args_text.endswith("}}"):
-            candidate = args_text[:-1]
-            try:
-                json.loads(candidate)
-                return candidate
-            except json.JSONDecodeError:
-                args_text = candidate
-
-        return args_text
-
-    def _clean_delta_braces(self, delta_text: str) -> str:
-        """
-        Clean delta text by removing excessive closing braces.
-
-        Args:
-            delta_text: Delta text to clean
-
-        Returns:
-            Cleaned delta text
-        """
-        if not delta_text:
-            return delta_text
-
-        delta_stripped = delta_text.strip()
-
-        if delta_stripped and all(c in "}\n\r\t " for c in delta_stripped):
-            brace_count = delta_stripped.count("}")
-            if brace_count > 1:
-                return "}\n" if delta_text.endswith("\n") else "}"
-
-        return delta_text
-
-    def extract_tool_calls(
-        self,
-        model_output: str,
-        request: ChatCompletionRequest,
-    ) -> ExtractedToolCallInformation:
-        """
-        Extract tool calls from model output for non-streaming mode.
-
-        Args:
-            model_output: Complete model output
-            request: Chat completion request
-
-        Returns:
-            ExtractedToolCallInformation containing tool calls and content
-        """
-        processed_output = self.preprocess_model_output(model_output)
-
-        if self.tool_call_start_token not in processed_output:
-            return ExtractedToolCallInformation(
-                tools_called=False, tool_calls=[], content=model_output
-            )
-
-        try:
-            function_call_tuples = self.tool_call_regex.findall(processed_output)
-
-            raw_function_calls = []
-            for match in function_call_tuples:
-                tool_call_content = match[0] if match[0] else match[1]
-                if tool_call_content.strip():
-                    lines = tool_call_content.strip().split("\n")
-                    for line in lines:
-                        line = line.strip()
-                        if line and line.startswith("{") and line.endswith("}"):
-                            try:
-                                parsed_call = json.loads(line)
-                                raw_function_calls.append(parsed_call)
-                            except json.JSONDecodeError:
-                                continue
-
-            tool_calls = []
-            for function_call in raw_function_calls:
-                if "name" in function_call and "arguments" in function_call:
-                    tool_calls.append(
-                        ToolCall(
-                            type="function",
-                            function=FunctionCall(
-                                name=function_call["name"],
-                                arguments=json.dumps(
-                                    function_call["arguments"], ensure_ascii=False
-                                ),
-                            ),
-                        )
-                    )
-
-            processed_pos = processed_output.find(self.tool_call_start_token)
-            if processed_pos != -1:
-                processed_content = processed_output[:processed_pos].strip()
-
-                if processed_content:
-                    lines = processed_content.split("\n")
-                    for line in reversed(lines):
-                        line = line.strip()
-                        if line:
-                            pos = model_output.find(line)
-                            if pos != -1:
-                                content = model_output[: pos + len(line)]
-                                break
-                    else:
-                        content = ""
-                else:
-                    content = ""
-            else:
-                content = model_output
-
-            return ExtractedToolCallInformation(
-                tools_called=len(tool_calls) > 0,
-                tool_calls=tool_calls,
-                content=content.strip() if content.strip() else None,
-            )
-
-        except Exception:
-            logger.exception(
-                "An unexpected error occurred during tool call extraction."
-            )
-            return ExtractedToolCallInformation(
-                tools_called=False, tool_calls=[], content=model_output
-            )
-
-    def _update_thinking_state(self, text: str) -> None:
-        """
-        Update the thinking tag state based on text content.
-
-        Args:
-            text: Text to analyze for thinking tags
-        """
-        open_count = text.count("<think>")
-        close_count = text.count("</think>")
-        self.in_thinking_tag = open_count > close_count or (
-            open_count == close_count and text.endswith("</think>")
-        )
-
-    def _is_potential_tag_start(self, text: str) -> bool:
-        """
-        Check if text might be the start of a tool call tag.
-
-        Args:
-            text: Text to check
-
-        Returns:
-            True if text could be the start of a tool call tag
-        """
-        for tag in [self.tool_call_start_token, self.tool_call_end_token]:
-            if any(
-                tag.startswith(text[-i:])
-                for i in range(1, min(len(text) + 1, len(tag)))
-            ):
-                return True
-        return False
-
-    def _should_buffer_content(self, delta_text: str) -> bool:
-        """
-        Determine if content should be buffered for later processing.
-
-        Args:
-            delta_text: Delta text to check
-
-        Returns:
-            True if content should be buffered
-        """
-        if self.in_thinking_tag:
-            return False
-        return bool(
-            self.pending_buffer
-            or self.tool_call_start_token in delta_text
-            or self.tool_call_end_token in delta_text
-            or delta_text.startswith("<")
-        )
-
-    def _split_content_for_buffering(self, delta_text: str) -> tuple[str, str]:
-        """
-        Split delta text into safe content and potential tag content.
-
-        Args:
-            delta_text: Delta text to split
-
-        Returns:
-            Tuple of (safe_content, potential_tag_content)
-        """
-        if self.in_thinking_tag:
-            return delta_text, ""
-
-        for tag in [self.tool_call_start_token, self.tool_call_end_token]:
-            for i in range(1, len(tag)):
-                tag_prefix = tag[:i]
-                pos = delta_text.rfind(tag_prefix)
-                if pos != -1 and tag.startswith(delta_text[pos:]):
-                    return delta_text[:pos], delta_text[pos:]
-        return delta_text, ""
-
-    def _process_buffer(self, new_content: str) -> str:
-        """
-        Process buffered content and return output content.
-
-        Args:
-            new_content: New content to add to buffer
-
-        Returns:
-            Processed output content
-        """
-        self.pending_buffer += new_content
-        output_content = ""
-
-        if self.in_thinking_tag:
-            output_content = self.pending_buffer
-            self.pending_buffer = ""
-            return output_content
-
-        while self.pending_buffer:
-            start_pos = self.pending_buffer.find(self.tool_call_start_token)
-            end_pos = self.pending_buffer.find(self.tool_call_end_token)
-
-            if start_pos != -1 and (end_pos == -1 or start_pos < end_pos):
-                tag_pos, tag_len = start_pos, len(self.tool_call_start_token)
-            elif end_pos != -1:
-                tag_pos, tag_len = end_pos, len(self.tool_call_end_token)
-            else:
-                if self._is_potential_tag_start(self.pending_buffer):
-                    break
-                output_content += self.pending_buffer
-                self.pending_buffer = ""
-                break
-
-            output_content += self.pending_buffer[:tag_pos]
-            self.pending_buffer = self.pending_buffer[tag_pos + tag_len :]
-
-        return output_content
-
-    def _reset_streaming_state(self) -> None:
-        """Reset the streaming state to initial values."""
-        self.streaming_state = {
-            "current_tool_index": -1,
-            "tool_ids": [],
-            "sent_tools": [],
-        }
-
-    def _advance_to_next_tool(self) -> None:
-        """Advance to the next tool in the streaming sequence."""
-        self.streaming_state["current_tool_index"] = (
-            int(self.streaming_state["current_tool_index"]) + 1
-        )
-
-    def _set_current_tool_index(self, index: int) -> None:
-        """
-        Set the current tool index.
-
-        Args:
-            index: Tool index to set
-        """
-        self.streaming_state["current_tool_index"] = index
-
-    def _get_current_tool_index(self) -> int:
-        """
-        Get the current tool index.
-
-        Returns:
-            Current tool index
-        """
-        return int(self.streaming_state["current_tool_index"])
-
-    def _get_next_unsent_tool_index(self, tool_count: int) -> int:
-        """
-        Get the index of the next unsent tool.
-
-        Args:
-            tool_count: Total number of tools
-
-        Returns:
-            Index of next unsent tool, or -1 if all tools sent
-        """
-        sent_tools = list(self.streaming_state["sent_tools"])
-        for i in range(tool_count):
-            if i < len(sent_tools):
-                if not sent_tools[i]["sent_name"]:
-                    return i
-            else:
-                return i
-        return -1
-
-    def _ensure_state_arrays(self, tool_count: int) -> None:
-        """
-        Ensure state arrays have sufficient capacity for tool_count tools.
-
-        Args:
-            tool_count: Number of tools to prepare for
-        """
-        sent_tools = list(self.streaming_state["sent_tools"])
-        tool_ids = list(self.streaming_state["tool_ids"])
-
-        while len(sent_tools) < tool_count:
-            sent_tools.append(
-                {
-                    "sent_name": False,
-                    "sent_arguments": "",
-                    "id": make_tool_call_id(),
-                }
-            )
-
-        while len(tool_ids) < tool_count:
-            tool_ids.append(None)
-
-        self.streaming_state["sent_tools"] = sent_tools
-        self.streaming_state["tool_ids"] = tool_ids
-
-    def _detect_tools_in_text(self, text: str) -> int:
-        """
-        Detect the number of tools in text by counting name patterns.
-
-        Args:
-            text: Text to analyze
-
-        Returns:
-            Number of tools detected
-        """
-        matches = self.tool_name_pattern.findall(text)
-        return len(matches)
-
-    def _find_tool_boundaries(self, text: str) -> list[tuple[int, int]]:
-        """
-        Find the boundaries of tool calls in text.
-
-        Args:
-            text: Text to analyze
-
-        Returns:
-            List of (start, end) positions for tool calls
-        """
-        boundaries = []
-        i = 0
-        while i < len(text):
-            if text[i] == "{":
-                start = i
-                depth = 0
-                has_name = False
-                has_arguments = False
-
-                while i < len(text):
-                    if text[i] == "{":
-                        depth += 1
-                    elif text[i] == "}":
-                        depth -= 1
-                        if depth == 0:
-                            end = i + 1
-                            segment = text[start:end]
-                            if '"name"' in segment and '"arguments"' in segment:
-                                boundaries.append((start, end))
-                            break
-
-                    if not has_name and '"name"' in text[start : i + 1]:
-                        has_name = True
-                    if not has_arguments and '"arguments"' in text[start : i + 1]:
-                        has_arguments = True
-
-                    i += 1
-
-                if depth > 0 and has_name:
-                    boundaries.append((start, i))
-            else:
-                i += 1
-        return boundaries
-
-    def _extract_tool_args(self, tool_content: str, args_match: re.Match[str]) -> str:
-        """
-        Extract tool arguments from tool content.
-
-        Args:
-            tool_content: Tool call content
-            args_match: Regex match for arguments pattern
-
-        Returns:
-            Extracted arguments as string
-        """
-        args_start_pos = args_match.end()
-        remaining_content = tool_content[args_start_pos:]
-
-        if remaining_content.strip().startswith("{"):
-            depth = 0
-            for i, char in enumerate(remaining_content):
-                if char == "{":
-                    depth += 1
-                elif char == "}":
-                    depth -= 1
-                    if depth == 0:
-                        return remaining_content[: i + 1]
-        else:
-            args_end = remaining_content.find("}")
-            if args_end > 0:
-                return remaining_content[:args_end].strip()
-
-        return remaining_content.rstrip("}").strip()
-
-    def _get_current_tool_content(
-        self, text: str, tool_index: int
-    ) -> tuple[str | None, str | None]:
-        """
-        Get the content of a specific tool by index.
-
-        Args:
-            text: Text containing tool calls
-            tool_index: Index of tool to extract
-
-        Returns:
-            Tuple of (tool_name, tool_arguments) or (None, None) if not found
-        """
-        boundaries = self._find_tool_boundaries(text)
-
-        if tool_index >= len(boundaries):
-            return None, None
-
-        start, end = boundaries[tool_index]
-        tool_content = text[start:end]
-
-        name_match = self.tool_name_pattern.search(tool_content)
-        name = name_match.group(1) if name_match else None
-
-        args_match = self.tool_args_pattern.search(tool_content)
-        if args_match:
-            try:
-                args_text = self._extract_tool_args(tool_content, args_match)
-                return name, args_text
-            except Exception:
-                remaining_content = tool_content[args_match.end() :]
-                args_text = remaining_content.rstrip("}").strip()
-                return name, args_text
-
-        return name, None
-
-    def _handle_tool_name_streaming(
-        self, tool_content: str, tool_count: int
-    ) -> DeltaMessage | None:
-        """
-        Handle streaming of tool names.
-
-        Args:
-            tool_content: Content containing tool calls
-            tool_count: Total number of tools
-
-        Returns:
-            DeltaMessage with tool name or None if no tool to stream
-        """
-        next_idx = self._get_next_unsent_tool_index(tool_count)
-
-        if next_idx == -1:
-            return None
-
-        boundaries = self._find_tool_boundaries(tool_content)
-        if next_idx >= len(boundaries):
-            return None
-
-        tool_name, _ = self._get_current_tool_content(tool_content, next_idx)
-        if not tool_name:
-            return None
-
-        self._set_current_tool_index(next_idx)
-        sent_tools = list(self.streaming_state["sent_tools"])
-        tool_ids = list(self.streaming_state["tool_ids"])
-
-        tool_id = sent_tools[next_idx]["id"]
-        tool_ids[next_idx] = tool_id
-        sent_tools[next_idx]["sent_name"] = True
-
-        self.streaming_state["sent_tools"] = sent_tools
-        self.streaming_state["tool_ids"] = tool_ids
-
-        return DeltaMessage(
-            tool_calls=[
-                DeltaToolCall(
-                    index=next_idx,
-                    type="function",
-                    id=tool_id,
-                    function=DeltaFunctionCall(name=tool_name).model_dump(
-                        exclude_none=True
-                    ),
-                )
-            ]
-        )
-
-    def _handle_tool_args_streaming(
-        self, tool_content: str, tool_count: int
-    ) -> DeltaMessage | None:
-        """
-        Handle streaming of tool arguments.
-
-        Args:
-            tool_content: Content containing tool calls
-            tool_count: Total number of tools
-
-        Returns:
-            DeltaMessage with tool arguments or None if no arguments to stream
-        """
-        current_idx = self._get_current_tool_index()
-
-        if current_idx < 0 or current_idx >= tool_count:
-            return None
-
-        tool_name, tool_args = self._get_current_tool_content(tool_content, current_idx)
-        if not tool_name or tool_args is None:
-            return None
-
-        sent_tools = list(self.streaming_state["sent_tools"])
-
-        if not sent_tools[current_idx]["sent_name"]:
-            return None
-
-        clean_args = self._clean_duplicate_braces(tool_args)
-        sent_args = sent_tools[current_idx]["sent_arguments"]
-
-        if clean_args != sent_args:
-            if sent_args and clean_args.startswith(sent_args):
-                args_delta = extract_intermediate_diff(clean_args, sent_args)
-                if args_delta:
-                    args_delta = self._clean_delta_braces(args_delta)
-                    sent_tools[current_idx]["sent_arguments"] = clean_args
-                    self.streaming_state["sent_tools"] = sent_tools
-
-                    if clean_args.endswith("}"):
-                        self._advance_to_next_tool()
-
-                    return DeltaMessage(
-                        tool_calls=[
-                            DeltaToolCall(
-                                index=current_idx,
-                                function=DeltaFunctionCall(
-                                    arguments=args_delta
-                                ).model_dump(exclude_none=True),
-                            )
-                        ]
-                    )
-            elif not sent_args and clean_args:
-                clean_args_delta = self._clean_delta_braces(clean_args)
-                sent_tools[current_idx]["sent_arguments"] = clean_args
-                self.streaming_state["sent_tools"] = sent_tools
-
-                if clean_args.endswith("}"):
-                    self._advance_to_next_tool()
-
-                return DeltaMessage(
-                    tool_calls=[
-                        DeltaToolCall(
-                            index=current_idx,
-                            function=DeltaFunctionCall(
-                                arguments=clean_args_delta
-                            ).model_dump(exclude_none=True),
-                        )
-                    ]
-                )
-
-        return None
-
-    def _is_end_tool_calls(self, current_text: str) -> bool:
-        if self.tool_call_end_token not in current_text:
-            return False
-
-        end_token_positions = []
-        search_start = 0
-        while True:
-            pos = current_text.find(self.tool_call_end_token, search_start)
-            if pos == -1:
-                break
-            end_token_positions.append(pos)
-            search_start = pos + 1
-
-        think_regions = []
-        for match in re.finditer(
-            self.thinking_tag_pattern, current_text, flags=re.DOTALL
-        ):
-            think_regions.append((match.start(), match.end()))
-
-        for pos in end_token_positions:
-            in_think = any(
-                pos >= t_start and pos < t_end for t_start, t_end in think_regions
-            )
-            if not in_think:
-                return True
-
-        return False
-
-    def extract_tool_calls_streaming(
-        self,
-        previous_text: str,
-        current_text: str,
-        delta_text: str,
-        previous_token_ids: Sequence[int],
-        current_token_ids: Sequence[int],
-        delta_token_ids: Sequence[int],
-        request: ChatCompletionRequest,
-    ) -> DeltaMessage | None:
-        self._update_thinking_state(current_text)
-
-        if self.in_thinking_tag:
-            return DeltaMessage(content=delta_text)
-
-        if self._should_buffer_content(delta_text):
-            buffered_output = self._process_buffer(delta_text)
-            return DeltaMessage(content=buffered_output) if buffered_output else None
-
-        if self._is_end_tool_calls(current_text):
-            return DeltaMessage(content=delta_text)
-
-        safe_content, potential_tag = self._split_content_for_buffering(delta_text)
-        if potential_tag:
-            self.pending_buffer += potential_tag
-            return DeltaMessage(content=safe_content) if safe_content else None
-
-        processed_current_text = self.preprocess_model_output(current_text)
-
-        if self.tool_call_start_token not in processed_current_text:
-            if (
-                self.tool_call_end_token in delta_text
-                and self.tool_call_start_token in current_text
-            ):
-                return None
-            if delta_text.strip() == "" and self.tool_call_start_token in current_text:
-                return None
-            if (
-                self._get_current_tool_index() != -1
-                and self.tool_call_end_token in current_text
-            ):
-                self._reset_streaming_state()
-            return DeltaMessage(content=delta_text)
-
-        if (
-            self.tool_call_start_token_id is not None
-            and self.tool_call_start_token_id in delta_token_ids
-            and len(delta_token_ids) == 1
-        ):
-            return None
-
-        original_tool_start = self._find_tool_start_outside_thinking(current_text)
-        if original_tool_start is None:
-            return None
-
-        content_before_tools = self._extract_content_before_tools(
-            current_text, delta_text, original_tool_start
-        )
-        if content_before_tools:
-            return DeltaMessage(content=content_before_tools)
-
-        try:
-            tool_content = self._extract_tool_content(current_text, original_tool_start)
-            current_tools_count = self._detect_tools_in_text(tool_content)
-
-            if current_tools_count == 0:
-                return None
-
-            if self._get_current_tool_index() == -1:
-                self._reset_streaming_state()
-
-            self._ensure_state_arrays(current_tools_count)
-
-            return self._handle_tool_name_streaming(
-                tool_content, current_tools_count
-            ) or self._handle_tool_args_streaming(tool_content, current_tools_count)
-
-        except Exception:
-            logger.exception(
-                "An unexpected error occurred ", "during streaming tool call handling."
-            )
-            return None
-
-    def _find_tool_start_outside_thinking(self, current_text: str) -> int | None:
-        """
-        Find the start position of tool calls outside of thinking tags.
-
-        Args:
-            current_text: Current text to search
-
-        Returns:
-            Position of tool call start or None if not found
-        """
-        search_start = 0
-        while True:
-            pos = current_text.find(self.tool_call_start_token, search_start)
-            if pos == -1:
-                return None
-
-            think_regions = [
-                (m.start(), m.end())
-                for m in re.finditer(
-                    r"<think>(.*?)</think>", current_text, flags=re.DOTALL
-                )
-            ]
-            in_think = any(
-                pos >= t_start and pos < t_end for t_start, t_end in think_regions
-            )
-
-            if not in_think:
-                return pos
-
-            search_start = pos + 1
-
-    def _extract_content_before_tools(
-        self, current_text: str, delta_text: str, tool_start: int
-    ) -> str | None:
-        """
-        Extract content that appears before tool calls.
-
-        Args:
-            current_text: Current text
-            delta_text: Delta text
-            tool_start: Start position of tools
-
-        Returns:
-            Content before tools or None
-        """
-        if tool_start > 0:
-            delta_start_pos = len(current_text) - len(delta_text)
-            if delta_start_pos < tool_start:
-                content_part = delta_text
-                if delta_start_pos + len(delta_text) > tool_start:
-                    content_part = delta_text[: tool_start - delta_start_pos]
-                return content_part if content_part else None
-        return None
-
-    def _extract_tool_content(self, current_text: str, tool_start: int) -> str:
-        """
-        Extract tool content from current text starting at tool_start.
-
-        Args:
-            current_text: Current text
-            tool_start: Start position of tool calls
-
-        Returns:
-            Extracted tool content
-        """
-        tool_content_start = tool_start + len(self.tool_call_start_token)
-        tool_content = current_text[tool_content_start:]
-
-        end_pos = tool_content.find(self.tool_call_end_token)
-        if end_pos != -1:
-            tool_content = tool_content[:end_pos]
-
-        return tool_content

super_v3_reasoning_parser.py

@@ -1,28 +0,0 @@
-from vllm.reasoning.abs_reasoning_parsers import ReasoningParserManager
-from vllm.reasoning.deepseek_r1_reasoning_parser import DeepSeekR1ReasoningParser
-
-
-@ReasoningParserManager.register_module("super_v3")
-class SuperV3ReasoningParser(DeepSeekR1ReasoningParser):
-    def extract_reasoning(self, model_output, request):
-        reasoning_content, final_content = super().extract_reasoning(
-            model_output, request
-        )
-        if (
-            hasattr(request, "chat_template_kwargs")
-            and request.chat_template_kwargs
-            and (
-                request.chat_template_kwargs.get("enable_thinking") is False
-                or request.chat_template_kwargs.get("force_nonempty_content") is True
-            )
-            and final_content is None
-        ):
-            """
-            The original `deepseek_r1` reasoning parser this inherits from will automatically put everything in the reasoning content when it cannot parse out reasoning. This was fine for the DeepSeek R1 model that was not intended to be used without reasoning.
-            1. Since the Nemotron 3 Nano and Super both have thinking off modes modulated by "enable_thinking=false" in the chat template kwargs, this change instead which will properly place the content in cases where there is no thinking enabled via config.
-            2. There are rare cases where the model will output only reasoning without an end-think token `</think>` (e.g. reasoning exceeds max length), which results in empty content returned. End users may want to unilaterally avoid such cases and always have a content response even if the model does not finish its reasoning.
-            """
-            # Put all nonempty content into the content, rather than return content
-            reasoning_content, final_content = None, reasoning_content
-
-        return reasoning_content, final_content