[Bugfix][Parser] Scope reasoning-end detection to the current turn via turn-boundary tokens (#54089)
Signed-off-by: Mikhail Podvitskii <podvitskiymichael@gmail.com>
This commit is contained in:
@@ -147,6 +147,11 @@ class ParserEngine(Parser):
|
||||
self._reasoning_start_token_id = vocab.get(start_text)
|
||||
if end_text:
|
||||
self._reasoning_end_token_id = vocab.get(end_text)
|
||||
self._turn_boundary_token_ids: frozenset[int] = frozenset(
|
||||
token_id
|
||||
for token in parser_engine_config.turn_boundary_tokens
|
||||
if (token_id := vocab.get(token)) is not None
|
||||
)
|
||||
|
||||
@property
|
||||
def reasoning_start_str(self) -> str | None:
|
||||
@@ -601,11 +606,17 @@ class ParserEngine(Parser):
|
||||
if end_id is not None:
|
||||
if not input_ids:
|
||||
return self.parser_engine_config.initial_state != ParserState.REASONING
|
||||
boundary_ids = self._turn_boundary_token_ids
|
||||
for i in range(len(input_ids) - 1, -1, -1):
|
||||
if input_ids[i] == end_id:
|
||||
token_id = input_ids[i]
|
||||
if token_id == end_id:
|
||||
return True
|
||||
if start_id is not None and input_ids[i] == start_id:
|
||||
if start_id is not None and token_id == start_id:
|
||||
return False
|
||||
if token_id in boundary_ids:
|
||||
return (
|
||||
self.parser_engine_config.initial_state != ParserState.REASONING
|
||||
)
|
||||
return False
|
||||
return self._reasoning_ended
|
||||
|
||||
|
||||
@@ -84,6 +84,10 @@ class ParserEngineConfig:
|
||||
# Special tokens exempt from auto-drop but not state-machine terminals.
|
||||
preserve_tokens: frozenset[str] = field(default_factory=frozenset)
|
||||
|
||||
# Special tokens delimiting conversation turns in the prompt only
|
||||
# considers reasoning markers after the last boundary token.
|
||||
turn_boundary_tokens: frozenset[str] = field(default_factory=frozenset)
|
||||
|
||||
# Prevents trailing-whitespace accumulation across multi-turn conversations.
|
||||
strip_trailing_reasoning_whitespace: bool = True
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ import dataclasses
|
||||
import functools
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from vllm.parser.qwen3 import Qwen3Parser, qwen3_config
|
||||
from vllm.parser.qwen3 import CHATML_TURN_BOUNDARIES, Qwen3Parser, qwen3_config
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from vllm.entrypoints.openai.chat_completion.protocol import (
|
||||
@@ -33,7 +33,7 @@ if TYPE_CHECKING:
|
||||
@functools.cache
|
||||
def nemotron_v3_config(thinking: bool = True) -> ParserEngineConfig:
|
||||
return dataclasses.replace(
|
||||
qwen3_config(thinking=thinking),
|
||||
qwen3_config(thinking=thinking, turn_boundary_tokens=CHATML_TURN_BOUNDARIES),
|
||||
name="nemotron_v3",
|
||||
strip_trailing_reasoning_whitespace=True,
|
||||
)
|
||||
|
||||
@@ -42,6 +42,7 @@ THINK_START = "<think>"
|
||||
THINK_END = "</think>"
|
||||
TOOL_CALL_START = "<tool_call>"
|
||||
TOOL_CALL_END = "</tool_call>"
|
||||
CHATML_TURN_BOUNDARIES = frozenset(("<|im_start|>", "<|im_end|>"))
|
||||
FUNC_PREFIX = "<function="
|
||||
FUNC_END = "</function>"
|
||||
PARAM_START = "<parameter="
|
||||
@@ -94,10 +95,12 @@ def qwen3_config(
|
||||
think_end: str = THINK_END,
|
||||
tool_start: str = TOOL_CALL_START,
|
||||
tool_end: str = TOOL_CALL_END,
|
||||
turn_boundary_tokens: frozenset[str] = frozenset(),
|
||||
) -> ParserEngineConfig:
|
||||
return ParserEngineConfig(
|
||||
name=name,
|
||||
initial_state=ParserState.REASONING if thinking else ParserState.CONTENT,
|
||||
turn_boundary_tokens=turn_boundary_tokens,
|
||||
terminals={
|
||||
# Reasoning terminals
|
||||
"THINK_START": think_start,
|
||||
@@ -215,6 +218,7 @@ class Qwen3Parser(ParserEngine):
|
||||
THINK_END = THINK_END
|
||||
TOOL_START = TOOL_CALL_START
|
||||
TOOL_END = TOOL_CALL_END
|
||||
TURN_BOUNDARIES: frozenset[str] = CHATML_TURN_BOUNDARIES
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
@@ -233,6 +237,7 @@ class Qwen3Parser(ParserEngine):
|
||||
think_end=self.THINK_END,
|
||||
tool_start=self.TOOL_START,
|
||||
tool_end=self.TOOL_END,
|
||||
turn_boundary_tokens=self.TURN_BOUNDARIES,
|
||||
),
|
||||
)
|
||||
super().__init__(
|
||||
@@ -259,6 +264,7 @@ class Qwen3Parser(ParserEngine):
|
||||
tool_call_id = self._tool_call_token_id
|
||||
tool_call_end_id = self._tool_call_end_token_id
|
||||
reasoning_start_id = self._reasoning_start_token_id
|
||||
boundary_ids = self._turn_boundary_token_ids
|
||||
if tool_call_id is not None:
|
||||
for i in range(len(input_ids) - 1, -1, -1):
|
||||
if (
|
||||
@@ -266,6 +272,8 @@ class Qwen3Parser(ParserEngine):
|
||||
and input_ids[i] == reasoning_start_id
|
||||
):
|
||||
return False
|
||||
if input_ids[i] in boundary_ids:
|
||||
return False
|
||||
if input_ids[i] == tool_call_id:
|
||||
if tool_call_end_id is not None and any(
|
||||
input_ids[j] == tool_call_end_id
|
||||
|
||||
Reference in New Issue
Block a user