echotools 2.3.2__tar.gz → 2.3.4__tar.gz

{echotools-2.3.2 → echotools-2.3.4}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.2
+Version: 2.3.4
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
-License: MIT
+License-Expression: 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
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9

{echotools-2.3.2 → echotools-2.3.4}/pyproject.toml

@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.2"
+version = "2.3.4"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "README.md"
 requires-python = ">=3.8"
-license = { text = "MIT" }
+license = "MIT"
 authors = [{ name = "nichengfuben" }]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
@@ -136,4 +135,4 @@ exclude_lines = [
     "def __repr__",
     "if TYPE_CHECKING:",
     "raise NotImplementedError",
-]
+]

{echotools-2.3.2 → echotools-2.3.4}/src/echotools/fncall/prompt/history.py

@@ -36,6 +36,45 @@ _TOOL_CALL_MARKER_RE = re.compile(
     r"|<invoke\s+name=",
 )
 
+# entml 标签清理正则
+_ENTML_FNCALL_BLOCK_RE = re.compile(
+    r"<entml:function_calls\b[^>]*>.*?</entml:function_calls>",
+    re.DOTALL,
+)
+_ENTML_INVOKE_RE = re.compile(
+    r'<entml:invoke\s+name="[^"]+"\s*>.*?</entml:invoke>',
+    re.DOTALL,
+)
+_ENTML_PARAMETERS_RE = re.compile(
+    r'<entml:parameters>.*?</entml:parameters>',
+    re.DOTALL,
+)
+_ENTML_PARAM_RE = re.compile(
+    r'<entml:parameter\s+name="[^"]+"\s*>.*?</entml:parameter>',
+    re.DOTALL,
+)
+# 清理任意 entml:* 标签
+_ENTML_ANY_TAG_RE = re.compile(
+    r'<entml:[a-zA-Z_][\w]*\b[^>]*>.*?</entml:[a-zA-Z_][\w]*>',
+    re.DOTALL,
+)
+
+
+def _clean_entml_tags(content: str) -> str:
+    """移除内容中的所有 entml 标签及其内部内容。"""
+    if not content:
+        return content
+    cleaned = content
+    cleaned = _ENTML_FNCALL_BLOCK_RE.sub("", cleaned)
+    cleaned = _ENTML_INVOKE_RE.sub("", cleaned)
+    cleaned = _ENTML_PARAMETERS_RE.sub("", cleaned)
+    cleaned = _ENTML_PARAM_RE.sub("", cleaned)
+    cleaned = _ENTML_ANY_TAG_RE.sub("", cleaned)
+    # 清理多余空行
+    lines = [line for line in cleaned.splitlines() if line.strip()]
+    return "\n".join(lines)
+
+
 # ---------------------------------------------------------------------------
 # 渲染工具调用 / 工具结果
 # ---------------------------------------------------------------------------
@@ -335,6 +374,7 @@ def _format_conversation_history(
         protocol: 可选的 ToolProtocol 实例。提供时使用
             protocol.format_assistant_tool_calls() 渲染工具调用，
             确保历史中的工具调用格式与 LLM 指令中的格式一致。
+            同时使用 protocol.clean_tags() 清理 user 消息中的 entml 标签。
 
     始终渲染所有消息角色（包括 assistant tool_calls 和 tool results），
     不区分客户端类型。
@@ -346,11 +386,19 @@ def _format_conversation_history(
     seen_assistant_keys: Set[Tuple[str, Tuple[Tuple[str, str], ...]]] = set()
     parts: List[Tuple[str, bool]] = []
 
+    # 获取清理函数
+    clean_fn = None
+    if protocol and hasattr(protocol, 'clean_tags'):
+        clean_fn = protocol.clean_tags
+
     for m in messages:
         role: str = m.get("role") or "user"
         content_str = normalize_content(m.get("content", ""))
 
         if role == "user":
+            # 清理用户消息中的 entml 标签
+            if clean_fn:
+                content_str = clean_fn(content_str)
             parts.append((f"<user>\n{content_str}\n</user>", False))
 
         elif role == "assistant":
@@ -371,7 +419,7 @@ def _format_conversation_history(
                     content_str and _TOOL_CALL_MARKER_RE.search(content_str)
                 )
                 if not content_has_markers:
-                    if protocol is not None:
+                    if protocol is not None and hasattr(protocol, 'format_assistant_tool_calls'):
                         blocks.append(protocol.format_assistant_tool_calls(tcs))
                     else:
                         for tc in tcs:

{echotools-2.3.2 → echotools-2.3.4}/src/echotools/fncall/prompt/inject.py

@@ -50,7 +50,9 @@ def inject_fncall(
     dump_dir: Optional[str] = None,
 ) -> List[Dict[str, Any]]:
     """注入工具定义为单条 user 消息。
-
+    
+    无论是否有 tools，都构建包含历史的 prompt 返回单条 user 消息。
+    
     Args:
         messages: 消息列表。
         tools: 工具定义。
@@ -64,26 +66,18 @@ def inject_fncall(
     Returns:
         单条 user 消息列表。
     """
-    if not tools:
-        return list(messages)
     normalized = _normalize_messages(list(messages))
-    loop_warning = ""
-    if loop_detection_threshold > 0:
-        result = detect_tool_loop(normalized, loop_detection_threshold)
-        if result.is_looping:
-            logger.debug(
-                "检测到工具循环（%d 次）", result.repeat_count
-            )
-            loop_warning = result.suggestion
+    
+    # 提取最后一条 user 消息和历史
     last_user_idx: Optional[int] = None
     for i in range(len(normalized) - 1, -1, -1):
         if (normalized[i].get("role") or "user") == "user":
             last_user_idx = i
             break
+    
     if last_user_idx is not None:
         history_messages = (
-            normalized[:last_user_idx]
-            + normalized[last_user_idx + 1 :]
+            normalized[:last_user_idx] + normalized[last_user_idx + 1:]
         )
         current_user_message = normalize_content(
             normalized[last_user_idx].get("content", "")
@@ -91,13 +85,34 @@ def inject_fncall(
     else:
         history_messages = normalized
         current_user_message = ""
+
+    # 清理当前用户消息中的 entml 标签
+    if hasattr(protocol, 'clean_tags'):
+        current_user_message = protocol.clean_tags(current_user_message)
+
+    # 构建历史文本（传入 protocol 以便清理 user 消息中的 entml 标签）
+    history_text = _format_conversation_history(
+        history_messages, protocol=protocol
+    ).strip()
+
+    # 如果没有 tools，直接拼历史 + 当前消息，不注入工具定义
+    if not tools:
+        prompt = f"<conversation_history>\n{history_text}\n</conversation_history>\n\n<current_user_message>\n{current_user_message}\n</current_user_message>"
+        return [{"role": "user", "content": prompt}]
+
+    # 有 tools：走原有逻辑
+    loop_warning = ""
+    if loop_detection_threshold > 0:
+        result = detect_tool_loop(normalized, loop_detection_threshold)
+        if result.is_looping:
+            logger.debug("检测到工具循环（%d 次）", result.repeat_count)
+            loop_warning = result.suggestion
+
     if hasattr(protocol, 'format_tool_descs'):
         tool_descs = protocol.format_tool_descs(tools)
     else:
         tool_descs = format_tool_descs(tools)
-    history_text = _format_conversation_history(
-        history_messages, protocol=protocol
-    ).strip()
+
     prompt = protocol.render_prompt(
         tool_descs=tool_descs,
         lang=lang,
@@ -106,6 +121,8 @@ def inject_fncall(
         loop_warning=loop_warning,
         current_user_message=current_user_message,
     )
+
     if dump_prompt:
         _maybe_dump_prompt(prompt, dump_dir)
+
     return [{"role": "user", "content": prompt}]

{echotools-2.3.2 → echotools-2.3.4}/src/echotools/fncall/protocols/entml.py

@@ -75,6 +75,29 @@ _PARAMETERS_RE = re.compile(
     r'<entml:parameters>([\s\S]*?)</entml:parameters>',
     re.DOTALL,
 )
+# 用于解析 <entml:parameters> 内的子标签
+_SUB_TAG_RE = re.compile(
+    r'<([^>]+)>([\s\S]*?)</\1>',
+    re.DOTALL,
+)
+
+
+def _parse_sub_tags(content: str, schema_index: Optional[Dict[str, Any]] = None, func_name: str = "") -> Dict[str, Any]:
+    """解析 <entml:parameters> 内的子标签，返回参数字典。"""
+    args: Dict[str, Any] = {}
+    for m in _SUB_TAG_RE.finditer(content):
+        pname = m.group(1).strip()
+        pval = m.group(2).strip()
+        pschema = schema_index.get(func_name, {}).get(pname, {}) if schema_index else {}
+        if pschema:
+            args[pname] = _coerce_param_value(pval, pschema)
+        else:
+            try:
+                args[pname] = json.loads(pval)
+            except json.JSONDecodeError:
+                args[pname] = pval
+    return args
+
 
 # ---------------------------------------------------------------------------
 # Entml 协议
@@ -179,11 +202,18 @@ class EntmlProtocol(ToolProtocol):
                 # Try <entml:parameters>{json}</entml:parameters> format first
                 params_m = _PARAMETERS_RE.search(body)
                 if params_m:
-                    params_json = params_m.group(1).strip()
+                    params_content = params_m.group(1).strip()
                     try:
-                        args = json.loads(params_json)
+                        # 尝试 JSON 解析
+                        args = json.loads(params_content)
+                        if not isinstance(args, dict):
+                            args = {"value": args}
                     except json.JSONDecodeError:
-                        args = {"value": params_json}
+                        # 不是 JSON，尝试解析子标签
+                        args = _parse_sub_tags(params_content, schema_index, name)
+                        # 如果子标签解析也没结果，整个当作值
+                        if not args:
+                            args = {"value": params_content}
                 else:
                     # Try <entml:parameter name="...">value</entml:parameter> format
                     for param_m in _PARAM_RE.finditer(body):

{echotools-2.3.2 → echotools-2.3.4}/src/echotools.egg-info/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.2
+Version: 2.3.4
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Author: nichengfuben
-License: MIT
+License-Expression: 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
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9