echotools 2.3.73__tar.gz → 2.3.74__tar.gz

{echotools-2.3.73 → echotools-2.3.74}/PKG-INFO

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

{echotools-2.3.73 → echotools-2.3.74}/pyproject.toml

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

{echotools-2.3.73 → echotools-2.3.74}/src/echotools/exec/fncall/protocols/entml_invoke.py

@@ -13,7 +13,7 @@ from .entml_patterns import (
     normalize_entml_name,
     parse_sub_tags,
 )
-from .entml_values import coerce_entml_arguments, coerce_entml_parameter_value
+from .entml_values import coerce_entml_arguments, coerce_entml_parameter_value, _apply_common_param_aliases
 
 
 def _parse_bare_invoke_children(
@@ -70,6 +70,7 @@ def parse_invoke_args(
         )
 
     _parse_bare_invoke_children(body, args, func_props)
+    _apply_common_param_aliases(args, func_props)
 
     return args
 

{echotools-2.3.73 → echotools-2.3.74}/src/echotools/exec/fncall/protocols/entml_values.py

@@ -71,6 +71,19 @@ def coerce_entml_parameter_value(
     return stripped
 
 
+def _apply_common_param_aliases(
+    args: Dict[str, Any],
+    func_props: Dict[str, Dict[str, Any]],
+) -> None:
+    """模型常把 ``path`` 写成 ``file_path`` / ``filepath``，按 schema 归一。"""
+    if not func_props or "path" not in func_props or "path" in args:
+        return
+    for alias in ("file_path", "filepath", "filePath"):
+        if alias in args:
+            args["path"] = args.pop(alias)
+            return
+
+
 def coerce_entml_arguments(
     args: Dict[str, Any],
     func_name: str,

{echotools-2.3.73 → echotools-2.3.74}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.73 → echotools-2.3.74}/src/tests/test_entml_protocol.py

@@ -1106,6 +1106,41 @@ def test_entml_parse_bare_parameter_tags_in_invoke() -> None:
         assert json.loads(stream_args[0]) == args, f"chunk={chunk}"
 
 
+def test_entml_parse_read_file_path_alias() -> None:
+    """Read 工具：模型输出 file_path 时映射为 schema 要求的 path。"""
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "Read",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "path": {"type": "string"},
+                        "line_offset": {"type": "integer"},
+                        "n_lines": {"type": "integer"},
+                    },
+                    "required": ["path"],
+                },
+            },
+        }
+    ]
+    schema_index = _build_param_schema_index(tools)
+    sample = (
+        '<entml:invoke name="Read">'
+        '<entml:parameter name="file_path">X:/Project/foo.py</entml:parameter>'
+        '<entml:parameter name="line_offset">122</entml:parameter>'
+        '<entml:parameter name="n_lines">25</entml:parameter>'
+        "</entml:invoke>"
+    )
+    calls = parse_entml_tool_calls(sample, tools, schema_index)
+    args = json.loads(calls[0]["function"]["arguments"])
+    assert "file_path" not in args
+    assert args["path"] == "X:/Project/foo.py"
+    assert args["line_offset"] == 122
+    assert args["n_lines"] == 25
+
+
 def test_entml_stream_same_tool_name_multiple_invokes() -> None:
     """同名连续 invoke 的流式 arguments 与 batch 一致。"""
     from echotools.exec.fncall.parsers.stream import FncallStreamParser