echotools 2.3.30__tar.gz → 2.3.31__tar.gz

{echotools-2.3.30 → echotools-2.3.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.30
+Version: 2.3.31
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
 License: MIT

{echotools-2.3.30 → echotools-2.3.31}/pyproject.toml

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

{echotools-2.3.30 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/history_format.py

@@ -15,6 +15,17 @@ from .prompt_helpers import (
 )
 
 
+def history_contains_tool_calls(messages: List[Dict[str, Any]]) -> bool:
+    """历史消息中是否包含 assistant tool_calls 或 tool 结果。"""
+    for m in messages:
+        role = m.get("role") or "user"
+        if role == "assistant" and m.get("tool_calls"):
+            return True
+        if role == "tool":
+            return True
+    return False
+
+
 def _format_conversation_history(
     messages: List[Dict[str, Any]],
     protocol: Optional[Any] = None,

{echotools-2.3.30 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/inject.py

@@ -12,6 +12,7 @@ from echotools.exec.fncall.prompt.history import (
 )
 from echotools.exec.fncall.prompt.history_format import (
     _format_conversation_history,
+    history_contains_tool_calls,
 )
 from echotools.exec.fncall.prompt.prompt_helpers import (
     build_no_tools_prompt,
@@ -61,6 +62,7 @@ def build_tools_prompt(
     current_user_message: str,
     loop_detection_threshold: int,
     protocol_options: Optional[Dict[str, Any]] = None,
+    history_has_tool_calls: bool = False,
 ) -> str:
     loop_warning = ""
     if loop_detection_threshold > 0:
@@ -77,6 +79,8 @@ def build_tools_prompt(
         if protocol_options is not None and protocol.id == "entml"
         else {}
     )
+    if protocol.id == "entml":
+        extra["history_has_tool_calls"] = history_has_tool_calls
     return protocol.render_prompt(
         tool_descs=tool_descs,
         lang=lang,
@@ -133,6 +137,7 @@ def inject_fncall(
     prompt = build_tools_prompt(
         protocol, tools, normalized, lang, user_system_prompt,
         history_text, current_user_message, loop_detection_threshold, protocol_options,
+        history_has_tool_calls=history_contains_tool_calls(history_messages),
     )
     if dump_prompt:
         _maybe_dump_prompt(prompt, dump_dir)

{echotools-2.3.30 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/templates.py

@@ -118,6 +118,15 @@ _HISTORY_CLARIFY_EN = (
     "The user's latest message follows below."
 )
 
+_HISTORY_TOOL_INVOKE_REMINDER_EN = (
+    "Reminder — tool notation in the conversation history above: prior tool "
+    "calls appear as compact pseudocode (e.g. `[function_name(arg=\"value\")]` "
+    "and optional `→ Result:` / `→ Error:` lines). That transcript is for "
+    "context only; it is not parsed and must not be copied. To invoke a tool "
+    "in your reply, output a valid `<entml:invoke>` block exactly as specified "
+    "in the tool instructions at the top of this prompt."
+)
+
 _HISTORY_CLARIFY_ZH = (
     "以下是已完成的交互记录。"
     "此处展示的所有工具调用及其结果均已执行完毕，请勿重复调用。"

{echotools-2.3.30 → echotools-2.3.31}/src/echotools/exec/fncall/protocols/entml.py

@@ -10,7 +10,10 @@ from __future__ import annotations
 import json as _json
 from typing import Any, Dict, List, Optional, Tuple
 
-from echotools.exec.fncall.prompt.templates import _HISTORY_CLARIFY_EN
+from echotools.exec.fncall.prompt.templates import (
+    _HISTORY_CLARIFY_EN,
+    _HISTORY_TOOL_INVOKE_REMINDER_EN,
+)
 from echotools.exec.fncall.protocols.entml_invoke import (
     format_entml_tool_calls,
     parse_entml_tool_calls,
@@ -117,6 +120,7 @@ class EntmlProtocol(ToolProtocol):
         loop_warning: str = "",
         current_user_message: str = "",
         protocol_options: Optional[Dict[str, Any]] = None,
+        history_has_tool_calls: bool = False,
     ) -> str:
         if tool_descs:
             sections: List[str] = [
@@ -138,6 +142,8 @@ class EntmlProtocol(ToolProtocol):
             sections.append(
                 format_entml_conversation_history(history_text, _HISTORY_CLARIFY_EN)
             )
+            if tool_descs and history_has_tool_calls:
+                sections.append(_HISTORY_TOOL_INVOKE_REMINDER_EN)
 
         if loop_warning:
             sections.append(f"<loop_warning>\n{loop_warning}\n</loop_warning>")

{echotools-2.3.30 → echotools-2.3.31}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.30
+Version: 2.3.31
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
 License: MIT

{echotools-2.3.30 → echotools-2.3.31}/src/tests/test_entml_protocol.py

@@ -207,6 +207,49 @@ def test_entml_history_clarify_always_english() -> None:
     content = inject_fncall(msgs, tools, proto, lang="zh")[0]["content"]
     assert "The following is a transcript of completed interactions." in content
     assert "以下是已完成的交互记录" not in content
+    assert "Reminder — tool notation in the conversation history above" not in content
+
+
+def test_entml_history_tool_invoke_reminder_when_tools_in_history() -> None:
+    proto = get_protocol("entml")
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "search",
+                "description": "Search",
+                "parameters": {
+                    "type": "object",
+                    "properties": {"query": {"type": "string"}},
+                },
+            },
+        }
+    ]
+    msgs = [
+        {"role": "user", "content": "find docs"},
+        {
+            "role": "assistant",
+            "content": "",
+            "tool_calls": [{
+                "id": "call_1",
+                "type": "function",
+                "function": {
+                    "name": "search",
+                    "arguments": json.dumps({"query": "docs"}),
+                },
+            }],
+        },
+        {"role": "tool", "tool_call_id": "call_1", "content": "found 3"},
+        {"role": "user", "content": "summarize"},
+    ]
+    content = inject_fncall(msgs, tools, proto)[0]["content"]
+    assert "[search(query=\"docs\")]" in content
+    assert "Reminder — tool notation in the conversation history above" in content
+    assert "output a valid `<entml:invoke>` block" in content
+    hist_idx = content.index("<entml:conversation_history>")
+    reminder_idx = content.index("Reminder — tool notation")
+    user_idx = content.index("<current_user_message>")
+    assert hist_idx < reminder_idx < user_idx
 
 
 @pytest.mark.parametrize(