echotools 2.3.51__tar.gz → 2.3.52__tar.gz

{echotools-2.3.51 → echotools-2.3.52}/PKG-INFO

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

{echotools-2.3.51 → echotools-2.3.52}/pyproject.toml

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

{echotools-2.3.51 → echotools-2.3.52}/src/echotools/exec/fncall/parsers/stream.py

@@ -332,6 +332,23 @@ class FncallStreamParser:
                 return True
         return False
 
+    def _sync_json_stream_encoder_emitted(self) -> None:
+        """invoke 已 ready 后对齐 encoder，避免下一 chunk 重发整段 partial_json。"""
+        if self._json_stream_encoder is None:
+            return
+        from echotools.exec.fncall.protocols.entml_stream_json import (
+            build_streaming_json_snapshot,
+            split_invoke_open,
+        )
+
+        parsed = split_invoke_open(self._fncall_buf)
+        if not parsed:
+            self._json_stream_encoder.reset()
+            return
+        _, body_start = parsed
+        body = self._fncall_buf[body_start:]
+        self._json_stream_encoder._emitted = build_streaming_json_snapshot(body)
+
     def feed(self, chunk: str) -> List[Dict[str, Any]]:
         """喂入新的流式文本块。
 
@@ -352,7 +369,7 @@ class FncallStreamParser:
         self._pending_stream_delta = self._poll_streaming_tool_input_delta()
         ready = self.get_ready_tool_calls()
         if ready and self._json_stream_encoder is not None:
-            self._json_stream_encoder.reset()
+            self._sync_json_stream_encoder_emitted()
         return ready
 
     def _poll_streaming_tool_input_delta(self) -> Optional[Tuple[str, str]]:

{echotools-2.3.51 → echotools-2.3.52}/src/echotools.egg-info/PKG-INFO

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

{echotools-2.3.51 → echotools-2.3.52}/src/tests/test_fncall_stream_thinking.py

@@ -170,6 +170,42 @@ def test_fault_thinking_close_without_invoke_is_plain_text() -> None:
     assert "answer" in clean
 
 
+def test_stream_delta_not_duplicated_after_invoke_in_thinking() -> None:
+    """thinking 内 invoke ready 后，下一 chunk 不应重发整段 partial_json。"""
+    import json
+
+    bash_tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "Bash",
+                "parameters": {
+                    "type": "object",
+                    "properties": {"command": {"type": "string"}},
+                    "required": ["command"],
+                },
+            },
+        },
+    ]
+    parser = FncallStreamParser(protocol=get_protocol("entml"), tools=bash_tools)
+    text = (
+        "<entml:thinking>\nneed to run echo\n"
+        '<entml:invoke name="Bash">\n'
+        '<entml:parameter name="command">echo hello</entml:parameter>\n'
+        "</entml:invoke>\n"
+    )
+    merged = ""
+    for ch in text:
+        parser.feed(ch)
+        delta = parser.consume_stream_delta()
+        if delta:
+            merged += delta[1]
+    json.loads(merged)
+    assert merged.count('"command"') == 1
+    _, calls = parser.finalize()
+    assert len(calls) == 1
+
+
 def test_fault_thinking_close_stays_open_while_waiting_for_invoke() -> None:
     filt = EntmlThinkingStreamFilter()
     filt.feed("<entml:thinking>\nplan\n</thinking>\nstill ")