echotools 2.3.81__tar.gz → 2.3.82__tar.gz

{echotools-2.3.81 → echotools-2.3.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.81
+Version: 2.3.82
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -82,6 +82,20 @@ pip install echotools[all]
 | `all` | 全部可选依赖 |
 | `dev` | pytest, ruff, mypy |
 
+### PyPI 重装（`uninstall-no-record-file`）
+
+本地 `pip install -e .` 或中断的 wheel 安装可能留下无 `RECORD` 的元数据，导致
+`pip install --upgrade echotools` 报 `Cannot uninstall echotools None`。
+
+```powershell
+# 在仓库根目录
+powershell -File scripts/reinstall_from_pypi.ps1 -Version 2.3.81
+```
+
+或手动：删除 `src/echotools.egg-info` 与 site-packages 里仅有 `direct_url.json` 的
+`echotools-*.dist-info`，再执行
+`pip install --force-reinstall --no-cache-dir echotools==2.3.81`。
+
 ## 快速开始
 
 ```python

{echotools-2.3.81 → echotools-2.3.82}/docs/README.md

@@ -26,6 +26,20 @@ pip install echotools[all]
 | `all` | 全部可选依赖 |
 | `dev` | pytest, ruff, mypy |
 
+### PyPI 重装（`uninstall-no-record-file`）
+
+本地 `pip install -e .` 或中断的 wheel 安装可能留下无 `RECORD` 的元数据，导致
+`pip install --upgrade echotools` 报 `Cannot uninstall echotools None`。
+
+```powershell
+# 在仓库根目录
+powershell -File scripts/reinstall_from_pypi.ps1 -Version 2.3.81
+```
+
+或手动：删除 `src/echotools.egg-info` 与 site-packages 里仅有 `direct_url.json` 的
+`echotools-*.dist-info`，再执行
+`pip install --force-reinstall --no-cache-dir echotools==2.3.81`。
+
 ## 快速开始
 
 ```python

{echotools-2.3.81 → echotools-2.3.82}/pyproject.toml

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

{echotools-2.3.81 → echotools-2.3.82}/src/echotools/exec/fncall/protocols/entml_stream_json.py

@@ -20,6 +20,7 @@ from .entml_patterns import (
     parameter_close_at,
 )
 from .entml_values import coerce_entml_parameter_value
+from echotools.exec.fncall.shared.coercion import _resolve_effective_type
 
 _PARAM_OPEN_RE = re.compile(rf"{PARAM_OPEN_PATTERN}([^>]*)>", re.IGNORECASE)
 _PARAM_CLOSE = PARAM_CLOSE_ENTML
@@ -90,8 +91,10 @@ def _effective_param_type(
         mapped = _TYPE_HINT_TO_JSON_TYPE.get(type_hint.strip().lower())
         if mapped:
             return mapped
-    if pschema and pschema.get("type"):
-        return str(pschema["type"])
+    if pschema:
+        resolved = _resolve_effective_type(pschema)
+        if resolved:
+            return resolved
     stripped = (value or "").lstrip()
     if stripped.startswith("["):
         return "array"

{echotools-2.3.81 → echotools-2.3.82}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.81
+Version: 2.3.82
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -82,6 +82,20 @@ pip install echotools[all]
 | `all` | 全部可选依赖 |
 | `dev` | pytest, ruff, mypy |
 
+### PyPI 重装（`uninstall-no-record-file`）
+
+本地 `pip install -e .` 或中断的 wheel 安装可能留下无 `RECORD` 的元数据，导致
+`pip install --upgrade echotools` 报 `Cannot uninstall echotools None`。
+
+```powershell
+# 在仓库根目录
+powershell -File scripts/reinstall_from_pypi.ps1 -Version 2.3.81
+```
+
+或手动：删除 `src/echotools.egg-info` 与 site-packages 里仅有 `direct_url.json` 的
+`echotools-*.dist-info`，再执行
+`pip install --force-reinstall --no-cache-dir echotools==2.3.81`。
+
 ## 快速开始
 
 ```python

{echotools-2.3.81 → echotools-2.3.82}/src/tests/test_stream_partial_json_parity.py

@@ -85,6 +85,60 @@ def test_bare_parameter_close_at_buffer_end_snapshot() -> None:
     assert json.loads(snap + "}") == {"pattern": "foo|bar"}
 
 
+def test_read_anyof_integer_stream_json_buf_matches_batch() -> None:
+    """Rogator Read：line_offset 为 anyOf integer 时，流式 json_buf 不得误加引号（143143）。"""
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "Read",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "path": {"type": "string"},
+                        "line_offset": {
+                            "anyOf": [
+                                {"type": "integer", "minimum": 1},
+                                {"type": "integer", "maximum": -1},
+                            ],
+                        },
+                        "n_lines": {"type": "integer", "exclusiveMinimum": 0},
+                    },
+                    "required": ["path"],
+                },
+            },
+        }
+    ]
+    text = (
+        '<entml:invoke name="Read">\n'
+        '<entml:parameter name="path">X:/Project/Local/DeepSeek/core/guard/pow.py</entml:parameter>\n'
+        '<entml:parameter name="line_offset">143</entml:parameter>\n'
+        '<entml:parameter name="n_lines">15</entml:parameter>\n'
+        "</entml:invoke>"
+    )
+    proto = get_protocol("entml")
+    batch_args = json.loads(proto.parse(text, tools)[1][0]["function"]["arguments"])
+    parser = FncallStreamParser(protocol=proto, tools=tools)
+    json_buf = ""
+    for i in range(0, len(text), 17):
+        parser.feed(text[i : i + 17])
+        while True:
+            delta = parser.consume_stream_delta()
+            if not delta:
+                break
+            json_buf += delta[1]
+    comp = parser.complete_stream_delta_if_needed()
+    if comp:
+        json_buf += comp[1]
+    parser.finalize()
+    assert json.loads(json_buf) == batch_args
+    assert batch_args == {
+        "path": "X:/Project/Local/DeepSeek/core/guard/pow.py",
+        "line_offset": 143,
+        "n_lines": 15,
+    }
+
+
 def test_parameters_block_no_stream_until_closed() -> None:
     body = (
         "<entml:parameters>\n"