echotools 2.3.11__tar.gz → 2.3.12__tar.gz

{echotools-2.3.11 → echotools-2.3.12}/PKG-INFO

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

{echotools-2.3.11 → echotools-2.3.12}/pyproject.toml

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

{echotools-2.3.11 → echotools-2.3.12}/src/echotools/exec/fncall/protocols/entml.py

@@ -9,44 +9,35 @@ from __future__ import annotations
 
 from typing import Any, Dict, List, Optional, Tuple
 
-from echotools.exec.fncall.prompt.templates import (
-    _HISTORY_CLARIFY_EN,
-    _HISTORY_CLARIFY_ZH,
-)
+from echotools.exec.fncall.prompt.templates import _HISTORY_CLARIFY_EN
 from echotools.exec.fncall.protocols.entml_invoke import (
     format_entml_tool_calls,
     parse_entml_tool_calls,
 )
 from echotools.exec.fncall.protocols.entml_patterns import BLOCK_RE
 from echotools.exec.fncall.protocols.entml_thinking import build_entml_thinking_section
+from echotools.exec.fncall.protocols.entml_tools import format_entml_tool_descs
 from echotools.exec.fncall.shared.coercion import _build_param_schema_index
 from echotools.exec.fncall.shared.normalization import normalize_tool_calls
 from echotools.exec.protocol.base import ToolProtocol
 
 _ENTML_INSTRUCTION = """\
-## Function Definitions
-
-All functions are defined inside a `<functions>` wrapper block. Each function is a JSON object inside a `<function>` tag containing `description`, `name`, and `parameters` (JSON Schema).
-
-**Function Invocation Syntax:**
-
-When calling tools, respond with ONLY the following XML block format:
+In this environment you have access to a set of tools you can use to answer the user's question.
+You can invoke functions by writing a "<entml:function_calls>" block like the following as part of your reply to the user:
 
 <entml:function_calls>
-<entml:invoke name="tool_name">
-<entml:parameter name="param_name">value</entml:parameter>
+<entml:invoke name="$FUNCTION_NAME">
+<entml:parameter name="$PARAMETER_NAME">$PARAMETER_VALUE</entml:parameter>
+...
+</entml:invoke>
+<entml:invoke name="$FUNCTION_NAME2">
+...
 </entml:invoke>
 </entml:function_calls>
 
-String and scalar parameters should be specified as-is, while lists and objects should use JSON format.
+String and scalar parameters should be specified as is, while lists and objects should use JSON format.
 
-Multiple invocations can be stacked inside one `<entml:function_calls>` block for parallel execution.
-
-## Function Call Instructions
-
-Answer the user's request using the relevant tool(s), if they are available. Check that all required parameters are provided or can reasonably be inferred from context. If there are no relevant tools or missing required parameter values, ask the user. If the user provides a specific value for a parameter (e.g., in quotes), use that value EXACTLY. Do NOT make up values for or ask about optional parameters.
-
-If you intend to call multiple tools and there are no dependencies between the calls, make all independent calls in the same function_calls block. Otherwise, wait for previous calls to finish to determine dependent values (do NOT use placeholders or guess missing parameters).
+Here are the functions available in JSONSchema format:
 """
 
 
@@ -84,6 +75,10 @@ class EntmlProtocol(ToolProtocol):
     def get_trigger_tags(self) -> List[str]:
         return [self._TRIGGER]
 
+    @staticmethod
+    def format_tool_descs(tools: List[Dict[str, Any]]) -> str:
+        return format_entml_tool_descs(tools)
+
     def render_prompt(
         self,
         tool_descs: str,
@@ -94,11 +89,11 @@ class EntmlProtocol(ToolProtocol):
         current_user_message: str = "",
         protocol_options: Optional[Dict[str, Any]] = None,
     ) -> str:
-        sections: List[str] = [_ENTML_INSTRUCTION]
+        sections: List[str] = [_ENTML_INSTRUCTION + tool_descs]
+
         thinking_section = build_entml_thinking_section(protocol_options)
         if thinking_section:
             sections.append(thinking_section)
-        sections.append("<functions>\n" + tool_descs + "\n</functions>")
 
         if user_system_prompt and user_system_prompt.strip():
             sections.append(
@@ -106,9 +101,8 @@ class EntmlProtocol(ToolProtocol):
             )
 
         if history_text:
-            clarify = _HISTORY_CLARIFY_ZH if lang == "zh" else _HISTORY_CLARIFY_EN
             sections.append(
-                format_entml_conversation_history(history_text, clarify)
+                format_entml_conversation_history(history_text, _HISTORY_CLARIFY_EN)
             )
 
         if loop_warning:

{echotools-2.3.11 → echotools-2.3.12}/src/echotools/exec/fncall/protocols/entml_thinking.py

@@ -14,7 +14,7 @@ def build_entml_thinking_section(
     if thinking_mode is None and max_thinking_length is None:
         return ""
 
-    lines = ["## Thinking", ""]
+    lines: list[str] = []
     if thinking_mode is not None:
         mode = str(thinking_mode).strip()
         if mode:
@@ -30,12 +30,24 @@ def build_entml_thinking_section(
             [
                 "",
                 "If the thinking_mode is interleaved or auto, then after function "
-                "results you should strongly consider outputting a thinking block "
-                "before continuing:",
+                "results you should strongly consider outputting a thinking block. "
+                "Here is an example:",
+                "",
+                "<entml:function_calls>",
+                "...",
+                "</entml:function_calls>",
+                "",
+                "<function_results>",
+                "...",
+                "</function_results>",
                 "",
                 "<entml:thinking>",
-                "...thinking about results...",
+                "...thinking about results",
                 "</entml:thinking>",
+                "Whenever you have the result of a function call, think carefully "
+                "about whether an `<entml:thinking>` `</entml:thinking>` block "
+                "would be appropriate and strongly prefer to output a thinking "
+                "block if you are uncertain.",
             ]
         )
 

echotools-2.3.12/src/echotools/exec/fncall/protocols/entml_tools.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+import json
+from typing import Any, Dict, List
+
+__all__ = ["format_entml_tool_descs"]
+
+
+def format_entml_tool_descs(tools: List[Dict[str, Any]]) -> str:
+    """将工具列表格式化为 **name** + JSON Schema 代码块（对齐 entml/antml 示范）。"""
+    if not tools:
+        return ""
+
+    blocks: List[str] = []
+    for tool in tools:
+        fn = tool.get("function", tool)
+        name = str(fn.get("name") or "unknown")
+        payload = {
+            "description": fn.get("description") or "",
+            "name": name,
+            "parameters": fn.get("parameters")
+            or {"type": "object", "properties": {}},
+        }
+        body = json.dumps(payload, ensure_ascii=False, indent=2)
+        blocks.append(f"**{name}**\n\n```json\n{body}\n```")
+    return "\n\n".join(blocks)

{echotools-2.3.11 → echotools-2.3.12}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.11 → echotools-2.3.12}/src/echotools.egg-info/SOURCES.txt

@@ -58,6 +58,7 @@ src/echotools/exec/fncall/protocols/entml.py
 src/echotools/exec/fncall/protocols/entml_invoke.py
 src/echotools/exec/fncall/protocols/entml_patterns.py
 src/echotools/exec/fncall/protocols/entml_thinking.py
+src/echotools/exec/fncall/protocols/entml_tools.py
 src/echotools/exec/fncall/protocols/entml_values.py
 src/echotools/exec/fncall/shared/__init__.py
 src/echotools/exec/fncall/shared/coercion.py

{echotools-2.3.11 → echotools-2.3.12}/src/tests/test_entml_protocol.py

@@ -91,6 +91,28 @@ def test_inject_with_history_entml_tags() -> None:
     assert "<entml:current_user_message>\nnew\n</entml:current_user_message>" in content
 
 
+def test_entml_history_clarify_always_english() -> None:
+    proto = get_protocol("entml")
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "search",
+                "description": "Search",
+                "parameters": {"type": "object", "properties": {}},
+            },
+        }
+    ]
+    msgs = [
+        {"role": "user", "content": "old"},
+        {"role": "assistant", "content": "ok"},
+        {"role": "user", "content": "new"},
+    ]
+    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
+
+
 @pytest.mark.parametrize(
     "raw,schema,expected",
     [
@@ -109,10 +131,8 @@ def test_coerce_entml_parameter_value(raw, schema, expected) -> None:
 
 
 def test_entml_instruction_matches_spec_format() -> None:
-    """示范格式：<entml:function_calls> + <entml:invoke> + <entml:parameter>."""
+    """示范格式：环境说明 + JSONSchema 工具块 + entml 调用标签。"""
     proto = get_protocol("entml")
-    from echotools.exec.fncall.shared.normalization import format_tool_descs
-
     tools = [
         {
             "type": "function",
@@ -134,17 +154,28 @@ def test_entml_instruction_matches_spec_format() -> None:
         }
     ]
     prompt = proto.render_prompt(
-        tool_descs=format_tool_descs(tools),
+        tool_descs=proto.format_tool_descs(tools),
         lang="en",
         current_user_message="pick one",
+        protocol_options={
+            "thinking_mode": "interleaved",
+            "max_thinking_length": 22000,
+        },
     )
+    assert "In this environment you have access to a set of tools" in prompt
+    assert "Here are the functions available in JSONSchema format:" in prompt
+    assert "**ask_user_input_v0**" in prompt
+    assert '"name": "ask_user_input_v0"' in prompt
     assert "<entml:function_calls>" in prompt
-    assert '<entml:invoke name="' in prompt
-    assert '<entml:parameter name="' in prompt
-    assert "String and scalar parameters should be specified as-is" in prompt
+    assert '<entml:invoke name="$FUNCTION_NAME">' in prompt
+    assert '<entml:parameter name="$PARAMETER_NAME">' in prompt
+    assert "String and scalar parameters should be specified as is" in prompt
+    assert "<entml:thinking_mode>interleaved</entml:thinking_mode>" in prompt
+    assert "<entml:max_thinking_length>22000</entml:max_thinking_length>" in prompt
+    assert "<function_results>" in prompt
     assert "<entml:conversation_history>" not in prompt
     assert "<entml:history>" not in prompt
-    assert "<entml:thinking_mode>" not in prompt
+    assert "<functions>" not in prompt
 
 
 def test_entml_roundtrip_parameter_format() -> None: