echotools 2.3.5__tar.gz → 2.3.7__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.5
+Version: 2.3.7
 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.7}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.5"
+version = "2.3.7"
 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.7}/src/echotools/fncall/__init__.py

@@ -16,6 +16,8 @@ from echotools.fncall.shared.loop_detect import (
 from echotools.fncall.shared.normalization import (
     format_tool_descs,
     normalize_content,
+    normalize_tool_call,
+    normalize_tool_calls,
 )
 from echotools.protocol.base import (
     ToolProtocol,
@@ -30,6 +32,8 @@ __all__ = [
     "FncallStreamParser",
     "format_tool_descs",
     "normalize_content",
+    "normalize_tool_call",
+    "normalize_tool_calls",
     "detect_tool_loop",
     "LoopDetectionResult",
     "ToolProtocol",

{echotools-2.3.5 → echotools-2.3.7}/src/echotools/fncall/parsers/xml_parser.py

@@ -14,6 +14,7 @@ from echotools.fncall.shared.coercion import (
     _build_param_schema_index,
     _coerce_param_value,
 )
+from echotools.fncall.shared.normalization import normalize_tool_calls
 from echotools.fncall.shared.xml_helpers import (
     _PROVIDER_BLOCK_RE,
     _PROVIDER_INVOKE_RE,
@@ -208,7 +209,7 @@ def parse_fncall(
         clean = _FUNC_RE.sub("", clean)
         clean = clean.strip()
 
-    return clean, calls
+    return clean, normalize_tool_calls(calls, tools)
 
 def parse_fncall_xml(
     xml: str,
@@ -262,7 +263,7 @@ def parse_fncall_xml(
     except Exception as exc:
         logger.warning("parse_fncall_xml 解析失败: %s", exc)
 
-    return tool_calls
+    return normalize_tool_calls(tool_calls, tools)
 
 
 def parse_fncall_managed_xml(
@@ -319,4 +320,4 @@ def parse_fncall_managed_xml(
     except Exception as exc:
         logger.warning("parse_fncall_managed_xml 解析失败: %s", exc)
 
-    return tool_calls
+    return normalize_tool_calls(tool_calls, tools)

{echotools-2.3.5 → echotools-2.3.7}/src/echotools/fncall/protocols/entml.py

@@ -18,6 +18,7 @@ from echotools.fncall.shared.coercion import (
     _build_param_schema_index,
     _coerce_param_value,
 )
+from echotools.fncall.shared.normalization import normalize_tool_calls
 from echotools.logger.manager import get_logger
 from echotools.protocol.base import ToolProtocol
 
@@ -245,7 +246,7 @@ class EntmlProtocol(ToolProtocol):
         if tool_calls:
             clean = _BLOCK_RE.sub("", text).strip()
 
-        return (clean, tool_calls)
+        return (clean, normalize_tool_calls(tool_calls, tools))
 
     def parse_fragment(
         self,

{echotools-2.3.5 → echotools-2.3.7}/src/echotools/fncall/shared/__init__.py

@@ -11,12 +11,16 @@ from echotools.fncall.shared.loop_detect import (
 from echotools.fncall.shared.normalization import (
     format_tool_descs,
     normalize_content,
+    normalize_tool_call,
+    normalize_tool_calls,
 )
 from echotools.ids.generator import uuid7
 
 __all__ = [
     "normalize_content",
     "format_tool_descs",
+    "normalize_tool_call",
+    "normalize_tool_calls",
     "detect_tool_loop",
     "LoopDetectionResult",
     "uuid7",

{echotools-2.3.5 → echotools-2.3.7}/src/echotools/fncall/shared/normalization.py

@@ -5,8 +5,14 @@
 
 from __future__ import annotations
 
+import ast
 import json
-from typing import Any, List
+from typing import Any, Dict, List, Optional
+
+from echotools.fncall.shared.coercion import _build_param_schema_index
+from echotools.logger.manager import get_logger
+
+logger = get_logger(__name__)
 
 _LT = chr(60)
 _GT = chr(62)
@@ -168,3 +174,84 @@ def format_tool_descs(tools):
         parts.append(chr(10).join(lines))
 
     return (chr(10) + chr(10)).join(parts)
+
+
+def _try_parse_relaxed_literal(text: str) -> Optional[Any]:
+    """仅对 array/object 形态尝试 JSON 或 Python literal 解析。"""
+    stripped = text.strip()
+    if not stripped or stripped[0] not in "[{" or stripped[-1] not in "]}":
+        return None
+    try:
+        return json.loads(stripped)
+    except json.JSONDecodeError:
+        pass
+    try:
+        return ast.literal_eval(stripped)
+    except (ValueError, SyntaxError):
+        return None
+
+
+def _normalize_value(value: Any, schema: Optional[Dict[str, Any]] = None) -> Any:
+    if isinstance(value, str):
+        parsed = _try_parse_relaxed_literal(value)
+        if parsed is not None:
+            value = parsed
+    if isinstance(value, list):
+        item_schema = (schema or {}).get("items") if schema else None
+        if isinstance(item_schema, dict):
+            return [_normalize_value(item, item_schema) for item in value]
+        return [_normalize_value(item) for item in value]
+    if isinstance(value, dict):
+        props = (schema or {}).get("properties") or {}
+        return {
+            key: _normalize_value(
+                val,
+                props.get(key) if isinstance(props.get(key), dict) else None,
+            )
+            for key, val in value.items()
+        }
+    return value
+
+
+def normalize_tool_call(
+    tc: Dict[str, Any],
+    tools: Optional[List[Dict[str, Any]]] = None,
+) -> Dict[str, Any]:
+    """将 tool call arguments 中的 Python 字面量字符串还原为合法 JSON 结构。"""
+    func = tc.get("function") or {}
+    name = str(func.get("name") or "")
+    raw_args = func.get("arguments", "{}")
+    try:
+        args = json.loads(raw_args) if isinstance(raw_args, str) else dict(raw_args)
+    except (json.JSONDecodeError, TypeError, ValueError):
+        logger.warning("normalize_tool_call: invalid arguments JSON for %s", name)
+        return tc
+
+    schema_index = _build_param_schema_index(tools) if tools else {}
+    param_schemas = schema_index.get(name, {})
+
+    if isinstance(args, dict):
+        args = {
+            key: _normalize_value(
+                val,
+                param_schemas.get(key) if param_schemas else None,
+            )
+            for key, val in args.items()
+        }
+    else:
+        args = _normalize_value(args)
+
+    normalized = dict(tc)
+    normalized["function"] = dict(func)
+    normalized["function"]["arguments"] = json.dumps(args, ensure_ascii=False)
+    return normalized
+
+
+def normalize_tool_calls(
+    tool_calls: Optional[List[Dict[str, Any]]],
+    tools: Optional[List[Dict[str, Any]]] = None,
+) -> List[Dict[str, Any]]:
+    """批量规范化 OpenAI 格式 tool_calls。"""
+    if not tool_calls:
+        return []
+    return [normalize_tool_call(tc, tools) for tc in tool_calls]

{echotools-2.3.5 → echotools-2.3.7}/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.7}/src/echotools.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.5
+Version: 2.3.7
 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.7}/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.7}/tests/test_fncall.py

@@ -1,8 +1,11 @@
 from __future__ import annotations
 
+import json
+
 import pytest
 
 from echotools.fncall import get_protocol, inject_fncall, list_protocols
+from echotools.fncall.shared.normalization import normalize_tool_call
 
 
 @pytest.mark.parametrize(
@@ -43,6 +46,34 @@ def test_get_protocol_platform_mapping() -> None:
     assert proto.id == "entml"
 
 
+def test_normalize_tool_call_python_literal() -> None:
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "run",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "items": {"type": "array", "items": {"type": "string"}},
+                    },
+                },
+            },
+        }
+    ]
+    tc = {
+        "id": "call_0001",
+        "type": "function",
+        "function": {
+            "name": "run",
+            "arguments": json.dumps({"items": "['a', 'b']"}),
+        },
+    }
+    out = normalize_tool_call(tc, tools)
+    args = json.loads(out["function"]["arguments"])
+    assert args["items"] == ["a", "b"]
+
+
 def test_inject_with_tools_and_dump(tmp_path) -> None:
     proto = get_protocol("entml")
     tools = [

{echotools-2.3.5 → echotools-2.3.7}/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.7}/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"]