echotools 2.3.8__tar.gz → 2.3.10__tar.gz

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

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

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

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

{echotools-2.3.8 → echotools-2.3.10}/src/echotools/__init__.py

@@ -10,6 +10,9 @@ from typing import Any
 
 from echotools.version import get_version
 from echotools.plat.sdk import EchoTools
+from echotools.compat import install_compat_aliases
+
+install_compat_aliases()
 
 __version__ = get_version()
 

echotools-2.3.10/src/echotools/compat.py

@@ -0,0 +1,83 @@
+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
+
+_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[list[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())

{echotools-2.3.8 → echotools-2.3.10}/src/echotools/exec/dispatch/selector.py

@@ -28,6 +28,8 @@ from echotools.base.logger.manager import get_logger
 
 __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.10/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.10}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.8 → echotools-2.3.10}/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.10}/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/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

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

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

echotools-2.3.8/src/echotools/fncall/parsers/stream.py

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

echotools-2.3.8/src/echotools/fncall/parsers/xml_parser.py

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

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

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

echotools-2.3.8/src/echotools/fncall/prompt/history.py

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

echotools-2.3.8/src/echotools/fncall/prompt/inject.py

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

echotools-2.3.8/src/echotools/fncall/prompt/templates.py

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

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

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

echotools-2.3.8/src/echotools/fncall/protocols/entml.py

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

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

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

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

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

echotools-2.3.8/src/echotools/fncall/shared/coercion.py

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

echotools-2.3.8/src/echotools/fncall/shared/loop_detect.py

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

echotools-2.3.8/src/echotools/fncall/shared/normalization.py

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

echotools-2.3.8/src/echotools/fncall/shared/xml_helpers.py

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

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

@@ -1 +0,0 @@
-from echotools.base.logger.manager import *  # noqa: F403

echotools-2.3.8/src/echotools/logger/manager.py

@@ -1 +0,0 @@
-from echotools.base.logger.manager import *  # noqa: F403

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

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

echotools-2.3.8/src/echotools/protocol/base.py

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