echotools 2.3.38__tar.gz → 2.3.39__tar.gz

{echotools-2.3.38 → echotools-2.3.39}/PKG-INFO

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

{echotools-2.3.38 → echotools-2.3.39}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.38"
+version = "2.3.39"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "docs/README.md"
 requires-python = ">=3.8"
@@ -97,6 +97,10 @@ disable_error_code = [
 module = "echotools.exec.terminal.*"
 ignore_errors = true
 
+[[tool.mypy.overrides]]
+module = "echotools.media.console.ui"
+ignore_errors = true
+
 [tool.pytest.ini_options]
 testpaths = ["src/tests"]
 asyncio_mode = "auto"

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/exec/fncall/parsers/stream.py

@@ -9,10 +9,13 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from echotools.exec.protocol.base import ToolProtocol
 
+
 # 懒导入：仅 entml 协议需要
 def _make_thinking_filter(protocol: ToolProtocol):
     if getattr(protocol, "id", None) == "entml":
-        from echotools.exec.fncall.protocols.entml_thinking_parse import EntmlThinkingStreamFilter
+        from echotools.exec.fncall.protocols.entml_thinking_parse import (
+            EntmlThinkingStreamFilter,
+        )
         return EntmlThinkingStreamFilter()
     return None
 
@@ -213,7 +216,9 @@ class FncallStreamParser:
 
         # 兜底：剥离残留 <entml:thinking>（holdback 边界/分片异常时）
         if self._thinking_filter is not None and clean_text:
-            from echotools.exec.fncall.protocols.entml_thinking_parse import split_entml_thinking
+            from echotools.exec.fncall.protocols.entml_thinking_parse import (
+                split_entml_thinking,
+            )
             clean_text, more_thinking = split_entml_thinking(clean_text)
             if more_thinking:
                 self._thinking_parts.append(more_thinking)

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/exec/fncall/prompt/inject.py

@@ -28,7 +28,10 @@ from echotools.exec.fncall.protocols.entml_thinking_history import (
     parse_include_thinking_in_history,
 )
 from echotools.exec.fncall.shared.loop_detect import detect_tool_loop
-from echotools.exec.fncall.shared.normalization import format_tool_descs, normalize_content
+from echotools.exec.fncall.shared.normalization import (
+    format_tool_descs,
+    normalize_content,
+)
 from echotools.exec.protocol.base import ToolProtocol
 
 __all__ = ["inject_fncall"]

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/exec/fncall/prompt/prompt_helpers.py

@@ -3,6 +3,10 @@ from __future__ import annotations
 from typing import Any, Dict, List, Optional, Set, Tuple
 
 from echotools.base.logger.manager import get_logger
+from echotools.exec.fncall.protocols.entml_thinking_history import (
+    extract_reasoning_text,
+    format_entml_thinking_history_block,
+)
 from echotools.exec.fncall.shared.normalization import normalize_content
 
 from .history import (
@@ -15,11 +19,6 @@ from .history import (
     _try_convert_user_to_tool,
 )
 
-from echotools.exec.fncall.protocols.entml_thinking_history import (
-    extract_reasoning_text,
-    format_entml_thinking_history_block,
-)
-
 logger = get_logger(__name__)
 
 
@@ -86,7 +85,8 @@ def _format_assistant_text_block(
     )
     if not blocks:
         return None
-    return f"<assistant>\n{'\n\n'.join(blocks)}\n</assistant>"
+    body = "\n\n".join(blocks)
+    return f"<assistant>\n{body}\n</assistant>"
 
 
 def _register_tool_call_names(

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/exec/fncall/protocols/entml.py

@@ -15,7 +15,6 @@ from echotools.exec.fncall.prompt.templates import (
     _HISTORY_TOOL_INVOKE_REMINDER_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

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/exec/fncall/protocols/entml_invoke.py

@@ -4,7 +4,6 @@ import json
 from typing import Any, Dict, List, Optional
 
 from .entml_patterns import (
-    BLOCK_RE,
     INVOKE_RE,
     PARAM_RE,
     PARAMETERS_RE,

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/media/console/spinner.py

@@ -6,13 +6,13 @@ Spinner 动画引擎 - 绿→蓝单向渐变版
 - stop() 后恢复光标并清除 spinner 行
 """
 
-import sys
-import time
+import math
 import os
 import platform
-import math
+import sys
 import threading
-from typing import List, Tuple, Dict, Callable, Optional
+import time
+from typing import Callable, Dict, List, Optional, Tuple
 
 try:
     from wcwidth import wcswidth as _wcswidth

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/media/console/ui.py

@@ -22,12 +22,11 @@ import math
 import os
 import re
 import sys
-from pathlib import Path
 import threading
 import time
-from contextlib import contextmanager
 from dataclasses import dataclass, field
 from enum import Enum, auto
+from pathlib import Path
 from typing import (
     Any,
     AsyncIterator,
@@ -51,7 +50,7 @@ from typing import (
 
 from rich.console import Console
 from rich.text import Text
-from wcwidth import wcwidth, wcswidth
+from wcwidth import wcswidth, wcwidth
 
 # ══════════════════════════════════════════════════════════════════════════════
 # 类型定义与平台常量
@@ -133,39 +132,39 @@ class _WindowsBackend:
 
     def _define_structures(self) -> None:
         """定义 Windows 控制台输入记录结构体"""
-        ctypes = self._ctypes
+        ct = self._ctypes
 
-        class COORD(ctypes.Structure):
-            _fields_ = [("X", ctypes.c_short), ("Y", ctypes.c_short)]
+        class COORD(ct.Structure):
+            _fields_ = [("X", ct.c_short), ("Y", ct.c_short)]
 
-        class KEY_EVENT_RECORD(ctypes.Structure):
+        class KEY_EVENT_RECORD(ct.Structure):
             _fields_ = [
-                ("bKeyDown", ctypes.wintypes.BOOL),
-                ("wRepeatCount", ctypes.wintypes.WORD),
-                ("wVirtualKeyCode", ctypes.wintypes.WORD),
-                ("wVirtualScanCode", ctypes.wintypes.WORD),
-                ("uChar", ctypes.wintypes.WCHAR),
-                ("dwControlKeyState", ctypes.wintypes.DWORD),
+                ("bKeyDown", ct.wintypes.BOOL),
+                ("wRepeatCount", ct.wintypes.WORD),
+                ("wVirtualKeyCode", ct.wintypes.WORD),
+                ("wVirtualScanCode", ct.wintypes.WORD),
+                ("uChar", ct.wintypes.WCHAR),
+                ("dwControlKeyState", ct.wintypes.DWORD),
             ]
 
-        class MOUSE_EVENT_RECORD(ctypes.Structure):
+        class MOUSE_EVENT_RECORD(ct.Structure):
             _fields_ = [
                 ("dwMousePosition", COORD),
-                ("dwButtonState", ctypes.wintypes.DWORD),
-                ("dwControlKeyState", ctypes.wintypes.DWORD),
-                ("dwEventFlags", ctypes.wintypes.DWORD),
+                ("dwButtonState", ct.wintypes.DWORD),
+                ("dwControlKeyState", ct.wintypes.DWORD),
+                ("dwEventFlags", ct.wintypes.DWORD),
             ]
 
-        class WINDOW_BUFFER_SIZE_RECORD(ctypes.Structure):
+        class WINDOW_BUFFER_SIZE_RECORD(ct.Structure):
             _fields_ = [("dwSize", COORD)]
 
-        class MENU_EVENT_RECORD(ctypes.Structure):
-            _fields_ = [("dwCommandId", ctypes.wintypes.UINT)]
+        class MENU_EVENT_RECORD(ct.Structure):
+            _fields_ = [("dwCommandId", ct.wintypes.UINT)]
 
-        class FOCUS_EVENT_RECORD(ctypes.Structure):
-            _fields_ = [("bSetFocus", ctypes.wintypes.BOOL)]
+        class FOCUS_EVENT_RECORD(ct.Structure):
+            _fields_ = [("bSetFocus", ct.wintypes.BOOL)]
 
-        class INPUT_RECORD_EVENT(ctypes.Union):
+        class INPUT_RECORD_EVENT(ct.Union):
             _fields_ = [
                 ("KeyEvent", KEY_EVENT_RECORD),
                 ("MouseEvent", MOUSE_EVENT_RECORD),
@@ -174,9 +173,9 @@ class _WindowsBackend:
                 ("FocusEvent", FOCUS_EVENT_RECORD),
             ]
 
-        class INPUT_RECORD(ctypes.Structure):
+        class INPUT_RECORD(ct.Structure):
             _fields_ = [
-                ("EventType", ctypes.wintypes.WORD),
+                ("EventType", ct.wintypes.WORD),
                 ("Event", INPUT_RECORD_EVENT),
             ]
 
@@ -304,8 +303,8 @@ class _UnixBackend:
                         vk = arrow_map.get(ch3, "unknown")
                         # 消费 Delete 键的尾部 '~'
                         if ch3 == "3":
-                            extra, _, _ = select.select([fd], [], [], 0.02)
-                            if extra:
+                            pending_del, _, _ = select.select([fd], [], [], 0.02)
+                            if pending_del:
                                 os.read(fd, 1)
                         results.append({
                             "type": "key", "vk": vk,
@@ -389,10 +388,10 @@ class _UnixBackend:
                     # 尝试读取更多字节以组成完整 UTF-8 字符
                     more, _, _ = select.select([fd], [], [], 0.02)
                     if more:
-                        extra = os.read(fd, 3).decode(
+                        utf_tail = os.read(fd, 3).decode(
                             "utf-8", errors="replace",
                         )
-                        full_char += extra
+                        full_char += utf_tail
                 results.append({
                     "type": "key", "vk": "char",
                     "char": full_char, "ctrl": False,

{echotools-2.3.38 → echotools-2.3.39}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.38 → echotools-2.3.39}/src/tests/test_console.py

@@ -8,8 +8,6 @@ def test_console_package_import() -> None:
         BorderStyle,
         Clock,
         ConsoleUI,
-        FontStyle,
-        GradientTheme,
         Spinner,
         char_map,
     )

{echotools-2.3.38 → echotools-2.3.39}/src/echotools/media/console/__init__.py

@@ -16,9 +16,9 @@ from echotools.media.console.ui import (
     FontStyle,
     GradientTheme,
     TextUtils,
-    create_ui,
     _get_backend,
     _normalize_key_event,
+    create_ui,
 )
 
 __all__ = [