echotools 2.3.93__tar.gz → 2.3.94__tar.gz

{echotools-2.3.93 → echotools-2.3.94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.93
+Version: 2.3.94
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben

{echotools-2.3.93 → echotools-2.3.94}/pyproject.toml

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

{echotools-2.3.93 → echotools-2.3.94}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.93
+Version: 2.3.94
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben

{echotools-2.3.93 → echotools-2.3.94}/src/tests/test_entml_protocol.py

@@ -382,15 +382,15 @@ def test_render_prompt_thinking_after_current_user() -> None:
         current_user_message="new",
         protocol_options={"thinking_mode": "on", "max_thinking_length": 1000},
     )
-    assert prompt.index("In this environment") < prompt.index("<function_calling_behavior>")
+    assert prompt.index("In this environment") < prompt.index("<entml:conversation_history>\n")
+    idx_hist = prompt.index("<entml:conversation_history>\n")
     idx_fc = prompt.index("<function_calling_behavior>\n")
     idx_behavior = prompt.index("<thinking_behavior>\n")
-    idx_hist = prompt.index("<entml:conversation_history>\n")
     idx_hard = prompt.index("<entml:hard_constraint_restatement>\n")
     idx_user = prompt.index("<current_user_message>\n")
     idx_max = prompt.index("<entml:max_thinking_length>")
     idx_mode = prompt.index("<entml:thinking_mode>")
-    assert idx_fc < idx_behavior < idx_hist < idx_hard < idx_user < idx_max < idx_mode
+    assert idx_hist < idx_fc < idx_behavior < idx_hard < idx_user < idx_max < idx_mode
     assert prompt.rstrip().endswith("</entml:thinking_mode>")
 
 
@@ -516,7 +516,9 @@ def test_entml_history_tool_invoke_reminder_when_tools_in_history() -> None:
         {"role": "tool", "tool_call_id": "call_1", "content": "found 3"},
         {"role": "user", "content": "summarize"},
     ]
-    content = inject_fncall(msgs, tools, proto)[0]["content"]
+    content = inject_fncall(
+        msgs, tools, proto, protocol_options={"thinking_level": "high"},
+    )[0]["content"]
     assert '<entml:invoke name="search">' in content
     assert '"query": "docs"' in content or "docs" in content
     assert "<!-- Tool Result ID:call_1 -->" in content
@@ -525,11 +527,13 @@ def test_entml_history_tool_invoke_reminder_when_tools_in_history() -> None:
     assert "<entml:funtions_results>" in content
     assert "<function_calling_behavior>" in content
     assert "IMPORTANT: The <entml:funtions_results> block is a top-level block" in content
-    fc_idx = content.index("<function_calling_behavior>\n")
     hist_idx = content.index("<entml:conversation_history>\n")
     results_idx = content.index("<entml:funtions_results>\n")
+    fc_idx = content.index("<function_calling_behavior>\n")
+    behavior_idx = content.index("<thinking_behavior>\n")
+    hard_idx = content.index("<entml:hard_constraint_restatement>\n")
     user_idx = content.index("<current_user_message>\n")
-    assert fc_idx < hist_idx < results_idx < user_idx
+    assert hist_idx < results_idx < fc_idx < behavior_idx < hard_idx < user_idx
 
 
 def test_strip_entml_from_user_content() -> None:

{echotools-2.3.93 → echotools-2.3.94}/src/echotools/exec/fncall/prompt/inject.py

@@ -148,13 +148,13 @@ def _build_entml_no_tools_prompt(
         sections.append(
             f"<user_system_prompt>\n{user_system_prompt.strip()}\n</user_system_prompt>"
         )
+    if history_text.strip():
+        sections.append(format_entml_conversation_history(history_text))
     thinking_behavior = build_entml_thinking_behavior_section(
         protocol_options, history_text=history_text
     )
     if thinking_behavior:
         sections.append(thinking_behavior)
-    if history_text.strip():
-        sections.append(format_entml_conversation_history(history_text))
     if current_user_message is not None:
         sections.append(format_entml_current_user_message(current_user_message))
     thinking_meta = build_entml_thinking_meta_section(protocol_options)

{echotools-2.3.93 → echotools-2.3.94}/src/echotools/exec/fncall/protocols/entml.py

@@ -233,6 +233,14 @@ class EntmlProtocol(ToolProtocol):
                 f"<history_markup_warning>\n{history_markup_warning}\n</history_markup_warning>"
             )
 
+        if history_text:
+            sections.append(
+                format_entml_conversation_history(history_text, _HISTORY_CLARIFY_EN)
+            )
+
+        if functions_results_text.strip():
+            sections.append(functions_results_text.strip())
+
         if tool_descs:
             sections.append(format_function_calling_behavior())
 
@@ -242,14 +250,6 @@ class EntmlProtocol(ToolProtocol):
         if thinking_behavior:
             sections.append(thinking_behavior)
 
-        if history_text:
-            sections.append(
-                format_entml_conversation_history(history_text, _HISTORY_CLARIFY_EN)
-            )
-
-        if functions_results_text.strip():
-            sections.append(functions_results_text.strip())
-
         if tool_descs:
             sections.append(format_hard_constraint_restatement())
 

{echotools-2.3.93 → echotools-2.3.94}/src/tests/test_entml_tool_pipeline.py

@@ -757,9 +757,9 @@ class TestBuildMechanisms:
         idx_tools = prompt.index("### search")
         idx_sys = prompt.index("<user_system_prompt>")
         idx_loop = prompt.index("<loop_warning>")
+        idx_hist = prompt.index("<entml:conversation_history>\n")
         idx_fc = prompt.index("<function_calling_behavior>\n")
         idx_behavior = prompt.index("<thinking_behavior>\n")
-        idx_hist = prompt.index("<entml:conversation_history>\n")
         idx_hard = prompt.index("<entml:hard_constraint_restatement>\n")
         idx_user = prompt.index("<current_user_message>\n")
         idx_max = prompt.index("<entml:max_thinking_length>")
@@ -768,9 +768,9 @@ class TestBuildMechanisms:
             idx_tools
             < idx_sys
             < idx_loop
+            < idx_hist
             < idx_fc
             < idx_behavior
-            < idx_hist
             < idx_hard
             < idx_user
             < idx_max