[Bugfix][Parser] Stream Gemma4 string tool arguments incrementally (#61494)

Signed-off-by: Ben Browning <56071+bbrowning@users.noreply.github.com>
Co-authored-by: Flora Feng <4florafeng@gmail.com>
This commit is contained in:
Ben Browning
2026-10-14 21:25:41 +00:00
committed by GitHub
co-authored by Flora Feng
parent 984c242ede
commit 4c5ea86f53
5 changed files with 369 additions and 22 deletions
+51
View File
@@ -1685,6 +1685,57 @@ class TestArgDeltaWithConverter:
]
# ── TestArgValueExtender ──────────────────────────────────────────
def _extender_config(structural: frozenset[str] | None = None) -> ParserEngineConfig:
"""``_kv_converter`` plus an extender for its trailing ``k=v`` record,
which is open until whitespace follows it; mirrors
``_glm47_arg_value_extender``."""
def factory(raw_args: str):
if re.search(r"\w+=\S+$", raw_args) is None:
return None
def extend(delta: str) -> str | None:
if re.search(r"\s", delta):
return None
return json.dumps(delta, ensure_ascii=False)[1:-1]
return extend
return dataclasses.replace(
_converter_config(),
arg_value_extender=factory,
arg_structural_chars=structural,
)
class TestArgValueExtender:
"""Engine contract for ``ParserEngineConfig.arg_value_extender``."""
def test_live_extender_sees_deltas_without_structural_chars(self):
"""A delta without structural chars must still reach the live
extender: gating it out drops ``el`` from the streamed value and the
next accepted delta ``l=`` lands on the gap, so the converted JSON
no longer extends what was streamed."""
engine = _make_engine(_extender_config(structural=frozenset("= ")))
assert _run_streaming_tool(engine, "f", ["a", "=h", "el", "l=", "o "]) == {
"a": "hell=o"
}
@pytest.mark.parametrize(
"overrides",
[
{"arg_converter": None},
{"stream_arg_deltas": False},
],
)
def test_extender_requires_streaming_conversion(self, overrides):
with pytest.raises(ValueError, match="arg_value_extender"):
dataclasses.replace(_extender_config(), **overrides)
# ── TestSafeArgPrefix ────────────────────────────────────────────