[Bugfix] Implicitly close DeepSeek DSML parameters (#54838)

Signed-off-by: sfeng33 <4florafeng@gmail.com>
This commit is contained in:
Flora Feng
2026-09-02 14:13:36 +08:00
committed by GitHub
parent 3976eada8b
commit 300f688321
4 changed files with 90 additions and 1 deletions
+19
View File
@@ -181,6 +181,25 @@ class TestInitialState:
class TestStreaming:
def test_split_parameter_start_is_buffered(self, mock_tokenizer, mock_request):
chunks = [
DSML_FUNC_START,
f"{DSML_INVOKE_PREFIX}edit{DSML_INVOKE_NAME_END}",
f"<{_PARAM_OPEN.format(name='expr', is_str='true')}a<b><|DSML|parameter",
' name="date" string="true">tomorrow',
_PARAM_CLOSE,
DSML_INVOKE_END,
DSML_FUNC_END,
]
results = simulate_tool_streaming(
DeepSeekV32Parser(mock_tokenizer), mock_request, chunks
)
arguments = collect_tool_arguments(results)
assert "<|DSML|parameter" not in arguments
assert json.loads(arguments) == {"expr": "a<b>", "date": "tomorrow"}
def test_single_tool_streaming(self, mock_tokenizer, mock_request):
text = _func_calls(
_invoke("get_weather", _param("city", "true", "SF")),
+65
View File
@@ -154,6 +154,26 @@ class TestArgConverter:
assert result["city"] == "Tokyo"
assert result["expr"] == "x<5"
def test_next_parameter_prefix_implicitly_closes_previous(self):
raw = (
f"<{_PARAM_OPEN.format(name='city', is_str='true')}Tokyo\n"
"<|DSML|parameter name="
)
result = json.loads(_dsml_arg_converter(raw, partial=False))
assert result == {"city": "Tokyo\n"}
def test_implicit_close_preserves_malformed_text(self):
raw = (
f"<{_PARAM_OPEN.format(name='city', is_str='true')}"
"Tokyo</|DSML|parameter\n"
f"<{_PARAM_OPEN.format(name='unit', is_str='true')}celsius{_PARAM_CLOSE}"
)
result = json.loads(_dsml_arg_converter(raw, partial=False))
assert result == {
"city": "Tokyo</|DSML|parameter\n",
"unit": "celsius",
}
def test_null_string_false(self):
raw = self._raw(("val", "false", "null"))
result = json.loads(_dsml_arg_converter(raw, partial=False))
@@ -166,6 +186,51 @@ class TestArgConverter:
assert isinstance(result["n"], str)
class TestImplicitParameterClose:
def test_non_streaming_recovers_next_parameter(self, mock_tokenizer, mock_request):
text = (
f"{DSML_TOOL_START}"
f"{DSML_INVOKE_PREFIX}get_weather{DSML_INVOKE_NAME_END}\n"
f"<{_PARAM_OPEN.format(name='location', is_str='true')}Paris "
f"<{_PARAM_OPEN.format(name='date', is_str='true')}"
f"tomorrow{_PARAM_CLOSE}"
f"{DSML_INVOKE_END}{DSML_TOOL_END}"
)
result = DeepSeekV4Parser(mock_tokenizer).extract_tool_calls(text, mock_request)
assert result.tools_called is True
assert json.loads(result.tool_calls[0].function.arguments) == {
"location": "Paris ",
"date": "tomorrow",
}
def test_streaming_split_next_parameter_tag_is_buffered(
self, mock_tokenizer, mock_request
):
chunks = [
DSML_TOOL_START,
f"{DSML_INVOKE_PREFIX}get_weather{DSML_INVOKE_NAME_END}\n",
f"<{_PARAM_OPEN.format(name='location', is_str='true')}"
"Paris a<b><|DSML|parameter",
' name="date" string="true">tomorrow',
_PARAM_CLOSE,
DSML_INVOKE_END,
DSML_TOOL_END,
]
results = simulate_tool_streaming(
DeepSeekV4Parser(mock_tokenizer), mock_request, chunks
)
arguments = collect_tool_arguments(results)
assert "<|DSML|param" not in arguments
assert json.loads(arguments) == {
"location": "Paris a<b>",
"date": "tomorrow",
}
# ── Bare </think> absorption and duplicate <think> absorption ─────────
+2
View File
@@ -26,6 +26,7 @@ from vllm.parser.deepseek_v4 import (
DSML_INVOKE_NAME_END,
DSML_INVOKE_PREFIX,
DSML_PARAM_CLOSE,
DSML_PARAM_START,
_dsml_arg_converter,
_unwrap_wrapper_args,
)
@@ -58,6 +59,7 @@ def deepseek_v32_config() -> ParserEngineConfig:
"INVOKE_PREFIX": DSML_INVOKE_PREFIX,
"INVOKE_NAME_END": DSML_INVOKE_NAME_END,
"INVOKE_END": DSML_INVOKE_END,
"PARAM_START": DSML_PARAM_START,
"PARAM_CLOSE": DSML_PARAM_CLOSE,
},
token_id_terminals={
+4 -1
View File
@@ -47,12 +47,14 @@ DSML_TOOL_END = f"</{_DSML}tool_calls>"
DSML_INVOKE_PREFIX = f'<{_DSML}invoke name="'
DSML_INVOKE_NAME_END = '">'
DSML_INVOKE_END = f"</{_DSML}invoke>"
DSML_PARAM_START = f"<{_DSML}parameter"
DSML_PARAM_CLOSE = f"</{_DSML}parameter>"
_ESCAPED_DSML = re.escape(_DSML)
_PARAM_RE = re.compile(
rf'<{_ESCAPED_DSML}parameter\s+name="([^"]+)"\s+string="(true|false)">'
rf"(.*?)</{_ESCAPED_DSML}parameter>",
rf"(.*?)"
rf"(?:</{_ESCAPED_DSML}parameter>|(?=<{_ESCAPED_DSML}parameter\s+name=))",
re.DOTALL,
)
_PARTIAL_PARAM_RE = re.compile(
@@ -134,6 +136,7 @@ def deepseek_v4_config(thinking: bool = False) -> ParserEngineConfig:
"INVOKE_PREFIX": DSML_INVOKE_PREFIX,
"INVOKE_NAME_END": DSML_INVOKE_NAME_END,
"INVOKE_END": DSML_INVOKE_END,
"PARAM_START": DSML_PARAM_START,
"PARAM_CLOSE": DSML_PARAM_CLOSE,
},
token_id_terminals={