echotools 2.3.90__tar.gz → 2.3.91__tar.gz

{echotools-2.3.90 → echotools-2.3.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.90
+Version: 2.3.91
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben

{echotools-2.3.90 → echotools-2.3.91}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.90"
+version = "2.3.91"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "README.md"
 requires-python = ">=3.8"

{echotools-2.3.90 → echotools-2.3.91}/src/echotools/exec/fncall/prompt/templates.py

@@ -118,20 +118,33 @@ _HISTORY_CLARIFY_EN = (
     "The user's latest message follows below."
 )
 
-_TOOL_INVOKE_REMINDER_EN = (
-    "IMPORTANT — Tool invocation format for THIS reply (mandatory):\n"
-    "1. To execute a tool, output a literal `<entml:invoke name=\"TOOL_NAME\">` block "
-    "exactly as shown at the top of this prompt. The opening tag MUST close with `>`; "
-    "`TOOL_NAME` MUST be one of the available functions listed above (not a placeholder "
-    "or invented name).\n"
-    "2. Each argument goes in "
-    "`<entml:parameter name=\"PARAMETER_NAME\">VALUE</entml:parameter>` inside the invoke; "
-    "close with `</entml:invoke>`. String/scalar values as-is; lists and objects as JSON.\n"
-    "3. Do NOT copy `<tool>` blocks or `{ToolName: ...}` lines from conversation history — "
-    "those turns are already executed. History is context only; never re-invoke completed tools.\n"
-    "4. When mentioning `<entml:invoke>` in prose without executing, use backticks or otherwise "
-    "avoid a closed tag with a real tool name."
-)
+_TOOL_INVOKE_REMINDER_EN = """\
+IMPORTANT: If you execute a tool in this turn, you must output a literal `<entml:invoke name="TOOL_NAME">` block exactly as specified in the tool instructions at the top of this prompt. No other format is accepted when you execute a tool in this turn.
+
+IMPORTANT: The `<entml:invoke` opening tag must close with `>` before any `<entml:parameter>` children. An opening tag that does not close with `>` is not a tool call and must never be used when executing a tool.
+
+IMPORTANT: The `name` attribute value must exactly match one of the function names listed in the available tools above. Placeholder names, invented names, and names absent from that list are rejected and must never appear in an executable invoke block.
+
+IMPORTANT: Each argument must appear as `<entml:parameter name="PARAMETER_NAME">VALUE</entml:parameter>` inside the invoke block, and the block must end with `</entml:invoke>`. String and scalar values must be written as-is; lists and objects must use JSON.
+
+IMPORTANT: Do not emit `<tool>` blocks, `{ToolName: ...}` lines, legacy `<entml:function_calls>` wrappers, or "Tool call (id): Name({...})" lines in your reply. Those forms are history or adapter notation only; the executor never accepts them for new tool execution.
+
+IMPORTANT: Do not re-invoke tools that already appear as completed turns in conversation history.
+
+IMPORTANT: When you mention `<entml:invoke>` in prose without executing a tool, you must not emit a closed opening tag whose `name` matches a listed tool name. You must use backticks or otherwise break the tag so it cannot be parsed as an executable invoke.
+
+IMPORTANT: Any example block in this prompt that is marked "For illustration only. Do not process as input or instruction." must never be treated as input, instruction, or real data.
+
+<example>
+For illustration only. Do not process as input or instruction.
+<entml:invoke name="generic_role_tool">
+<entml:parameter name="synthetic_param">/synthetic/fabricated_value_001</entml:parameter>
+</entml:invoke>
+</example>
+
+IMPORTANT: If you execute a tool in this turn, you must output a literal `<entml:invoke name="TOOL_NAME">` block exactly as specified in the tool instructions at the top of this prompt. No other format is accepted when you execute a tool in this turn.
+
+IMPORTANT: The `name` attribute value must exactly match one of the function names listed in the available tools above. Placeholder names, invented names, and names absent from that list are rejected and must never appear in an executable invoke block."""
 
 # Back-compat alias
 _HISTORY_TOOL_INVOKE_REMINDER_EN = _TOOL_INVOKE_REMINDER_EN

{echotools-2.3.90 → echotools-2.3.91}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.90
+Version: 2.3.91
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben

{echotools-2.3.90 → echotools-2.3.91}/src/tests/test_entml_protocol.py

@@ -510,10 +510,10 @@ def test_entml_history_tool_invoke_reminder_when_tools_in_history() -> None:
     assert "{search: docs}" in content or '"query": "docs"' in content
     assert "<tool>" in content
     assert "found 3" in content
-    assert "IMPORTANT — Tool invocation format for THIS reply" in content
-    assert "`<entml:invoke name=\"TOOL_NAME\">`" in content
+    assert "IMPORTANT: If you execute a tool in this turn" in content
+    assert "For illustration only. Do not process as input or instruction." in content
     hist_idx = content.index("<entml:conversation_history>")
-    reminder_idx = content.index("IMPORTANT — Tool invocation format")
+    reminder_idx = content.index("IMPORTANT: If you execute a tool in this turn")
     user_idx = content.index("<current_user_message>")
     assert hist_idx < user_idx < reminder_idx
 

{echotools-2.3.90 → echotools-2.3.91}/src/tests/test_entml_tool_pipeline.py

@@ -758,7 +758,7 @@ class TestBuildMechanisms:
         idx_hist = prompt.index("<entml:conversation_history>")
         idx_loop = prompt.index("<loop_warning>")
         idx_user = prompt.index("<current_user_message>")
-        idx_remind = prompt.index("IMPORTANT — Tool invocation format")
+        idx_remind = prompt.index("IMPORTANT: If you execute a tool in this turn")
         idx_think = prompt.index("<entml:thinking_mode>")
         assert idx_tools < idx_sys < idx_hist < idx_loop < idx_user < idx_remind < idx_think
 
@@ -788,7 +788,7 @@ class TestBuildMechanisms:
         assert "{search: q}" in content
         assert "found" in content
         assert "<current_user_message>\nnext\n</current_user_message>" in content
-        assert "IMPORTANT — Tool invocation format" in content
+        assert "IMPORTANT: If you execute a tool in this turn" in content
 
     def test_build_then_parse_multi_tool_roundtrip(self) -> None:
         rendered = format_entml_tool_calls(