echotools 2.4.2__tar.gz → 2.4.4__tar.gz

{echotools-2.4.2 → echotools-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.4.2
+Version: 2.4.4
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -58,7 +58,7 @@ Requires-Dist: ruff>=0.4.0; extra == "dev"
 
 通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
 
-完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.2**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.4**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 

{echotools-2.4.2 → echotools-2.4.4}/README.md

@@ -2,7 +2,7 @@
 
 通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
 
-完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.2**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.4**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 

{echotools-2.4.2 → echotools-2.4.4}/pyproject.toml

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

{echotools-2.4.2 → echotools-2.4.4}/src/echotools/exec/fncall/protocols/entml_schema/validate.py

@@ -5,6 +5,8 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Sequence
 
+from echotools.exec.fncall.shared.coercion import is_null_literal, schema_allows_null
+
 _SCALAR_CHECK = {
     "string": lambda v: isinstance(v, str),
     "integer": lambda v: isinstance(v, int) and not isinstance(v, bool),
@@ -47,30 +49,6 @@ class ToolArgValidationError(Exception):
         return f"{prefix}\n{body}".strip() if prefix else body
 
 
-def schema_allows_null(schema: Dict[str, Any]) -> bool:
-    if not schema:
-        return False
-    raw_type = schema.get("type")
-    if raw_type == "null":
-        return True
-    if isinstance(raw_type, list) and "null" in raw_type:
-        return True
-    for key in ("anyOf", "oneOf"):
-        combiner = schema.get(key)
-        if not isinstance(combiner, list):
-            continue
-        for sub in combiner:
-            if isinstance(sub, dict) and sub.get("type") == "null":
-                return True
-    return False
-
-
-def is_null_literal(raw: str) -> bool:
-    if raw is None:
-        return True
-    return raw.strip().lower() in ("", "null", "none")
-
-
 def _enum_values(schema: Dict[str, Any]) -> Optional[List[Any]]:
     enum_vals = schema.get("enum")
     if isinstance(enum_vals, list) and enum_vals:

{echotools-2.4.2 → echotools-2.4.4}/src/echotools/exec/fncall/protocols/entml_tool/fakemarkup.py

@@ -29,6 +29,7 @@ _TAG_ONLY_OPEN_RES = (
     re.compile(r"<entml:call\b[^>]*>", re.IGNORECASE),
     re.compile(r"<function_calling_behavior\b[^>]*>", re.IGNORECASE),
     re.compile(r"<thinking_behavior\b[^>]*>", re.IGNORECASE),
+    re.compile(r"<entml:hard_constraint_restatement\b[^>]*>", re.IGNORECASE),
     re.compile(r"<entml:result\b[^>]*>", re.IGNORECASE),
     re.compile(r"<entml:todo\b[^>]*>", re.IGNORECASE),
 )
@@ -39,6 +40,7 @@ _TAG_ONLY_CLOSE_RES = (
     re.compile(r"</entml:call\s*>", re.IGNORECASE),
     re.compile(r"</function_calling_behavior\s*>", re.IGNORECASE),
     re.compile(r"</thinking_behavior\s*>", re.IGNORECASE),
+    re.compile(r"</entml:hard_constraint_restatement\s*>", re.IGNORECASE),
     re.compile(r"</entml:result\s*>", re.IGNORECASE),
     re.compile(r"</entml:todo\s*>", re.IGNORECASE),
 )
@@ -58,6 +60,8 @@ _FAKE_ENTML_TAG_PREFIXES: Tuple[str, ...] = (
     "</function_calling_behavior",
     "<thinking_behavior",
     "</thinking_behavior",
+    "<entml:hard_constraint_restatement",
+    "</entml:hard_constraint_restatement",
     "<entml:todo",
     "</entml:todo",
     "</entml:invoke",

{echotools-2.4.2 → echotools-2.4.4}/src/echotools/exec/fncall/shared/coercion.py

@@ -10,10 +10,6 @@ import json
 from typing import Any, Dict, List, Optional, Sequence
 
 from echotools.base.logger.manager import get_logger
-from echotools.exec.fncall.protocols.entml_schema.validate import (
-    is_null_literal,
-    schema_allows_null,
-)
 
 logger = get_logger(__name__)
 
@@ -21,6 +17,30 @@ _SCALAR_TYPES = frozenset({"string", "integer", "number", "boolean", "null"})
 _CONTAINER_TYPES = frozenset({"array", "object"})
 
 
+def schema_allows_null(schema: Dict[str, Any]) -> bool:
+    if not schema:
+        return False
+    raw_type = schema.get("type")
+    if raw_type == "null":
+        return True
+    if isinstance(raw_type, list) and "null" in raw_type:
+        return True
+    for key in ("anyOf", "oneOf"):
+        combiner = schema.get(key)
+        if not isinstance(combiner, list):
+            continue
+        for sub in combiner:
+            if isinstance(sub, dict) and sub.get("type") == "null":
+                return True
+    return False
+
+
+def is_null_literal(raw: str) -> bool:
+    if raw is None:
+        return True
+    return raw.strip().lower() in ("", "null", "none")
+
+
 def _build_param_schema_index(
     tools: Optional[List[Dict[str, Any]]],
 ) -> Dict[str, Dict[str, Dict[str, Any]]]:

{echotools-2.4.2 → echotools-2.4.4}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.4.2
+Version: 2.4.4
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -58,7 +58,7 @@ Requires-Dist: ruff>=0.4.0; extra == "dev"
 
 通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
 
-完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.2**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.4**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 

{echotools-2.4.2 → echotools-2.4.4}/src/tests/test_entml_fake_structure_markup.py

@@ -77,6 +77,12 @@ READ_TOOL = {
             "thinking_behavior",
             "后",
         ),
+        (
+            "前\n<entml:hard_constraint_restatement>\n硬约束复述\n</entml:hard_constraint_restatement>\n后",
+            "硬约束复述",
+            "hard_constraint_restatement",
+            "后",
+        ),
         (
             "<entml:result>\nbody\n</entml:result>\nok",
             "body",