echotools 2.4.4__tar.gz → 2.4.6__tar.gz

{echotools-2.4.4 → echotools-2.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.4.4
+Version: 2.4.6
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -58,7 +58,7 @@ Requires-Dist: ruff>=0.4.0; extra == "dev"
 
 通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
 
-完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.4**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.6**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 

{echotools-2.4.4 → echotools-2.4.6}/README.md

@@ -2,7 +2,7 @@
 
 通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
 
-完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.4**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.6**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 

{echotools-2.4.4 → echotools-2.4.6}/pyproject.toml

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

echotools-2.4.6/src/echotools/base/ids/__init__.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+"""ids 模块导出。"""
+
+from echotools.base.ids.generator import gen_tool_id, short_id, span_id, trace_id, uuid7
+
+__all__ = ["uuid7", "short_id", "trace_id", "span_id", "gen_tool_id"]

{echotools-2.4.4 → echotools-2.4.6}/src/echotools/base/ids/generator.py

@@ -7,7 +7,7 @@ import struct
 import time
 import uuid
 
-__all__ = ["uuid7", "short_id", "trace_id", "span_id"]
+__all__ = ["uuid7", "short_id", "trace_id", "span_id", "gen_tool_id"]
 
 
 def uuid7() -> str:
@@ -60,3 +60,8 @@ def span_id() -> str:
         span_id 字符串。
     """
     return secrets.token_hex(8)
+
+
+def gen_tool_id() -> str:
+    """生成 Anthropic 兼容的 tool_use id（``toolu_`` + 24 位十六进制）。"""
+    return f"toolu_{uuid.uuid4().hex[:24]}"

{echotools-2.4.4 → echotools-2.4.6}/src/echotools/exec/fncall/__init__.py

@@ -15,6 +15,12 @@ from echotools.exec.fncall.shared.normalization import (
     normalize_tool_call,
     normalize_tool_calls,
 )
+from echotools.base.ids.generator import gen_tool_id
+from echotools.exec.fncall.tool_id import (
+    ensure_toolu_tool_call_id,
+    fix_tool_call_id,
+    is_placeholder_tool_call_id,
+)
 from echotools.exec.protocol.base import (
     ToolProtocol,
     get_protocol_by_id,
@@ -28,6 +34,10 @@ __all__ = [
     "normalize_content",
     "normalize_tool_call",
     "normalize_tool_calls",
+    "gen_tool_id",
+    "is_placeholder_tool_call_id",
+    "ensure_toolu_tool_call_id",
+    "fix_tool_call_id",
     "detect_tool_loop",
     "LoopDetectionResult",
     "ToolProtocol",

{echotools-2.4.4 → echotools-2.4.6}/src/echotools/exec/fncall/prompt/behavior_blocks.py

@@ -7,7 +7,9 @@ IMPORTANT: The <entml:funtions_results> block is a top-level block, independent
 
 IMPORTANT: The id-bearing comment following an invocation inside <entml:conversation_history> is written by the execution environment only when logging an already-completed turn. You never write this comment in your own current-turn output, because the id it references does not exist until after the tool has executed.
 
-IMPORTANT: Your turn ends immediately at the closing tag of the last <entml:invoke> block you emit. Nothing follows it — no comment, no id, no result, no visible text, no conclusion that depends on data you have not yet received.
+IMPORTANT: You never output an HTML comment of the form <!-- Tool Result ID:… --> anywhere in your current-turn reply. This includes lines such as <!-- Tool Result ID:toolu_376919369ffb428c9f76284f --> immediately after </entml:invoke>, on their own, or embedded in visible text. Only the execution environment writes Tool Result ID comments when logging completed turns into <entml:conversation_history>; imitating that pattern in live output is always wrong.
+
+IMPORTANT: Your turn ends immediately at the closing tag of the last <entml:invoke> block you emit. Nothing follows it — no comment, no id, no Tool Result ID HTML comment, no result, no visible text, no conclusion that depends on data you have not yet received.
 
 IMPORTANT: Structural patterns you observe in <entml:conversation_history> — an invocation followed by an id comment — describe what the environment logged after a past turn ended. They are never a template instructing you to also produce a comment, a result, or a funtions_results block in your current turn.
 

{echotools-2.4.4 → echotools-2.4.6}/src/echotools/exec/fncall/protocols/entml_tool/fakemarkup.py

@@ -29,6 +29,9 @@ _TAG_ONLY_OPEN_RES = (
     re.compile(r"<entml:call\b[^>]*>", re.IGNORECASE),
     re.compile(r"<function_calling_behavior\b[^>]*>", re.IGNORECASE),
     re.compile(r"<thinking_behavior\b[^>]*>", re.IGNORECASE),
+    re.compile(r"<function_results\b[^>]*>", re.IGNORECASE),
+    re.compile(r"<function_result\b[^>]*>", re.IGNORECASE),
+    re.compile(r"<redacted_thinking\b[^>]*>", re.IGNORECASE),
     re.compile(r"<entml:hard_constraint_restatement\b[^>]*>", re.IGNORECASE),
     re.compile(r"<entml:result\b[^>]*>", re.IGNORECASE),
     re.compile(r"<entml:todo\b[^>]*>", re.IGNORECASE),
@@ -40,6 +43,9 @@ _TAG_ONLY_CLOSE_RES = (
     re.compile(r"</entml:call\s*>", re.IGNORECASE),
     re.compile(r"</function_calling_behavior\s*>", re.IGNORECASE),
     re.compile(r"</thinking_behavior\s*>", re.IGNORECASE),
+    re.compile(r"</function_results\s*>", re.IGNORECASE),
+    re.compile(r"</function_result\s*>", re.IGNORECASE),
+    re.compile(r"</redacted_thinking\s*>", re.IGNORECASE),
     re.compile(r"</entml:hard_constraint_restatement\s*>", re.IGNORECASE),
     re.compile(r"</entml:result\s*>", re.IGNORECASE),
     re.compile(r"</entml:todo\s*>", re.IGNORECASE),
@@ -60,6 +66,12 @@ _FAKE_ENTML_TAG_PREFIXES: Tuple[str, ...] = (
     "</function_calling_behavior",
     "<thinking_behavior",
     "</thinking_behavior",
+    "<function_results",
+    "</function_results",
+    "<function_result",
+    "</function_result",
+    "<redacted_thinking",
+    "</redacted_thinking",
     "<entml:hard_constraint_restatement",
     "</entml:hard_constraint_restatement",
     "<entml:todo",

echotools-2.4.6/src/echotools/exec/fncall/tool_id.py

@@ -0,0 +1,42 @@
+"""Tool call id 生成与规范化（Anthropic ``toolu_`` 约定）。"""
+
+from __future__ import annotations
+
+from typing import Any, Dict
+
+from echotools.base.ids.generator import gen_tool_id
+
+_PLACEHOLDER_EXACT = frozenset({"", "call_0000", "toolu_call_0001"})
+_PLACEHOLDER_PREFIXES = ("call_", "toolu_call_")
+
+
+def is_placeholder_tool_call_id(raw_id: str) -> bool:
+    """echotools 解析占位 id（``call_0000`` / ``toolu_call_*`` 等）应视为无效。"""
+    if not raw_id or raw_id in _PLACEHOLDER_EXACT:
+        return True
+    return raw_id.startswith(_PLACEHOLDER_PREFIXES)
+
+
+def ensure_toolu_tool_call_id(raw_id: str) -> str:
+    """占位 id 换新；已有 id 无 ``toolu_`` 前缀则补上（Anthropic tool_use 输出）。"""
+    tid = (raw_id or "").strip()
+    if is_placeholder_tool_call_id(tid):
+        return gen_tool_id()
+    if not tid.startswith("toolu_"):
+        return f"toolu_{tid}"
+    return tid
+
+
+def fix_tool_call_id(tc: Dict[str, Any]) -> Dict[str, Any]:
+    """将 OpenAI 格式 tool call 的占位 id 替换为 ``gen_tool_id()`` 结果。"""
+    raw_id = str(tc.get("id") or "")
+    call_id = gen_tool_id() if is_placeholder_tool_call_id(raw_id) else raw_id
+    func = tc.get("function") or {}
+    return {
+        "id": call_id,
+        "type": "function",
+        "function": {
+            "name": func.get("name", ""),
+            "arguments": func.get("arguments", "{}"),
+        },
+    }

{echotools-2.4.4 → echotools-2.4.6}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.4.4
+Version: 2.4.6
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -58,7 +58,7 @@ Requires-Dist: ruff>=0.4.0; extra == "dev"
 
 通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
 
-完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.4**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.6**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 

{echotools-2.4.4 → echotools-2.4.6}/src/echotools.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ src/echotools/exec/dispatch/selector.py
 src/echotools/exec/dispatch/usage.py
 src/echotools/exec/fncall/__init__.py
 src/echotools/exec/fncall/registry.py
+src/echotools/exec/fncall/tool_id.py
 src/echotools/exec/fncall/parsers/__init__.py
 src/echotools/exec/fncall/parsers/stream.py
 src/echotools/exec/fncall/parsers/stream_delta.py
@@ -249,6 +250,7 @@ src/tests/test_schema_validate.py
 src/tests/test_simulated_llm_tool_parse.py
 src/tests/test_stream_partial_json_parity.py
 src/tests/test_stream_realtime_parse.py
+src/tests/test_tool_id.py
 src/tests/test_tracing.py
 src/tests/test_ui_bridge.py
 src/tests/test_usage.py

{echotools-2.4.4 → echotools-2.4.6}/src/tests/test_entml_fake_structure_markup.py

@@ -13,6 +13,8 @@ from echotools.exec.fncall.protocols.entml_tool.fakemarkup import (
     strip_orphan_entml_close_tags,
 )
 
+_REDACTED_THINKING = "redacted" + "_thinking"
+
 READ_TOOL = {
     "type": "function",
     "function": {
@@ -83,6 +85,18 @@ READ_TOOL = {
             "hard_constraint_restatement",
             "后",
         ),
+        (
+            "正文\n<function_results>\n假结果\n</function_results>\n继续",
+            "假结果",
+            "function_results",
+            "继续",
+        ),
+        (
+            "除此之外</function_result>，中间保留",
+            "中间保留",
+            "function_result",
+            "除此之外",
+        ),
         (
             "<entml:result>\nbody\n</entml:result>\nok",
             "body",
@@ -117,6 +131,16 @@ def test_strip_fake_entml_structure_batch(
         assert expect_present in cleaned
 
 
+def test_strip_redacted_thinking_tags_only() -> None:
+    rt = _REDACTED_THINKING
+    raw = f"前\n<{rt}>\n已脱敏思考\n</{rt}>\n后"
+    cleaned, found = strip_fake_entml_structure_markup(raw)
+    assert found
+    assert rt not in cleaned
+    assert "已脱敏思考" in cleaned
+    assert "后" in cleaned
+
+
 def test_tool_result_comment_partial_hold() -> None:
     partial = "可见\n<!-- Tool Result ID:toolu_abc"
     assert trailing_partial_tool_result_id_comment_len(partial) == len(

{echotools-2.4.4 → echotools-2.4.6}/src/tests/test_entml_protocol.py

@@ -854,6 +854,7 @@ def test_entml_instruction_matches_spec_format() -> None:
     assert "<thinking_behavior>" in prompt
     assert "Every reply begins with a <entml:thinking>" in prompt
     assert "<function_calling_behavior>" in prompt
+    assert "Tool Result ID:toolu_376919369ffb428c9f76284f" in prompt
     assert "<function_results>" not in prompt
     assert "<entml:conversation_history>\n" not in prompt
     assert "<entml:history>" not in prompt

{echotools-2.4.4 → echotools-2.4.6}/src/tests/test_ids.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import pytest
 
-from echotools.base.ids import short_id, span_id, trace_id, uuid7
+from echotools.base.ids import short_id, span_id, trace_id, uuid7, gen_tool_id
 
 
 def test_uuid7_format() -> None:
@@ -23,3 +23,9 @@ def test_short_id_invalid_length() -> None:
 def test_trace_and_span_ids() -> None:
     assert len(trace_id()) == 32
     assert len(span_id()) == 16
+
+
+def test_gen_tool_id_unique() -> None:
+    a = gen_tool_id()
+    b = gen_tool_id()
+    assert a != b

echotools-2.4.6/src/tests/test_tool_id.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import pytest
+
+from echotools.base.ids import gen_tool_id
+from echotools.exec.fncall.tool_id import (
+    ensure_toolu_tool_call_id,
+    fix_tool_call_id,
+    is_placeholder_tool_call_id,
+)
+
+
+def test_gen_tool_id_format() -> None:
+    tid = gen_tool_id()
+    assert tid.startswith("toolu_")
+    assert len(tid) == len("toolu_") + 24
+
+
+def test_is_placeholder_tool_call_id() -> None:
+    assert is_placeholder_tool_call_id("")
+    assert is_placeholder_tool_call_id("call_0000")
+    assert is_placeholder_tool_call_id("toolu_call_0001")
+    assert is_placeholder_tool_call_id("call_abc")
+    assert not is_placeholder_tool_call_id("toolu_real123")
+
+
+def test_fix_tool_call_id_replaces_placeholder() -> None:
+    fixed = fix_tool_call_id({
+        "id": "call_0000",
+        "function": {"name": "search", "arguments": '{"q":"x"}'},
+    })
+    assert fixed["id"].startswith("toolu_")
+    assert fixed["function"]["name"] == "search"
+
+
+def test_fix_tool_call_id_keeps_valid() -> None:
+    fixed = fix_tool_call_id({
+        "id": "toolu_abc123",
+        "function": {"name": "search", "arguments": "{}"},
+    })
+    assert fixed["id"] == "toolu_abc123"
+
+
+def test_ensure_toolu_tool_call_id() -> None:
+    assert ensure_toolu_tool_call_id("call_0000").startswith("toolu_")
+    assert ensure_toolu_tool_call_id("abc") == "toolu_abc"
+    assert ensure_toolu_tool_call_id("toolu_xyz") == "toolu_xyz"

echotools-2.4.4/src/echotools/base/ids/__init__.py

@@ -1,7 +0,0 @@
-from __future__ import annotations
-
-"""ids 模块导出。"""
-
-from echotools.base.ids.generator import short_id, span_id, trace_id, uuid7
-
-__all__ = ["uuid7", "short_id", "trace_id", "span_id"]