fix: tool-block parsing crashes on a non-string input (#1628)

This commit is contained in:
Afonso Coutinho
2026-06-03 00:59:42 +01:00
committed by GitHub
parent d818117d4c
commit 3175d7ca21
2 changed files with 21 additions and 0 deletions

View File

@@ -69,6 +69,8 @@ _TOOL_CODE_RE = re.compile(
# fullwidth (U+FF5C) and ascii '|' in any count.
_DSML_PIPES = r"[|]+"
def _normalize_dsml(text: str) -> str:
if not isinstance(text, str):
return ""
if "DSML" not in text:
return text
t = text

View File

@@ -0,0 +1,19 @@
"""Regression: tool-block parsing must tolerate a non-string input.
`_normalize_dsml` did `if "DSML" not in text` (TypeError on None) and the public
`parse_tool_blocks`/`strip_tool_blocks` then ran regexes on it. Coercing a
non-string to "" in `_normalize_dsml` makes the whole chain safe.
"""
import src.agent_tools # noqa: F401 (break agent_tools<->tool_parsing import cycle)
from src.tool_parsing import _normalize_dsml, parse_tool_blocks, strip_tool_blocks
def test_non_string_does_not_crash():
assert _normalize_dsml(None) == ""
assert parse_tool_blocks(None) == []
assert strip_tool_blocks(None) == ""
def test_plain_text_passes_through():
assert strip_tool_blocks("hello world") == "hello world"
assert parse_tool_blocks("no tools here") == []