echotools 2.3.29__tar.gz → 2.3.31__tar.gz

{echotools-2.3.29 → echotools-2.3.31}/PKG-INFO

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

{echotools-2.3.29 → echotools-2.3.31}/pyproject.toml

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

{echotools-2.3.29 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/history_format.py

@@ -15,9 +15,22 @@ from .prompt_helpers import (
 )
 
 
+def history_contains_tool_calls(messages: List[Dict[str, Any]]) -> bool:
+    """历史消息中是否包含 assistant tool_calls 或 tool 结果。"""
+    for m in messages:
+        role = m.get("role") or "user"
+        if role == "assistant" and m.get("tool_calls"):
+            return True
+        if role == "tool":
+            return True
+    return False
+
+
 def _format_conversation_history(
     messages: List[Dict[str, Any]],
     protocol: Optional[Any] = None,
+    *,
+    include_thinking_in_history: bool = False,
 ) -> str:
     if not messages:
         return ""
@@ -48,14 +61,16 @@ def _format_conversation_history(
                     tool_msgs.append(messages[j])
                     j += 1
                 block = format_assistant_block_with_results(
-                    m, tool_msgs, protocol, call_id_to_name, seen_assistant_keys
+                    m, tool_msgs, protocol, call_id_to_name, seen_assistant_keys,
+                    include_thinking_in_history=include_thinking_in_history,
                 )
                 if block:
                     parts.append((block, False))
                 i = j
             else:
                 block = format_assistant_block(
-                    m, content_str, protocol, call_id_to_name, seen_assistant_keys
+                    m, content_str, protocol, call_id_to_name, seen_assistant_keys,
+                    include_thinking_in_history=include_thinking_in_history,
                 )
                 if block:
                     parts.append((block, False))

{echotools-2.3.29 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/inject.py

@@ -12,6 +12,7 @@ from echotools.exec.fncall.prompt.history import (
 )
 from echotools.exec.fncall.prompt.history_format import (
     _format_conversation_history,
+    history_contains_tool_calls,
 )
 from echotools.exec.fncall.prompt.prompt_helpers import (
     build_no_tools_prompt,
@@ -22,6 +23,10 @@ from echotools.exec.fncall.protocols.entml import (
     format_entml_current_user_message,
 )
 from echotools.exec.fncall.protocols.entml_thinking import build_entml_thinking_section
+from echotools.exec.fncall.protocols.entml_thinking_history import (
+    apply_thinking_history_policy,
+    parse_include_thinking_in_history,
+)
 from echotools.exec.fncall.shared.loop_detect import detect_tool_loop
 from echotools.exec.fncall.shared.normalization import format_tool_descs
 from echotools.exec.protocol.base import ToolProtocol
@@ -57,6 +62,7 @@ def build_tools_prompt(
     current_user_message: str,
     loop_detection_threshold: int,
     protocol_options: Optional[Dict[str, Any]] = None,
+    history_has_tool_calls: bool = False,
 ) -> str:
     loop_warning = ""
     if loop_detection_threshold > 0:
@@ -73,6 +79,8 @@ def build_tools_prompt(
         if protocol_options is not None and protocol.id == "entml"
         else {}
     )
+    if protocol.id == "entml":
+        extra["history_has_tool_calls"] = history_has_tool_calls
     return protocol.render_prompt(
         tool_descs=tool_descs,
         lang=lang,
@@ -96,14 +104,18 @@ def inject_fncall(
     protocol_options: Optional[Dict[str, Any]] = None,
 ) -> List[Dict[str, Any]]:
     """注入工具定义，返回单条 user 消息（含历史）。"""
-    normalized = _normalize_messages(list(messages))
+    include_history = parse_include_thinking_in_history(protocol_options)
+    prepared = apply_thinking_history_policy(list(messages), include_history)
+    normalized = _normalize_messages(prepared)
     history_messages, current_user_message = split_last_user_message(normalized)
 
     if hasattr(protocol, 'clean_tags'):
         current_user_message = protocol.clean_tags(current_user_message)
 
     history_text = _format_conversation_history(
-        history_messages, protocol=protocol
+        history_messages,
+        protocol=protocol,
+        include_thinking_in_history=include_history,
     ).strip()
 
     if not tools:
@@ -125,6 +137,7 @@ def inject_fncall(
     prompt = build_tools_prompt(
         protocol, tools, normalized, lang, user_system_prompt,
         history_text, current_user_message, loop_detection_threshold, protocol_options,
+        history_has_tool_calls=history_contains_tool_calls(history_messages),
     )
     if dump_prompt:
         _maybe_dump_prompt(prompt, dump_dir)

{echotools-2.3.29 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/prompt_helpers.py

@@ -15,9 +15,37 @@ from .history import (
     _try_convert_user_to_tool,
 )
 
+from echotools.exec.fncall.protocols.entml_thinking_history import (
+    extract_reasoning_text,
+    format_entml_thinking_history_block,
+)
+
 logger = get_logger(__name__)
 
 
+def _assistant_history_content_blocks(
+    m: Dict[str, Any],
+    content_str: str,
+    protocol: Optional[Any],
+    include_thinking_in_history: bool,
+) -> List[str]:
+    """构建 assistant 历史块正文（可选前置 entml:thinking）。"""
+    blocks: List[str] = []
+    if (
+        include_thinking_in_history
+        and protocol is not None
+        and getattr(protocol, "id", None) == "entml"
+    ):
+        reasoning = extract_reasoning_text(m)
+        if reasoning:
+            thinking_block = format_entml_thinking_history_block(reasoning)
+            if thinking_block:
+                blocks.append(thinking_block)
+    if content_str:
+        blocks.append(content_str)
+    return blocks
+
+
 def split_last_user_message(
     normalized: List[Dict[str, Any]],
 ) -> Tuple[List[Dict[str, Any]], str]:
@@ -52,11 +80,13 @@ def format_assistant_block(
     protocol: Optional[Any],
     call_id_to_name: Dict[str, str],
     seen_assistant_keys: Set[Tuple[str, Tuple[Tuple[str, str], ...]]],
+    *,
+    include_thinking_in_history: bool = False,
 ) -> Optional[str]:
     tcs: List[Dict[str, Any]] = m.get("tool_calls") or []
-    blocks: List[str] = []
-    if content_str:
-        blocks.append(content_str)
+    blocks = _assistant_history_content_blocks(
+        m, content_str, protocol, include_thinking_in_history
+    )
     for tc in tcs:
         cid = tc.get("id") or ""
         fn_name = (tc.get("function") or {}).get("name") or ""
@@ -87,6 +117,8 @@ def format_assistant_block_with_results(
     protocol: Optional[Any],
     call_id_to_name: Dict[str, str],
     seen_assistant_keys: Set[Tuple[str, Tuple[Tuple[str, str], ...]]],
+    *,
+    include_thinking_in_history: bool = False,
 ) -> Optional[str]:
     tcs: List[Dict[str, Any]] = m.get("tool_calls") or []
     content_str = normalize_content(m.get("content", ""))
@@ -102,9 +134,9 @@ def format_assistant_block_with_results(
         for tmsg in tool_msgs
     }
 
-    blocks: List[str] = []
-    if content_str:
-        blocks.append(content_str)
+    blocks = _assistant_history_content_blocks(
+        m, content_str, protocol, include_thinking_in_history
+    )
 
     for tc in tcs:
         if protocol is not None and hasattr(protocol, "format_assistant_tool_calls"):

{echotools-2.3.29 → echotools-2.3.31}/src/echotools/exec/fncall/prompt/templates.py

@@ -118,6 +118,15 @@ _HISTORY_CLARIFY_EN = (
     "The user's latest message follows below."
 )
 
+_HISTORY_TOOL_INVOKE_REMINDER_EN = (
+    "Reminder — tool notation in the conversation history above: prior tool "
+    "calls appear as compact pseudocode (e.g. `[function_name(arg=\"value\")]` "
+    "and optional `→ Result:` / `→ Error:` lines). That transcript is for "
+    "context only; it is not parsed and must not be copied. To invoke a tool "
+    "in your reply, output a valid `<entml:invoke>` block exactly as specified "
+    "in the tool instructions at the top of this prompt."
+)
+
 _HISTORY_CLARIFY_ZH = (
     "以下是已完成的交互记录。"
     "此处展示的所有工具调用及其结果均已执行完毕，请勿重复调用。"

{echotools-2.3.29 → echotools-2.3.31}/src/echotools/exec/fncall/protocols/entml.py

@@ -10,7 +10,10 @@ from __future__ import annotations
 import json as _json
 from typing import Any, Dict, List, Optional, Tuple
 
-from echotools.exec.fncall.prompt.templates import _HISTORY_CLARIFY_EN
+from echotools.exec.fncall.prompt.templates import (
+    _HISTORY_CLARIFY_EN,
+    _HISTORY_TOOL_INVOKE_REMINDER_EN,
+)
 from echotools.exec.fncall.protocols.entml_invoke import (
     format_entml_tool_calls,
     parse_entml_tool_calls,
@@ -117,6 +120,7 @@ class EntmlProtocol(ToolProtocol):
         loop_warning: str = "",
         current_user_message: str = "",
         protocol_options: Optional[Dict[str, Any]] = None,
+        history_has_tool_calls: bool = False,
     ) -> str:
         if tool_descs:
             sections: List[str] = [
@@ -138,6 +142,8 @@ class EntmlProtocol(ToolProtocol):
             sections.append(
                 format_entml_conversation_history(history_text, _HISTORY_CLARIFY_EN)
             )
+            if tool_descs and history_has_tool_calls:
+                sections.append(_HISTORY_TOOL_INVOKE_REMINDER_EN)
 
         if loop_warning:
             sections.append(f"<loop_warning>\n{loop_warning}\n</loop_warning>")

{echotools-2.3.29 → echotools-2.3.31}/src/echotools/exec/fncall/protocols/entml_thinking_history.py

@@ -11,6 +11,29 @@ HISTORY_FLAG_KEYS = (
 )
 _THINKING_BLOCK_TYPES = frozenset({"thinking", "reasoning", "redacted_thinking"})
 
+_THINKING_BLOCK_OPEN = "<entml:thinking>"
+_THINKING_BLOCK_CLOSE = "</entml:thinking>"
+
+
+def format_entml_thinking_history_block(text: str) -> str:
+    """将历史 assistant 思考链格式化为 entml 块（供 conversation_history 使用）。"""
+    stripped = (text or "").strip()
+    if not stripped:
+        return ""
+    return f"{_THINKING_BLOCK_OPEN}\n{stripped}\n{_THINKING_BLOCK_CLOSE}"
+
+
+def parse_include_thinking_in_history(
+    protocol_options: Optional[Mapping[str, Any]],
+) -> bool:
+    """从 protocol_options 解析是否在历史中渲染 assistant 思考链。"""
+    if not protocol_options:
+        return False
+    for key in HISTORY_FLAG_KEYS:
+        if key in protocol_options:
+            return bool(protocol_options[key])
+    return False
+
 
 def parse_interleaved_history(
     body: Mapping[str, Any],

{echotools-2.3.29 → echotools-2.3.31}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.29 → echotools-2.3.31}/src/tests/test_entml_protocol.py

@@ -207,6 +207,49 @@ def test_entml_history_clarify_always_english() -> None:
     content = inject_fncall(msgs, tools, proto, lang="zh")[0]["content"]
     assert "The following is a transcript of completed interactions." in content
     assert "以下是已完成的交互记录" not in content
+    assert "Reminder — tool notation in the conversation history above" not in content
+
+
+def test_entml_history_tool_invoke_reminder_when_tools_in_history() -> None:
+    proto = get_protocol("entml")
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "search",
+                "description": "Search",
+                "parameters": {
+                    "type": "object",
+                    "properties": {"query": {"type": "string"}},
+                },
+            },
+        }
+    ]
+    msgs = [
+        {"role": "user", "content": "find docs"},
+        {
+            "role": "assistant",
+            "content": "",
+            "tool_calls": [{
+                "id": "call_1",
+                "type": "function",
+                "function": {
+                    "name": "search",
+                    "arguments": json.dumps({"query": "docs"}),
+                },
+            }],
+        },
+        {"role": "tool", "tool_call_id": "call_1", "content": "found 3"},
+        {"role": "user", "content": "summarize"},
+    ]
+    content = inject_fncall(msgs, tools, proto)[0]["content"]
+    assert "[search(query=\"docs\")]" in content
+    assert "Reminder — tool notation in the conversation history above" in content
+    assert "output a valid `<entml:invoke>` block" in content
+    hist_idx = content.index("<entml:conversation_history>")
+    reminder_idx = content.index("Reminder — tool notation")
+    user_idx = content.index("<current_user_message>")
+    assert hist_idx < reminder_idx < user_idx
 
 
 @pytest.mark.parametrize(
@@ -426,3 +469,43 @@ def test_entml_parse_schema_coercion() -> None:
     calls = parse_entml_tool_calls(sample, tools, schema_index)
     args = json.loads(calls[0]["function"]["arguments"])
     assert args == {"count": 7, "enabled": True, "tags": ["x", "y"]}
+
+
+def test_inject_include_thinking_in_history() -> None:
+    """protocol_options.include_thinking_in_history 应在历史中渲染 entml:thinking。"""
+    proto = get_protocol("entml")
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "get_weather",
+                "description": "weather",
+                "parameters": {
+                    "type": "object",
+                    "properties": {"city": {"type": "string"}},
+                    "required": ["city"],
+                },
+            },
+        }
+    ]
+    msgs = [
+        {"role": "user", "content": "查北京天气"},
+        {
+            "role": "assistant",
+            "reasoning": "应先调用 get_weather 获取实时数据。",
+            "content": "我来查一下。",
+        },
+        {"role": "user", "content": "那上海呢？"},
+    ]
+    plain = inject_fncall(msgs, tools, proto)[0]["content"]
+    assert "应先调用 get_weather" not in plain
+
+    with_history = inject_fncall(
+        msgs,
+        tools,
+        proto,
+        protocol_options={"include_thinking_in_history": True},
+    )[0]["content"]
+    assert "<entml:thinking>" in with_history
+    assert "应先调用 get_weather 获取实时数据。" in with_history
+    assert "那上海呢？" in with_history