echotools 2.3.10__tar.gz → 2.3.11__tar.gz

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.10"
+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.10 → 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.10 → 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.10 → echotools-2.3.11}/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.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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → 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.10 → echotools-2.3.11}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.10 → 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.10 → echotools-2.3.11}/src/echotools/__init__.py

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

{echotools-2.3.10 → echotools-2.3.11}/src/echotools/exec/dispatch/dispatcher.py

@@ -21,6 +21,8 @@ from typing import (
     Union,
 )
 
+from echotools.base.errors.common import NoCandidateError
+from echotools.base.logger.manager import get_logger
 from echotools.exec.dispatch.candidate import TaskCandidate
 from echotools.exec.dispatch.race import (
     apply_queue_event,
@@ -31,8 +33,6 @@ from echotools.exec.dispatch.race import (
     race_worker,
 )
 from echotools.exec.dispatch.selector import AdaptiveSelector
-from echotools.base.errors.common import NoCandidateError
-from echotools.base.logger.manager import get_logger
 
 __all__ = ["TaskDispatcher"]
 

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

@@ -22,9 +22,9 @@ 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"]
 

{echotools-2.3.10 → echotools-2.3.11}/src/echotools/exec/fncall/parsers/xml_parser.py

@@ -10,6 +10,7 @@ import re
 import uuid
 from typing import Any, Dict, List, Optional, Tuple
 
+from echotools.base.logger.manager import get_logger
 from echotools.exec.fncall.parsers.xml_params import make_tool_call, parse_param_xml
 from echotools.exec.fncall.shared.coercion import (
     _build_param_schema_index,
@@ -22,7 +23,6 @@ from echotools.exec.fncall.shared.xml_helpers import (
     _PROVIDER_PARAM_RE,
     extract_cdata,
 )
-from echotools.base.logger.manager import get_logger
 
 logger = get_logger(__name__)
 

{echotools-2.3.10 → echotools-2.3.11}/src/echotools/exec/fncall/prompt/inject.py

@@ -5,6 +5,8 @@ from __future__ import annotations
 import os
 from typing import Any, Dict, List, Optional
 
+from echotools.base.ids.generator import uuid7
+from echotools.base.logger.manager import get_logger
 from echotools.exec.fncall.prompt.history import (
     _normalize_messages,
 )
@@ -22,8 +24,6 @@ from echotools.exec.fncall.protocols.entml import (
 from echotools.exec.fncall.shared.loop_detect import detect_tool_loop
 from echotools.exec.fncall.shared.normalization import format_tool_descs
 from echotools.exec.protocol.base import ToolProtocol
-from echotools.base.ids.generator import uuid7
-from echotools.base.logger.manager import get_logger
 
 __all__ = ["inject_fncall"]
 

{echotools-2.3.10 → echotools-2.3.11}/src/echotools/exec/fncall/shared/__init__.py

@@ -1,5 +1,6 @@
 """共享工具导出。"""
 
+from echotools.base.ids.generator import uuid7
 from echotools.exec.fncall.shared.coercion import (
     _build_param_schema_index,
     _coerce_param_value,
@@ -14,7 +15,6 @@ from echotools.exec.fncall.shared.normalization import (
     normalize_tool_call,
     normalize_tool_calls,
 )
-from echotools.base.ids.generator import uuid7
 
 __all__ = [
     "normalize_content",

{echotools-2.3.10 → echotools-2.3.11}/src/echotools/media/events/bus.py

@@ -7,8 +7,8 @@ import inspect
 from collections import defaultdict
 from typing import Awaitable, Callable, DefaultDict, List, Type, Union
 
-from echotools.media.events.event import Event
 from echotools.base.logger.manager import get_logger
+from echotools.media.events.event import Event
 
 __all__ = ["EventBus"]
 

{echotools-2.3.10 → echotools-2.3.11}/src/echotools/plat/sdk/facade.py

@@ -8,16 +8,16 @@ from typing import FrozenSet, Optional, Set
 
 from echotools.base.cache.memory_cache import MemoryCache
 from echotools.base.config.center import ConfigCenter
+from echotools.base.logger.manager import LoggerManager, get_logger
 from echotools.exec.dispatch.dispatcher import TaskDispatcher
 from echotools.exec.dispatch.selector import AdaptiveSelector
-from echotools.media.events.bus import EventBus
 from echotools.exec.lifecycle.manager import LifecycleManager
-from echotools.base.logger.manager import LoggerManager, get_logger
+from echotools.media.events.bus import EventBus
+from echotools.media.tracing.tracer import Tracer
 from echotools.plat.plugin.registry import PluginRegistry
 from echotools.plat.proxy.manager import ProxyManager
 from echotools.plat.runtime.collector import RuntimeCollector
 from echotools.plat.scheduler.scheduler import TaskScheduler
-from echotools.media.tracing.tracer import Tracer
 
 __all__ = ["EchoTools"]
 

{echotools-2.3.10 → echotools-2.3.11}/src/tests/test_coverage_core.py

@@ -11,17 +11,9 @@ from unittest.mock import patch
 
 import pytest
 
-from echotools.version import get_version
 from echotools.base.cache import ListCache, MemoryCache
-from echotools.exec.dispatch import TaskCandidate, TaskDispatcher
-from echotools.exec.dispatch.proxy_selector import ProxyRecord, ProxySelector
-from echotools.exec.dispatch.selector import AdaptiveSelector, TASRecord
-from echotools.exec.dispatch.usage import fallback_usage, normalize_usage
 from echotools.base.errors.http import ForbiddenError, StreamError
-from echotools.media.events import Event, EventBus
 from echotools.base.io import atomic_write_text, read_text_if_exists
-from echotools.exec.keys import KeyPool, KeyState
-from echotools.exec.lifecycle import LifecycleManager
 from echotools.base.logger.manager import LoggerManager, _LogFormatter, _supports_color
 from echotools.base.retry import (
     retry_async_generator,
@@ -29,7 +21,13 @@ from echotools.base.retry import (
     retry_on_exception,
     retry_with_backoff,
 )
-from echotools.plat.scheduler import TaskScheduler
+from echotools.exec.dispatch import TaskCandidate, TaskDispatcher
+from echotools.exec.dispatch.proxy_selector import ProxyRecord, ProxySelector
+from echotools.exec.dispatch.selector import AdaptiveSelector, TASRecord
+from echotools.exec.dispatch.usage import fallback_usage, normalize_usage
+from echotools.exec.keys import KeyPool, KeyState
+from echotools.exec.lifecycle import LifecycleManager
+from echotools.media.events import Event, EventBus
 from echotools.media.tracing.context import (
     get_current_span_id,
     get_current_trace_id,
@@ -44,6 +42,8 @@ from echotools.media.tracing.tracer import Tracer
 from echotools.media.web import stats as stats_mod
 from echotools.media.web.broker import RequestBroker, request_broker
 from echotools.media.web.stats import RequestStats
+from echotools.plat.scheduler import TaskScheduler
+from echotools.version import get_version
 
 
 class _MockWS:

{echotools-2.3.10 → echotools-2.3.11}/src/tests/test_dispatch_extended.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 import pytest
 
+from echotools.base.errors import NoCandidateError
 from echotools.exec.dispatch import TaskCandidate, TaskDispatcher, make_id
 from echotools.exec.dispatch.selector import AdaptiveSelector
-from echotools.base.errors import NoCandidateError
 
 
 @pytest.mark.asyncio