echotools 2.3.96__tar.gz → 2.3.97__tar.gz

{echotools-2.3.96 → echotools-2.3.97}/PKG-INFO

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

{echotools-2.3.96 → echotools-2.3.97}/pyproject.toml

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

{echotools-2.3.96 → echotools-2.3.97}/src/echotools/exec/fncall/protocols/entml_fake_structure_markup.py

@@ -52,6 +52,19 @@ _FAKE_ENTML_TAG_PREFIXES: Tuple[str, ...] = (
     "</function_calling_behavior",
     "<thinking_behavior",
     "</thinking_behavior",
+    "</entml:invoke",
+    "</entml:parameter",
+    "</entml:thinking",
+)
+
+# 模型误输出的残缺/单行 ``</entml:…``（无完整闭标签名或未收齐 ``>``）。
+_ORPHAN_ENTML_CLOSE_LINE_RE = re.compile(
+    r"(?m)^\s*(?:●\s*)?</entml:?[a-z0-9_-]*\s*$",
+    re.IGNORECASE,
+)
+_TRAILING_INCOMPLETE_ENTML_CLOSE_RE = re.compile(
+    r"</entml:?[a-z0-9_-]*\s*$",
+    re.IGNORECASE,
 )
 
 
@@ -69,6 +82,12 @@ def _strip_tag_only_markup(text: str) -> Tuple[str, bool]:
     return text, found
 
 
+def _strip_orphan_entml_close_leaks(text: str) -> Tuple[str, bool]:
+    text, n1 = _ORPHAN_ENTML_CLOSE_LINE_RE.subn("", text)
+    text, n2 = _TRAILING_INCOMPLETE_ENTML_CLOSE_RE.subn("", text)
+    return text, (n1 + n2) > 0
+
+
 def _could_be_fake_entml_tag_prefix(fragment: str) -> bool:
     frag = fragment.lower()
     if not frag.startswith("<"):
@@ -153,6 +172,8 @@ def strip_fake_entml_structure_markup(content: str) -> Tuple[str, bool]:
     found = found or hit
     text, hit = _strip_tag_only_markup(text)
     found = found or hit
+    text, hit = _strip_orphan_entml_close_leaks(text)
+    found = found or hit
     text = re.sub(r"\n{3,}", "\n\n", text)
     return text, found
 

{echotools-2.3.96 → echotools-2.3.97}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.96 → echotools-2.3.97}/src/tests/test_entml_fake_structure_markup.py

@@ -135,6 +135,41 @@ def test_bare_result_tags_only_not_body() -> None:
     assert "尾" in cleaned
 
 
+def test_orphan_incomplete_entml_close_leak() -> None:
+    raw = (
+        "说明正文\n"
+        "<!-- Tool Result ID:toolu_check_theme_btn -->\n"
+        "</entml:"
+    )
+    cleaned, found = strip_fake_entml_structure_markup(raw)
+    assert found
+    assert "说明正文" in cleaned
+    assert "entml" not in cleaned.lower()
+    assert "Tool Result ID" not in cleaned
+
+
+def test_rogator_response_log_corpus_no_entml_tail() -> None:
+    from pathlib import Path
+
+    log = Path(__file__).resolve().parent / "fixtures" / "rogator_entml_close_leak.txt"
+    raw = log.read_text(encoding="utf-8")
+    READ = {
+        "type": "function",
+        "function": {
+            "name": "Grep",
+            "parameters": {
+                "type": "object",
+                "properties": {"pattern": {"type": "string"}, "path": {"type": "string"}},
+                "required": ["pattern"],
+            },
+        },
+    }
+    proto = get_protocol("entml")
+    clean, calls = proto.parse(raw, [READ])
+    assert calls
+    assert "entml" not in clean.lower()
+
+
 def test_batch_parse_strips_fake_structure() -> None:
     text = (
         "回答正文\n"