Merge pull request #191 from EvanProgramming/codex/issue-190-parse-deepseek-dsml

fix: parse DeepSeek DSML tool calls

Author: EvanProgramming

main.py

@@ -66,6 +66,7 @@ def _terminal_supports_unicode() -> bool:
 else:               _SPINNER_FRAMES = ["/", "-", "\\", "|"];             _BAR_FILL = "#"; _BAR_EMPTY = "."; _CHECK = "+"; _CIRCLE = "o"; _HALF = ">"; _BOX_TL = "+"; _BOX_H = "-"; _BOX_BL = "+"; _BOX_V = "|"; _DOT = "."; _NBHYPHEN = "-"
 
 import ast
+import html
 import json
 import os
 import queue
@@ -3658,6 +3659,26 @@ def _add(data: dict) -> None:
                 and len(obj) <= 3):  # action, args + optionally one more key
             _add(obj)
 
+    marker = r"(?:｜｜DSML｜｜|｜DSML｜|\|\|DSML\|\||\|DSML\|)"
+    invoke_pattern = re.compile(
+        rf"<{marker}\s*invoke\s+name=[\"'](?P<name>[^\"']+)[\"'][^>]*>"
+        rf"(?P<body>[\s\S]*?)</{marker}\s*invoke\s*>",
+        re.IGNORECASE,
+    )
+    parameter_pattern = re.compile(
+        rf"<{marker}\s*parameter\s+name=[\"'](?P<name>[^\"']+)[\"'][^>]*>"
+        rf"(?P<value>[\s\S]*?)</{marker}\s*parameter\s*>",
+        re.IGNORECASE,
+    )
+    for invoke in invoke_pattern.finditer(text):
+        parameters = list(parameter_pattern.finditer(invoke.group("body")))
+        raw_action = invoke.group("name").strip().lower()
+        if (len(parameters) == 1 and parameters[0].group("name").strip().lower() == "args"
+                and _is_valid_action(raw_action)):
+            args = html.unescape(parameters[0].group("value").strip())
+            if args:
+                _add({"action": TOOL_ALIASES.get(raw_action, raw_action), "args": args})
+
     for data in _collect_unwrapped_tool_calls(text)[0]:
         if _is_valid_action(data.get("action")):
             _add(data)

tests/test_task_consistency.py

@@ -735,6 +735,23 @@ def test_unwrapped_provider_aliases_are_bounded_and_canonicalized(self):
             main._collect_tool_calls("run_cmd:\n```bash\nprintf newline-fence\n```")[-1],
             {"action": "run_cmd", "args": "printf newline-fence"},
         )
+        dsml = (
+            '<｜｜DSML｜｜ calls><｜｜DSML｜｜ invoke name="execute_terminal_command">'
+            '<｜｜DSML｜｜ parameter name="args" string="true">'
+            'curl http://127.0.0.1:8765/?a=1&amp;b=2'
+            '</｜｜DSML｜｜ parameter></｜｜DSML｜｜ invoke></｜｜DSML｜｜ calls>'
+        )
+        self.assertEqual(
+            main._collect_tool_calls(dsml),
+            [{"action": "execute_terminal_command", "args": "curl http://127.0.0.1:8765/?a=1&b=2"}],
+        )
+        self.assertEqual(main._collect_tool_calls(dsml.replace("｜｜DSML｜｜", "｜DSML｜")), [
+            {"action": "execute_terminal_command", "args": "curl http://127.0.0.1:8765/?a=1&b=2"},
+        ])
+        self.assertEqual(main._collect_tool_calls(dsml.replace(
+            '</｜｜DSML｜｜ parameter>',
+            '</｜｜DSML｜｜ parameter><｜｜DSML｜｜ parameter name="path">x</｜｜DSML｜｜ parameter>',
+        )), [])
 
         malformed = main._parse_model_response("run_cmd: ```bash\nprintf alias-ok")
         self.assertEqual(malformed["tool_calls"], [])