echotools 2.3.5__tar.gz → 2.3.6__tar.gz

{echotools-2.3.5 → echotools-2.3.6}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.5
+Version: 2.3.6
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://github.com/nichengfuben/echotools
 Project-URL: Repository, https://github.com/nichengfuben/echotools
 Project-URL: Issues, https://github.com/nichengfuben/echotools/issues

{echotools-2.3.5 → echotools-2.3.6}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.5"
+version = "2.3.6"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "README.md"
 requires-python = ">=3.8"
-license = "MIT"
+license = { text = "MIT" }
 authors = [{ name = "nichengfuben" }]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -111,6 +111,7 @@ omit = [
     "*/tests/*",
     "*/__init__.py",
     "*/terminal/*",
+    "*/spinner/*",
     "*/web/input_box/*",
     "*/lifecycle/updater.py",
     "*/watcher/*",

{echotools-2.3.5 → echotools-2.3.6}/src/echotools/spinner/spinner.py

@@ -30,10 +30,10 @@ def get_default_characters() -> List[str]:
 def hue_to_rgb(hue: float) -> Tuple[int, int, int]:
     h = ((hue % 360) + 360) % 360
     s = 0.7
-    l = 0.6
-    c = (1 - abs(2 * l - 1)) * s
+    lightness = 0.6
+    c = (1 - abs(2 * lightness - 1)) * s
     x = c * (1 - abs((h / 60) % 2 - 1))
-    m = l - c / 2
+    m = lightness - c / 2
     r = g = b = 0.0
     if h < 60:
         r = c

{echotools-2.3.5 → echotools-2.3.6}/src/echotools.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.5
+Version: 2.3.6
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://github.com/nichengfuben/echotools
 Project-URL: Repository, https://github.com/nichengfuben/echotools
 Project-URL: Issues, https://github.com/nichengfuben/echotools/issues

{echotools-2.3.5 → echotools-2.3.6}/src/echotools.egg-info/SOURCES.txt

@@ -105,17 +105,17 @@ src/echotools/web/input_box/app.js
 src/echotools/web/input_box/input-box.css
 src/echotools/web/input_box/input-box.js
 src/echotools/web/input_box/style.css
-src/echotools/web/input_box/file-zone/file-zone.js
+src/echotools/web/input_box/file_zone/file-zone.js
 src/echotools/web/input_box/fonts/inter-400.woff2
 src/echotools/web/input_box/fonts/inter-500.woff2
 src/echotools/web/input_box/fonts/inter-600.woff2
 src/echotools/web/input_box/fonts/tailwind.min.css
-src/echotools/web/input_box/motion-kit/motion-kit.js
-src/echotools/web/input_box/send-button/send-button.js
-src/echotools/web/input_box/sortable-list/sortable-list.css
-src/echotools/web/input_box/sortable-list/sortable-list.js
-src/echotools/web/input_box/text-input/text-input.js
-src/echotools/web/input_box/voice-input/voice-input.js
+src/echotools/web/input_box/motion_kit/motion-kit.js
+src/echotools/web/input_box/send_button/send-button.js
+src/echotools/web/input_box/sortable_list/sortable-list.css
+src/echotools/web/input_box/sortable_list/sortable-list.js
+src/echotools/web/input_box/text_input/text-input.js
+src/echotools/web/input_box/voice_input/voice-input.js
 tests/test_cache_retry.py
 tests/test_completion.py
 tests/test_config.py

{echotools-2.3.5 → echotools-2.3.6}/tests/test_printstream.py

@@ -4,10 +4,7 @@ from __future__ import annotations
 
 import sys
 import time
-from io import StringIO
-from unittest.mock import MagicMock, patch
-
-import pytest
+from unittest.mock import patch
 
 from echotools.io.printstream import (
     PrintStream,
@@ -294,21 +291,23 @@ class TestPrintStreamIntegration:
         stream.start()
 
         messages = ["First", "Second", "Third"]
-        for msg in messages:
-            stream.add_to_buffer(msg)
-
-        # Give time for processing
-        time.sleep(0.5)
-
-        # Flush and check order
         with patch.object(sys.stdout, "write") as mock_write:
+            for msg in messages:
+                stream.add_to_buffer(msg)
+
+            # Give time for processing
+            time.sleep(0.5)
             stream.flush_remaining()
+
             # Check that messages were written in order
-            calls = [call[0][0] for call in mock_write.call_args_list]
-            # The order should be preserved
-            assert "First" in calls
-            assert "Second" in calls
-            assert "Third" in calls
+            written = "".join(call[0][0] for call in mock_write.call_args_list)
+            first_idx = written.find("First")
+            second_idx = written.find("Second")
+            third_idx = written.find("Third")
+            assert first_idx != -1
+            assert second_idx != -1
+            assert third_idx != -1
+            assert first_idx < second_idx < third_idx
 
         stream.stop()
 

{echotools-2.3.5 → echotools-2.3.6}/tests/test_protocols.py

@@ -16,7 +16,10 @@ def test_entml_protocol_parse() -> None:
 
 
 def test_inject_no_tools() -> None:
-    """无工具时原样返回。"""
+    """无工具时仍包裹历史/当前消息模板，但不注入工具定义。"""
     proto = get_protocol("entml")
     msgs = [{"role": "user", "content": "hi"}]
-    assert inject_fncall(msgs, [], proto) == msgs
+    result = inject_fncall(msgs, [], proto)
+    assert len(result) == 1
+    assert result[0]["role"] == "user"
+    assert "<current_user_message>\nhi\n</current_user_message>" in result[0]["content"]