echotools 2.0.0__tar.gz → 2.1.0__tar.gz

{echotools-2.0.0 → echotools-2.1.0}/PKG-INFO

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

{echotools-2.0.0 → echotools-2.1.0}/pyproject.toml

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

{echotools-2.0.0 → echotools-2.1.0}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.0.0 → echotools-2.1.0}/tests/test_fncall.py

@@ -9,22 +9,17 @@ from echotools.fncall import get_protocol, inject_fncall, list_protocols
     "protocol_id,sample,expected_name",
     [
         (
-            "antml",
-            '<antml:function_calls><antml:invoke name="tool_a">'
-            '<antml:parameters>{"x":1}</antml:parameters></antml:invoke></antml:function_calls>',
+            "entml",
+            '<entml:function_calls><entml:invoke name="tool_a">'
+            '<entml:parameters>{"x":1}</entml:parameters></entml:invoke></entml:function_calls>',
             "tool_a",
         ),
         (
-            "xml",
-            '<function_calls><invoke name="tool_x">'
-            '<parameter name="x">1</parameter></invoke></function_calls>',
+            "entml",
+            '<entml:function_calls><entml:invoke name="tool_x">'
+            '<entml:parameter name="x">1</entml:parameter></entml:invoke></entml:function_calls>',
             "tool_x",
         ),
-        (
-            "bracket",
-            "[function_calls][call:tool_b]{\"y\":2}[/call][/function_calls]",
-            "tool_b",
-        ),
     ],
 )
 def test_protocol_parse(protocol_id: str, sample: str, expected_name: str) -> None:
@@ -35,23 +30,21 @@ def test_protocol_parse(protocol_id: str, sample: str, expected_name: str) -> No
 
 
 def test_list_protocols_includes_builtins() -> None:
-    ids = list_protocols()
-    for expected in ("xml", "antml", "original", "bracket", "nous", "dsml"):
-        assert expected in ids
+    assert list_protocols() == ["entml"]
 
 
-def test_custom_protocol_lazy_create() -> None:
-    proto = get_protocol("custom", custom_prompt_en="Use tools")
-    assert proto.id == "custom"
+def test_custom_protocol_requires_plugin() -> None:
+    with pytest.raises(ValueError, match="Provider-Fncall-Util"):
+        get_protocol("custom", custom_prompt_en="Use tools")
 
 
 def test_get_protocol_platform_mapping() -> None:
-    proto = get_protocol(platform_id="p1", mapping={"p1": "xml"})
-    assert proto.id == "xml"
+    proto = get_protocol(platform_id="p1", mapping={"p1": "entml"})
+    assert proto.id == "entml"
 
 
 def test_inject_with_tools_and_dump(tmp_path) -> None:
-    proto = get_protocol("xml")
+    proto = get_protocol("entml")
     tools = [
         {
             "type": "function",

{echotools-2.0.0 → echotools-2.1.0}/tests/test_protocols.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 from echotools.fncall import get_protocol, inject_fncall
 
 
-def test_xml_protocol_parse() -> None:
-    """antml 协议解析工具调用。"""
-    proto = get_protocol("antml")
+def test_entml_protocol_parse() -> None:
+    """entml 协议解析工具调用。"""
+    proto = get_protocol("entml")
     text = (
-        '<antml:function_calls><antml:invoke name="f">'
-        '<antml:parameters>{"x":1}</antml:parameters></antml:invoke></antml:function_calls>'
+        '<entml:function_calls><entml:invoke name="f">'
+        '<entml:parameters>{"x":1}</entml:parameters></entml:invoke></entml:function_calls>'
     )
     clean, calls = proto.parse(text)
     assert calls
@@ -17,6 +17,6 @@ def test_xml_protocol_parse() -> None:
 
 def test_inject_no_tools() -> None:
     """无工具时原样返回。"""
-    proto = get_protocol("xml")
+    proto = get_protocol("entml")
     msgs = [{"role": "user", "content": "hi"}]
     assert inject_fncall(msgs, [], proto) == msgs

{echotools-2.0.0 → echotools-2.1.0}/tests/test_web.py

@@ -12,7 +12,7 @@ def test_json_body_roundtrip() -> None:
 def test_safe_flush_splits_buffer() -> None:
     from echotools.fncall import get_protocol
 
-    proto = get_protocol("xml")
+    proto = get_protocol("entml")
     flushed_safe, flushed_remain = safe_flush("hello", proto)
     assert flushed_safe == "hello"
     assert flushed_remain == ""
@@ -42,7 +42,7 @@ def test_clean_fncall() -> None:
     from echotools.fncall import get_protocol
     from echotools.web.utils import clean_fncall
 
-    proto = get_protocol("antml")
-    text = '<antml:function_calls></antml:function_calls>hello'
+    proto = get_protocol("entml")
+    text = '<entml:function_calls></entml:function_calls>hello'
     cleaned = clean_fncall(text, proto)
     assert "hello" in cleaned