mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-09 03:13:19 +08:00
oliver
289cac4dd6
Add dsml_tool_parse per upstream HF encoding README (invoke/parameter, string true|false, JSON for non-strings). Normalize <||DSML|| gateways. Wire into run_oclaw_direct_loop when AIA_DSML_TEXT_TOOLS is on or base_url/model suggests DeepSeek; skip DSML repair retry in that mode. Strip the first tool_calls block from persisted assistant body. Finalize pass keeps DSML disabled so no tools run after the no-tool round. Tests cover parser variants and direct_loop execution for DeepSeek URL and forced env. Co-authored-by: Cursor <cursoragent@cursor.com>
65 lines
2.2 KiB
Python
65 lines
2.2 KiB
Python
from __future__ import annotations
|
|
|
|
from oclaw.runtime.dsml_tool_parse import (
|
|
normalize_dsml_markup,
|
|
strip_first_dsml_tool_calls_block,
|
|
try_parse_deepseek_v4_dsml_tool_calls,
|
|
)
|
|
|
|
|
|
def test_normalize_ascii_pipe_variant() -> None:
|
|
raw = "<||DSML||tool_calls>x</||DSML||tool_calls>"
|
|
n = normalize_dsml_markup(raw)
|
|
assert "\uFF5cDSML\uFF5c" in n
|
|
|
|
|
|
def test_parse_official_delimiters_single_invoke() -> None:
|
|
p = "\uFF5c"
|
|
text = (
|
|
f"prefix\n<{p}DSML{p}tool_calls>\n"
|
|
f"<{p}DSML{p}invoke name=\"run_command\">\n"
|
|
f"<{p}DSML{p}parameter name=\"command\" string=\"true\">echo hi</{p}DSML{p}parameter>\n"
|
|
f"</{p}DSML{p}invoke>\n"
|
|
f"</{p}DSML{p}tool_calls>\nsuffix"
|
|
)
|
|
calls = try_parse_deepseek_v4_dsml_tool_calls(text)
|
|
assert calls is not None and len(calls) == 1
|
|
assert calls[0].name == "run_command"
|
|
assert calls[0].arguments == {"command": "echo hi"}
|
|
|
|
|
|
def test_parse_pipe_variant_and_json_param() -> None:
|
|
text = (
|
|
"<||DSML||tool_calls>\n"
|
|
"<||DSML||invoke name=\"echo_tool\">\n"
|
|
"<||DSML||parameter name=\"x\" string=\"false\">42</||DSML||parameter>\n"
|
|
"</||DSML||invoke>\n"
|
|
"</||DSML||tool_calls>"
|
|
)
|
|
calls = try_parse_deepseek_v4_dsml_tool_calls(text)
|
|
assert calls is not None and len(calls) == 1
|
|
assert calls[0].name == "echo_tool"
|
|
assert calls[0].arguments["x"] == 42
|
|
|
|
|
|
def test_parse_two_invokes() -> None:
|
|
text = (
|
|
"<||DSML||tool_calls>\n"
|
|
"<||DSML||invoke name=\"a\"></||DSML||invoke>\n"
|
|
"<||DSML||invoke name=\"b\"></||DSML||invoke>\n"
|
|
"</||DSML||tool_calls>"
|
|
)
|
|
calls = try_parse_deepseek_v4_dsml_tool_calls(text)
|
|
assert calls is not None and [c.name for c in calls] == ["a", "b"]
|
|
|
|
|
|
def test_strip_removes_block_keeps_prefix() -> None:
|
|
text = "hello\n<||DSML||tool_calls>\n<||DSML||invoke name=\"x\"></||DSML||invoke>\n</||DSML||tool_calls>\n"
|
|
s = strip_first_dsml_tool_calls_block(text)
|
|
assert s is not None
|
|
assert "hello" in s
|
|
assert "tool_calls" not in s
|
|
|
|
|
|
def test_malformed_returns_none() -> None:
|
|
assert try_parse_deepseek_v4_dsml_tool_calls("<||DSML||tool_calls>broken") is None
|