From 974cb04f3ffad53fe6c05bc59be6c1578b4ae836 Mon Sep 17 00:00:00 2001 From: "Sharad." Date: Thu, 10 Sep 2026 12:44:03 +0530 Subject: [PATCH] fix: strip DeepSeek DSML tool-call markers from assistant content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DeepSeek's DSML protocol injects tool-call routing markers (e.g. <‖DSML‖tool_calls>, <‖DSML‖invoke ...>) into the content stream before the actual tool_calls delta arrives. These markers leak into the UI when tool calls fail or are not parsed in time. This adds _strip_dsml_markers() — a fast regex filter applied to every content chunk yielded by _parse_openai_sse(). The guard short-circuits on chunks that don't contain 'DSML' so there is zero overhead on non-DeepSeek streams. Closes #804 --- llmcore.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/llmcore.py b/llmcore.py index 423503248..e39d70ea3 100644 --- a/llmcore.py +++ b/llmcore.py @@ -236,6 +236,20 @@ def _try_parse_tool_args(raw): return parsed return [{"_raw": raw}] +_DSML_PATTERN = re.compile( + r"<‖DSML‖[^>]*>" # Full-width ‖ variant (DeepSeek primary) + r"|<\uff5cDSML\uff5c[^>]*>" # Unicode fullwidth ｜ variant + r"|<\|DSML\|[^>]*>" # ASCII pipe fallback + r"|\uff5c\uff5cDSML\uff5c\uff5c[^>]*>", # Double-escaped variant + re.IGNORECASE +) + +def _strip_dsml_markers(text: str) -> str: + """Remove DeepSeek DSML tool-call markers that leak into content text.""" + if not text or "DSML" not in text: + return text + return _DSML_PATTERN.sub("", text) + def _parse_openai_sse(resp_lines, api_mode="chat_completions"): """Parse OpenAI SSE stream (chat_completions or responses API). Yields text chunks, returns list[content_block]. @@ -255,10 +269,10 @@ def _parse_openai_sse(resp_lines, api_mode="chat_completions"): etype = evt.get("type", "") if etype == "response.output_text.delta": delta = evt.get("delta", "") - if delta: seen_delta = True; content_text += delta; yield delta + if delta: seen_delta = True; content_text += delta; yield _strip_dsml_markers(delta) elif etype == "response.output_text.done" and not seen_delta: text = evt.get("text", "") - if text: content_text += text; yield text + if text: content_text += text; yield _strip_dsml_markers(text) elif etype == "response.reasoning_text.delta": delta = evt.get("delta", "") if delta: reasoning_text += delta @@ -307,7 +321,7 @@ def _parse_openai_sse(resp_lines, api_mode="chat_completions"): break blocks = [] if reasoning_text: blocks.append({"type": "thinking", "thinking": reasoning_text}) - if content_text: blocks.append({"type": "text", "text": content_text}) + if content_text: blocks.append({"type": "text", "text": _strip_dsml_markers(content_text)}) for idx in sorted(fc_buf): fc = fc_buf[idx] inps = _try_parse_tool_args(fc["args"]) @@ -332,7 +346,7 @@ def _parse_openai_sse(resp_lines, api_mode="chat_completions"): if rc := delta.get("reasoning_content") or delta.get("reasoning", ""): reasoning_text += rc; yield rc if delta.get("content"): - text = delta["content"]; content_text += text; yield text + text = delta["content"]; content_text += text; yield _strip_dsml_markers(text) for tc in (delta.get("tool_calls") or []): idx = tc.get("index", 0) has_name = bool(tc.get("function", {}).get("name")) @@ -346,7 +360,7 @@ def _parse_openai_sse(resp_lines, api_mode="chat_completions"): if usage: _record_usage(usage, api_mode) blocks = [] if reasoning_text: blocks.append({"type": "thinking", "thinking": reasoning_text}) - if content_text: blocks.append({"type": "text", "text": content_text}) + if content_text: blocks.append({"type": "text", "text": _strip_dsml_markers(content_text)}) for idx in sorted(tc_buf): tc = tc_buf[idx] inps = _try_parse_tool_args(tc["args"])