echotools 2.3.13__tar.gz → 2.3.14__tar.gz

{echotools-2.3.13 → echotools-2.3.14}/PKG-INFO

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

{echotools-2.3.13 → echotools-2.3.14}/pyproject.toml

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

{echotools-2.3.13 → echotools-2.3.14}/src/echotools/exec/fncall/protocols/entml.py

@@ -2,7 +2,7 @@
 
 - 工具调用：<entml:function_calls> / <entml:invoke> / <entml:parameter>
 - 对话历史：<entml:conversation_history>
-- 当前用户消息：<entml:current_user_message>
+- 当前用户消息：<current_user_message>
 """
 
 from __future__ import annotations
@@ -57,9 +57,9 @@ def format_entml_conversation_history(
 
 
 def format_entml_current_user_message(message: str) -> str:
-    """将当前用户消息包裹为 <entml:current_user_message> 块。"""
+    """将当前用户消息包裹为 <current_user_message> 块。"""
     text = (message or "").strip()
-    return f"<entml:current_user_message>\n{text}\n</current_user_message>"
+    return f"<current_user_message>\n{text}\n</current_user_message>"
 
 
 class EntmlProtocol(ToolProtocol):

{echotools-2.3.13 → echotools-2.3.14}/src/echotools/exec/fncall/protocols/entml_thinking.py

@@ -41,13 +41,12 @@ def build_entml_thinking_section(
                 "...",
                 "</function_results>",
                 "",
-                "<entml:thinking>",
+                "<thinking>",
                 "...thinking about results",
-                "</entml:thinking>",
-                "Whenever you have the result of a function call, think carefully "
-                "about whether an `<entml:thinking>` `</entml:thinking>` block "
-                "would be appropriate and strongly prefer to output a thinking "
-                "block if you are uncertain.",
+                "</thinking>",
+                "At the very start of your response, think carefully about whether "
+                "a `<thinking>` `</thinking>` block would be appropriate and "
+                "strongly prefer to output a thinking block if you are uncertain.",
             ]
         )
 

{echotools-2.3.13 → echotools-2.3.14}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.13 → echotools-2.3.14}/src/tests/test_entml_protocol.py

@@ -28,7 +28,7 @@ def test_inject_no_tools_entml_tags() -> None:
     result = inject_fncall(msgs, [], proto)
     assert len(result) == 1
     content = result[0]["content"]
-    assert "<entml:current_user_message>\nhi\n</current_user_message>" in content
+    assert "<current_user_message>\nhi\n</current_user_message>" in content
     assert "<entml:thinking_mode>" not in content
     assert "<entml:max_thinking_length>" not in content
 
@@ -60,7 +60,9 @@ def test_inject_with_thinking_options_only_when_declared() -> None:
     )[0]["content"]
     assert "<entml:thinking_mode>interleaved</entml:thinking_mode>" in with_opts
     assert "<entml:max_thinking_length>22000</entml:max_thinking_length>" in with_opts
-    assert "<entml:thinking>" in with_opts
+    assert "<thinking>" in with_opts
+    assert "At the very start of your response" in with_opts
+    assert "<entml:thinking>" not in with_opts
 
 
 def test_build_entml_thinking_section_empty_without_options() -> None:
@@ -88,7 +90,7 @@ def test_inject_with_history_entml_tags() -> None:
     out = inject_fncall(msgs, tools, proto)
     content = out[0]["content"]
     assert "<entml:conversation_history>" in content
-    assert "<entml:current_user_message>\nnew\n</current_user_message>" in content
+    assert "<current_user_message>\nnew\n</current_user_message>" in content
 
 
 def test_entml_history_clarify_always_english() -> None:

{echotools-2.3.13 → echotools-2.3.14}/src/tests/test_protocols.py

@@ -22,4 +22,4 @@ def test_inject_no_tools() -> None:
     result = inject_fncall(msgs, [], proto)
     assert len(result) == 1
     assert result[0]["role"] == "user"
-    assert "<entml:current_user_message>\nhi\n</current_user_message>" in result[0]["content"]
+    assert "<current_user_message>\nhi\n</current_user_message>" in result[0]["content"]