echotools 2.3.8__tar.gz → 2.3.11__tar.gz

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.8"
+version = "2.3.11"
 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.8 → echotools-2.3.11}/src/echotools/__init__.py

@@ -8,8 +8,11 @@ from __future__ import annotations
 import importlib
 from typing import Any
 
-from echotools.version import get_version
+from echotools.compat import install_compat_aliases
 from echotools.plat.sdk import EchoTools
+from echotools.version import get_version
+
+install_compat_aliases()
 
 __version__ = get_version()
 

{echotools-2.3.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.11/src/echotools/compat.py

@@ -0,0 +1,87 @@
+from __future__ import annotations
+
+"""Backward-compatible import aliases for pre-2.3.9 module paths."""
+
+import importlib
+import importlib.abc
+import importlib.util
+import sys
+from types import ModuleType
+from typing import Dict, Optional, Sequence
+
+_MODULE_ALIASES: Dict[str, str] = {
+    "echotools.cache": "echotools.base.cache",
+    "echotools.config": "echotools.base.config",
+    "echotools.dispatch": "echotools.exec.dispatch",
+    "echotools.files": "echotools.plat.files",
+    "echotools.fncall": "echotools.exec.fncall",
+    "echotools.ids": "echotools.base.ids",
+    "echotools.io": "echotools.base.io",
+    "echotools.lifecycle": "echotools.exec.lifecycle",
+    "echotools.logger": "echotools.base.logger",
+    "echotools.plugin": "echotools.plat.plugin",
+    "echotools.process": "echotools.exec.process",
+    "echotools.protocol": "echotools.exec.protocol",
+    "echotools.proxy": "echotools.plat.proxy",
+    "echotools.retry": "echotools.base.retry",
+    "echotools.scheduler": "echotools.plat.scheduler",
+    "echotools.terminal": "echotools.exec.terminal",
+    "echotools.web": "echotools.media.web",
+    "echotools.events": "echotools.media.events",
+    "echotools.spinner": "echotools.media.spinner",
+    "echotools.tracing": "echotools.media.tracing",
+    "echotools.translate": "echotools.media.translate",
+    "echotools.watcher": "echotools.media.watcher",
+    "echotools.network": "echotools.plat.network",
+    "echotools.runtime": "echotools.plat.runtime",
+    "echotools.sdk": "echotools.plat.sdk",
+    "echotools.keys": "echotools.exec.keys",
+}
+
+
+def _map_name(fullname: str) -> Optional[str]:
+    for old, new in _MODULE_ALIASES.items():
+        if fullname == old or fullname.startswith(old + "."):
+            return new + fullname[len(old) :]
+    return None
+
+
+class _AliasLoader(importlib.abc.Loader):
+    def __init__(self, fullname: str, target: str) -> None:
+        self._fullname = fullname
+        self._target = target
+
+    def create_module(self, spec: importlib.machinery.ModuleSpec) -> Optional[ModuleType]:
+        return None
+
+    def exec_module(self, module: ModuleType) -> None:
+        target = importlib.import_module(self._target)
+        module.__dict__.update(target.__dict__)
+        module.__name__ = self._fullname
+        module.__package__ = self._fullname.rpartition(".")[0]
+        sys.modules[self._fullname] = module
+
+
+class _AliasFinder(importlib.abc.MetaPathFinder):
+    def find_spec(
+        self,
+        fullname: str,
+        path: Optional[Sequence[str]],
+        target: Optional[ModuleType] = None,
+    ) -> Optional[importlib.machinery.ModuleSpec]:
+        mapped = _map_name(fullname)
+        if mapped is None:
+            return None
+        return importlib.util.spec_from_loader(
+            fullname,
+            _AliasLoader(fullname, mapped),
+        )
+
+
+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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/src/echotools/exec/dispatch/selector.py

@@ -22,12 +22,14 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Set, Tuple
 
-from echotools.exec.dispatch.candidate import TaskCandidate
 from echotools.base.io.io_utils import atomic_write_text
 from echotools.base.logger.manager import get_logger
+from echotools.exec.dispatch.candidate import TaskCandidate
 
 __all__ = ["AdaptiveSelector", "TASRecord"]
 
+_DEFAULT_DISPATCH_PERSIST = str(Path.home() / ".echotools" / "dispatch")
+
 logger = get_logger(__name__)
 
 
@@ -156,7 +158,7 @@ class AdaptiveSelector:
 
     def __init__(
         self,
-        persist_dir: str = "persist/dispatch",
+        persist_dir: str = _DEFAULT_DISPATCH_PERSIST,
         group_attr: str = "group",
         *,
         flush_debounce: float = 1.0,

{echotools-2.3.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.11/src/echotools/exec/terminal/session/__init__.py

@@ -0,0 +1,20 @@
+"""Terminal session base and client attachment mixins."""
+from __future__ import annotations
+
+from .base import (
+    MAX_HISTORY_LINES,
+    MAX_OFFLINE_BUFFER_BYTES,
+    MAX_SEQ_RING_BYTES,
+    TerminalCallback,
+    TerminalSession,
+)
+from .client import SessionClientMixin
+
+__all__ = [
+    "TerminalCallback",
+    "TerminalSession",
+    "SessionClientMixin",
+    "MAX_OFFLINE_BUFFER_BYTES",
+    "MAX_SEQ_RING_BYTES",
+    "MAX_HISTORY_LINES",
+]

{echotools-2.3.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/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.8 → echotools-2.3.11}/src/echotools.egg-info/PKG-INFO

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

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

@@ -2,7 +2,7 @@ README.md
 pyproject.toml
 docs/README.md
 src/echotools/__init__.py
-src/echotools/py.typed
+src/echotools/compat.py
 src/echotools/version.py
 src/echotools.egg-info/PKG-INFO
 src/echotools.egg-info/SOURCES.txt
@@ -86,24 +86,6 @@ src/echotools/exec/terminal/local/win.py
 src/echotools/exec/terminal/session/__init__.py
 src/echotools/exec/terminal/session/base.py
 src/echotools/exec/terminal/session/client.py
-src/echotools/fncall/__init__.py
-src/echotools/fncall/registry.py
-src/echotools/fncall/parsers/__init__.py
-src/echotools/fncall/parsers/stream.py
-src/echotools/fncall/parsers/xml_parser.py
-src/echotools/fncall/prompt/__init__.py
-src/echotools/fncall/prompt/history.py
-src/echotools/fncall/prompt/inject.py
-src/echotools/fncall/prompt/templates.py
-src/echotools/fncall/protocols/__init__.py
-src/echotools/fncall/protocols/entml.py
-src/echotools/fncall/shared/__init__.py
-src/echotools/fncall/shared/coercion.py
-src/echotools/fncall/shared/loop_detect.py
-src/echotools/fncall/shared/normalization.py
-src/echotools/fncall/shared/xml_helpers.py
-src/echotools/logger/__init__.py
-src/echotools/logger/manager.py
 src/echotools/media/translate.py
 src/echotools/media/events/__init__.py
 src/echotools/media/events/bus.py
@@ -156,8 +138,6 @@ src/echotools/plat/scheduler/__init__.py
 src/echotools/plat/scheduler/scheduler.py
 src/echotools/plat/sdk/__init__.py
 src/echotools/plat/sdk/facade.py
-src/echotools/protocol/__init__.py
-src/echotools/protocol/base.py
 src/tests/bench_import.py
 src/tests/conftest.py
 src/tests/test_cache_retry.py

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

@@ -108,6 +108,74 @@ def test_coerce_entml_parameter_value(raw, schema, expected) -> None:
     assert coerce_entml_parameter_value(raw, schema) == expected
 
 
+def test_entml_instruction_matches_spec_format() -> None:
+    """示范格式：<entml:function_calls> + <entml:invoke> + <entml:parameter>."""
+    proto = get_protocol("entml")
+    from echotools.exec.fncall.shared.normalization import format_tool_descs
+
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "ask_user_input_v0",
+                "description": "Ask user",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "question": {"type": "string"},
+                        "options": {
+                            "type": "array",
+                            "items": {"type": "string"},
+                        },
+                    },
+                    "required": ["question"],
+                },
+            },
+        }
+    ]
+    prompt = proto.render_prompt(
+        tool_descs=format_tool_descs(tools),
+        lang="en",
+        current_user_message="pick one",
+    )
+    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:conversation_history>" not in prompt
+    assert "<entml:history>" not in prompt
+    assert "<entml:thinking_mode>" not in prompt
+
+
+def test_entml_roundtrip_parameter_format() -> None:
+    """渲染与解析均使用 <entml:parameter name=\"...\">。"""
+    from echotools.exec.fncall.protocols.entml_invoke import format_entml_tool_calls
+
+    sample_calls = [
+        {
+            "id": "call_0000",
+            "type": "function",
+            "function": {
+                "name": "search",
+                "arguments": json.dumps(
+                    {"query": "hello", "limit": 3, "tags": ["a", "b"]}
+                ),
+            },
+        }
+    ]
+    rendered = format_entml_tool_calls(sample_calls)
+    assert '<entml:parameter name="query">hello</entml:parameter>' in rendered
+    assert '<entml:parameter name="limit">3</entml:parameter>' in rendered
+    assert '<entml:parameter name="tags">["a", "b"]</entml:parameter>' in rendered
+    assert "<parameter name=" not in rendered
+
+    parsed = parse_entml_tool_calls(rendered, None, None)
+    args = json.loads(parsed[0]["function"]["arguments"])
+    assert args["query"] == "hello"
+    assert args["limit"] == 3
+    assert args["tags"] == ["a", "b"]
+
+
 def test_entml_parse_schema_coercion() -> None:
     tools = [
         {

{echotools-2.3.8 → echotools-2.3.11}/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)

echotools-2.3.8/src/echotools/exec/terminal/session/__init__.py

@@ -1,7 +0,0 @@
-"""Terminal session base and client attachment mixins."""
-from __future__ import annotations
-
-from .base import TerminalCallback, TerminalSession
-from .client import SessionClientMixin
-
-__all__ = ["TerminalCallback", "TerminalSession", "SessionClientMixin"]

echotools-2.3.8/src/echotools/fncall/__init__.py

@@ -1 +0,0 @@
-from echotools.exec.fncall import *  # noqa: F403