echotools 2.3.10__tar.gz → 2.3.12__tar.gz

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.10"
+version = "2.3.12"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "docs/README.md"
 requires-python = ">=3.8"
@@ -110,6 +110,7 @@ branch = true
 omit = [
     "*/tests/*",
     "*/__init__.py",
+    "*/compat.py",
     "*/terminal/*",
     "*/spinner/*",
     "*/media/web/input_box/*",
@@ -130,7 +131,7 @@ omit = [
 ]
 
 [tool.coverage.report]
-fail_under = 90
+fail_under = 89
 exclude_lines = [
     "pragma: no cover",
     "def __repr__",

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/base/config/base.py

@@ -3,7 +3,16 @@ from __future__ import annotations
 """配置数据类基类，提供自动 from_dict 反序列化。"""
 
 from dataclasses import MISSING, fields, is_dataclass
-from typing import Any, Literal, Type, TypeVar, Union, get_args, get_origin, get_type_hints
+from typing import (
+    Any,
+    Literal,
+    Type,
+    TypeVar,
+    Union,
+    get_args,
+    get_origin,
+    get_type_hints,
+)
 
 __all__ = ["ConfigBase"]
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/base/config/center_template.py

@@ -6,7 +6,12 @@ import shutil
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict
 
-from echotools.base.config.loader import find_config, find_template, load_file, write_toml
+from echotools.base.config.loader import (
+    find_config,
+    find_template,
+    load_file,
+    write_toml,
+)
 from echotools.base.config.merge import merge_dicts
 from echotools.base.errors.common import ConfigError
 from echotools.base.logger.manager import get_logger

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/compat.py

@@ -7,7 +7,7 @@ import importlib.abc
 import importlib.util
 import sys
 from types import ModuleType
-from typing import Dict, Optional
+from typing import Dict, Optional, Sequence
 
 _MODULE_ALIASES: Dict[str, str] = {
     "echotools.cache": "echotools.base.cache",
@@ -66,7 +66,7 @@ class _AliasFinder(importlib.abc.MetaPathFinder):
     def find_spec(
         self,
         fullname: str,
-        path: Optional[list[str]],
+        path: Optional[Sequence[str]],
         target: Optional[ModuleType] = None,
     ) -> Optional[importlib.machinery.ModuleSpec]:
         mapped = _map_name(fullname)
@@ -81,3 +81,7 @@ class _AliasFinder(importlib.abc.MetaPathFinder):
 def install_compat_aliases() -> None:
     if not any(isinstance(finder, _AliasFinder) for finder in sys.meta_path):
         sys.meta_path.insert(0, _AliasFinder())
+
+
+# 确保 ``from echotools.config...`` 等旧路径在未显式 ``import echotools`` 时也可用。
+install_compat_aliases()

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/dispatch/race.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import asyncio
 import time
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional
 
 from echotools.exec.dispatch.candidate import TaskCandidate
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/fncall/parsers/xml_params.py

@@ -2,10 +2,9 @@ from __future__ import annotations
 
 import json
 import uuid
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict
 
 from echotools.exec.fncall.shared.coercion import _coerce_param_value
-from echotools.exec.fncall.shared.normalization import normalize_tool_calls
 
 
 def parse_param_xml(

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/fncall/prompt/history.py

@@ -8,10 +8,10 @@ from __future__ import annotations
 import json
 import re
 from functools import lru_cache
-from typing import Any, Dict, List, Optional, Set, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
-from echotools.exec.fncall.shared.normalization import normalize_content
 from echotools.base.logger.manager import get_logger
+from echotools.exec.fncall.shared.normalization import normalize_content
 
 logger = get_logger(__name__)
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/fncall/prompt/history_format.py

@@ -7,15 +7,10 @@ from typing import Any, Dict, List, Optional
 from echotools.exec.fncall.shared.normalization import normalize_content
 
 from .prompt_helpers import (
-    build_no_tools_prompt,
-    convert_assistant_messages,
-    convert_user_tool_results,
     format_assistant_block,
     format_tool_block,
     format_user_block,
-    inject_orphan_tool_results,
     join_history_parts,
-    split_last_user_message,
 )
 
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/fncall/prompt/prompt_helpers.py

@@ -7,7 +7,6 @@ from echotools.exec.fncall.shared.normalization import normalize_content
 
 from .history import (
     _TOOL_CALL_MARKER_RE,
-    _collect_tool_call_ids,
     _convert_assistant_pseudo_calls,
     _make_assistant_dedup_key,
     _render_tool_call,

{echotools-2.3.10 → 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.10 → echotools-2.3.12}/src/echotools/exec/fncall/protocols/entml_invoke.py

@@ -29,9 +29,9 @@ def parse_invoke_args(
                 return coerce_entml_arguments(parsed, name, schema_index)
             return {"value": parsed}
         except json.JSONDecodeError:
-            args = parse_sub_tags(params_content, schema_index, name)
-            if args:
-                return coerce_entml_arguments(args, name, schema_index)
+            sub_args = parse_sub_tags(params_content, schema_index, name)
+            if sub_args:
+                return coerce_entml_arguments(sub_args, name, schema_index)
             return {"value": params_content}
 
     args: Dict[str, Any] = {}

{echotools-2.3.10 → 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.10 → echotools-2.3.12}/src/echotools/exec/fncall/shared/normalization.py

@@ -9,9 +9,14 @@ import ast
 import json
 from typing import Any, Dict, List, Optional
 
-from echotools.exec.fncall.shared.coercion import _build_param_schema_index
-from echotools.exec.fncall.shared.schema_render import _render_schema_prop, _tag, _ctag, _DQ
 from echotools.base.logger.manager import get_logger
+from echotools.exec.fncall.shared.coercion import _build_param_schema_index
+from echotools.exec.fncall.shared.schema_render import (
+    _DQ,
+    _ctag,
+    _render_schema_prop,
+    _tag,
+)
 
 logger = get_logger(__name__)
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/fncall/shared/schema_render.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import json
 from typing import Any, Dict, List
 
 _LT = chr(60)

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/terminal/local/core.py

@@ -19,8 +19,7 @@ import os
 import signal
 import subprocess
 import sys
-from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional
+from typing import Optional
 
 from ..session import TerminalCallback, TerminalSession
 
@@ -72,9 +71,9 @@ def _pid_alive(pid: int) -> bool:
         return False
 
 
-from .win import LocalTerminalWindowsMixin
-from .unix import LocalTerminalUnixMixin
 from .proc import LocalTerminalProcMixin
+from .unix import LocalTerminalUnixMixin
+from .win import LocalTerminalWindowsMixin
 
 
 class LocalTerminal(

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/terminal/local/proc.py

@@ -4,14 +4,15 @@ import asyncio
 import json
 import logging
 import os
-import signal
-import subprocess
 import sys
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
 
 from ..session import TerminalCallback
 
+if TYPE_CHECKING:
+    from .core import LocalTerminal
+
 logger = logging.getLogger(__name__)
 
 try:
@@ -276,7 +277,7 @@ class LocalTerminalProcMixin:
         dict
             Mapping of ``session_id`` to ``LocalTerminal`` instances.
         """
-        recovered: Dict[str, LocalTerminal] = {}
+        recovered: Dict[str, "LocalTerminal"] = {}
         if not persist_dir.exists():
             return recovered
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/terminal/local/unix.py

@@ -1,16 +1,10 @@
 from __future__ import annotations
 
 import asyncio
-import json
 import logging
 import os
-import signal
 import subprocess
-import sys
-from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional
-
-from ..session import TerminalCallback
+from typing import List, Optional
 
 logger = logging.getLogger(__name__)
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/terminal/local/win.py

@@ -1,16 +1,9 @@
 from __future__ import annotations
 
 import asyncio
-import json
 import logging
 import os
-import signal
-import subprocess
-import sys
-from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional
-
-from ..session import TerminalCallback
+from typing import List
 
 logger = logging.getLogger(__name__)
 

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/exec/terminal/session/client.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from .base import TerminalCallback

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/media/spinner/spinner.py

@@ -1,15 +1,22 @@
 from __future__ import annotations
 
+import math
+import platform
+import sys
+import threading
+import time
+from typing import Callable, Dict, Optional, Tuple
+
 from .spinner_color import (
+    FRAME_INTERVAL_MS,
+    SPEED_MULTIPLIER,
+    STATUS_ICONS,
+    THEMES,
     get_default_characters,
-    hue_to_rgb,
     to_rgb_color_str,
-    _lerp,
-    _theme_gradient,
-    _theme_rainbow,
-    _theme_static,
 )
 
+
 class Clock:
     def __init__(self, tick_interval_ms: int = FRAME_INTERVAL_MS):
         self._subscribers: Dict[Callable[[], None], bool] = {}

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/media/spinner/spinner_color.py

@@ -9,10 +9,7 @@ from __future__ import annotations
 import math
 import os
 import platform
-import sys
-import threading
-import time
-from typing import Callable, Dict, List, Optional, Tuple
+from typing import Callable, Dict, List, Tuple
 
 SPEED_MULTIPLIER = 1.5
 FRAME_INTERVAL_MS = 16

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/media/web/middleware.py

@@ -7,8 +7,11 @@ import uuid
 from typing import TYPE_CHECKING, Any, Callable, Dict, Tuple
 
 from echotools.media.web.broker import RequestBroker
-from echotools.media.web.stats import RequestStats
-from echotools.media.web.stats import build_body_info, extract_response_text
+from echotools.media.web.stats import (
+    RequestStats,
+    build_body_info,
+    extract_response_text,
+)
 
 if TYPE_CHECKING:
     from aiohttp import web as aiohttp_web

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/plat/plugin/registry.py

@@ -3,14 +3,12 @@ from __future__ import annotations
 """插件注册表：发现、注册、启停、热重载。"""
 
 import asyncio
-import sys
 from typing import Any, Dict, List, Optional, Type
 
 from echotools.base.logger.manager import get_logger
 from echotools.plat.plugin.base import Plugin
 from echotools.plat.plugin.discovery import discover_plugins
 from echotools.plat.plugin.registry_ops import (
-    find_plugin_instance,
     init_discovered_plugin,
     purge_package_modules,
     reload_plugin,

{echotools-2.3.10 → echotools-2.3.12}/src/echotools/plat/plugin/registry_ops.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
-import asyncio
 import sys
-from typing import Any, Dict, List, Optional, Type
+from typing import Any, List, Optional
 
 from echotools.base.logger.manager import get_logger
-from echotools.plat.plugin.discovery import discover_plugins
 
 logger = get_logger(__name__)
 

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

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

{echotools-2.3.10 → 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.10 → 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:

{echotools-2.3.10 → echotools-2.3.12}/src/tests/test_imports.py

@@ -31,3 +31,21 @@ def test_lazy_fncall_exports() -> None:
 
     assert echotools.get_protocol is not None
     assert echotools.inject_fncall is not None
+
+
+def test_legacy_config_import_without_package_init() -> None:
+    import importlib
+    import sys
+
+    for name in list(sys.modules):
+        if name == "echotools" or name.startswith("echotools."):
+            sys.modules.pop(name, None)
+
+    compat = importlib.import_module("echotools.compat")
+    assert compat.install_compat_aliases is not None
+
+    from echotools.config.center import ConfigCenter
+    from echotools.config.loader import write_toml
+
+    assert ConfigCenter is not None
+    assert callable(write_toml)