projectdavid 1.33.11__py3-none-any.whl → 1.33.13__py3-none-any.whl

projectdavid/clients/synchronous_inference_wrapper.py

@@ -11,10 +11,15 @@ LOG = UtilsInterface.LoggingUtility()
 
 
 class SynchronousInferenceStream:
+    # ------------------------------------------------------------ #
+    #   GLOBAL EVENT LOOP  (single hidden thread for sync wrapper)
+    # ------------------------------------------------------------ #
     _GLOBAL_LOOP = asyncio.new_event_loop()
     asyncio.set_event_loop(_GLOBAL_LOOP)
 
-    # ────────────────────────────────────────────────────────────
+    # ------------------------------------------------------------ #
+    #   Init / setup
+    # ------------------------------------------------------------ #
     def __init__(self, inference) -> None:
         self.inference_client = inference
         self.user_id: Optional[str] = None
@@ -24,7 +29,6 @@ class SynchronousInferenceStream:
         self.run_id: Optional[str] = None
         self.api_key: Optional[str] = None
 
-    # ────────────────────────────────────────────────────────────
     def setup(
         self,
         user_id: str,
@@ -34,6 +38,7 @@ class SynchronousInferenceStream:
         run_id: str,
         api_key: str,
     ) -> None:
+        """Populate IDs once, so callers only provide provider/model."""
         self.user_id = user_id
         self.thread_id = thread_id
         self.assistant_id = assistant_id
@@ -41,8 +46,10 @@ class SynchronousInferenceStream:
         self.run_id = run_id
         self.api_key = api_key
 
-    # ────────────────────────────────────────────────────────────
-    def stream_chunks(
+    # ------------------------------------------------------------ #
+    #   Core sync-to-async streaming wrapper
+    # ------------------------------------------------------------ #
+    def stream_chunks(  # noqa: PLR0915
         self,
         provider: str,
         model: str,
@@ -51,9 +58,15 @@ class SynchronousInferenceStream:
         timeout_per_chunk: float = 280.0,
         suppress_fc: bool = True,
     ) -> Generator[dict, None, None]:
+        """
+        Sync generator that mirrors async `inference_client.stream_inference_response`
+        but (optionally) removes raw <fc> … </fc> output *and* JSON
+        `{"type": "function_call" …}` objects from the stream.
+        """
 
         resolved_api_key = api_key or self.api_key
 
+        # ---------- async inner generator -------------------------------- #
         async def _stream_chunks_async():
             async for chk in self.inference_client.stream_inference_response(
                 provider=provider,
@@ -68,46 +81,58 @@ class SynchronousInferenceStream:
 
         agen = _stream_chunks_async().__aiter__()
 
-        # ── build the <fc> suppressor chain ─────────────────────────
+        # ---------- FC-suppressor plumbing -------------------------------- #
         if suppress_fc:
             _suppressor = FunctionCallSuppressor()
             _peek_gate = PeekGate(_suppressor)
 
-            def _filter_text(txt: str) -> str:  # noqa: D401
+            def _filter_text(txt: str) -> str:
                 return _peek_gate.feed(txt)
 
+            LOG.debug("[SyncStream] Function-call suppression ACTIVE")
         else:
 
-            def _filter_text(txt: str) -> str:  # noqa: D401
+            def _filter_text(txt: str) -> str:
                 return txt
 
-        # helper – drain **all** residual bytes from the chain
+            LOG.debug("[SyncStream] Function-call suppression DISABLED")
+
+        # ---------- helper to flush residual buffered text ---------------- #
         def _drain_filters() -> Optional[dict]:
             if not suppress_fc:
                 return None
             parts: list[str] = []
             while True:
-                out = _filter_text("")  # empty feed ⇒ “give me whatever’s left”
+                out = _filter_text("")
                 if not out:
                     break
                 parts.append(out)
+            if not _peek_gate.suppressing and _peek_gate.buf:
+                parts.append(_peek_gate.buf)
+                _peek_gate.buf = ""
             if parts:
-                return {"type": "content", "content": "".join(parts)}
+                return {
+                    "type": "content",
+                    "content": "".join(parts),
+                    "run_id": self.run_id,
+                }
             return None
 
-        # ── main loop ─────────────────────────────────────────────
+        # ---------- main sync loop ---------------------------------------- #
         while True:
             try:
                 chunk = self._GLOBAL_LOOP.run_until_complete(
                     asyncio.wait_for(agen.__anext__(), timeout=timeout_per_chunk)
                 )
 
-                # ① drop provider-labelled function_call objects
-                if suppress_fc and chunk.get("type") == "function_call":
-                    LOG.debug("[SUPPRESS] provider function_call dropped")
+                # Always attach run_id for front-end helpers
+                chunk["run_id"] = self.run_id
+
+                # ----- bypass filters for status / code-exec related -------- #
+                if chunk.get("type") == "status":
+                    yield chunk
                     continue
 
-                # ② hot-code & file-preview payloads always pass
                 if chunk.get("type") in ("hot_code", "hot_code_output"):
                     yield chunk
                     continue
@@ -119,35 +144,46 @@ class SynchronousInferenceStream:
                     yield chunk
                     continue
 
-                # ③ ordinary TEXT content — run through the <fc> filter
+                # ----- NEW: swallow raw JSON function_call objects ---------- #
+                if suppress_fc and chunk.get("type") == "function_call":
+                    LOG.debug(
+                        "[SyncStream] Swallowing JSON function_call chunk: %s",
+                        chunk.get("name") or "<unnamed>",
+                    )
+                    continue
+
+                # ----- text-level suppression ------------------------------- #
                 if isinstance(chunk.get("content"), str):
                     chunk["content"] = _filter_text(chunk["content"])
                     if chunk["content"] == "":
-                        continue  # fully suppressed / still buffering
+                        # Entire segment was inside <fc> … </fc>
+                        continue
 
-                # ④ everything else streams unchanged
                 yield chunk
 
-            # ─────────── graceful endings ───────────
             except StopAsyncIteration:
                 if tail := _drain_filters():
                     yield tail
-                LOG.info("Stream completed normally.")
+                LOG.info("[SyncStream] Stream completed normally.")
                 break
 
             except asyncio.TimeoutError:
                 if tail := _drain_filters():
                     yield tail
-                LOG.error("[TimeoutError] Chunk wait expired – aborting stream.")
+                LOG.error("[SyncStream] Timeout waiting for next chunk.")
                 break
 
             except Exception as exc:  # noqa: BLE001
                 if tail := _drain_filters():
                     yield tail
-                LOG.error("Unexpected streaming error: %s", exc, exc_info=True)
+                LOG.error(
+                    "[SyncStream] Unexpected streaming error: %s", exc, exc_info=True
+                )
                 break
 
-    # ────────────────────────────────────────────────────────────
+    # ------------------------------------------------------------ #
+    #   House-keeping
+    # ------------------------------------------------------------ #
     @classmethod
     def shutdown_loop(cls) -> None:
         if cls._GLOBAL_LOOP and not cls._GLOBAL_LOOP.is_closed():

{projectdavid-1.33.11.dist-info → projectdavid-1.33.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.33.11
+Version: 1.33.13
 Summary: Python SDK for interacting with the Entities Assistant API.
 Author-email: Francis Neequaye Armah <francis.neequaye@projectdavid.co.uk>
 License: PolyForm Noncommercial License 1.0.0

{projectdavid-1.33.11.dist-info → projectdavid-1.33.13.dist-info}/RECORD

@@ -16,7 +16,7 @@ projectdavid/clients/files_client.py,sha256=XkIDzbQFGDrd88taf0Kouc_4YJOPIYEHiIyW
 projectdavid/clients/inference_client.py,sha256=xz4ACPv5Tkis604QxO5mJX1inH_TGDfQP-31geETYpE,6609
 projectdavid/clients/messages_client.py,sha256=467xeIt3VYs6cG8-bl-eDRi_auWOPmfd5tSJDmQSJUI,17232
 projectdavid/clients/runs.py,sha256=-fXOq5L9w2efDPmZkNxb0s2yjl6oN0XN4_aLXqaeceo,25270
-projectdavid/clients/synchronous_inference_wrapper.py,sha256=smbKBkwJZHX2LCqb0pO9RS7N7GFmruzCfmxrQsmJv_o,6204
+projectdavid/clients/synchronous_inference_wrapper.py,sha256=qh94rtNlLqgIxiA_ZbQ1ncOwQTi9aBj5os3sMExLh4E,7070
 projectdavid/clients/threads_client.py,sha256=ekzU5w14zftmtmFkiec3NC90Of-_KVSUY1qH9cmfSFg,6771
 projectdavid/clients/tools_client.py,sha256=GkCVOmwpAoPqVt6aYmH0G1HIFha3iEwR9IIf9teR0j8,11487
 projectdavid/clients/users_client.py,sha256=eCuUb9qvyH1GUFhZu6TRL9zdoK-qzHSs8-Vmrk_0mmg,13729
@@ -35,8 +35,8 @@ projectdavid/utils/monitor_launcher.py,sha256=3YAgJdeuaUvq3JGvpA4ymqFsAnk29nH5q9
 projectdavid/utils/peek_gate.py,sha256=5whMRnDOQjATRpThWDJkvY9ScXuJ7Sd_-9rvGgXeTAQ,2532
 projectdavid/utils/run_monitor.py,sha256=F_WkqIP-qnWH-4llIbileWWLfRj2Q1Cg-ni23SR1rec,3786
 projectdavid/utils/vector_search_formatter.py,sha256=YTe3HPGec26qGY7uxY8_GS8lc4QaN6aNXMzkl29nZpI,1735
-projectdavid-1.33.11.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.33.11.dist-info/METADATA,sha256=aqETkoAw4NxCKZg56GnWf4QNVMdl4-mCZb0f78ej4EQ,11555
-projectdavid-1.33.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.33.11.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.33.11.dist-info/RECORD,,
+projectdavid-1.33.13.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.33.13.dist-info/METADATA,sha256=wFCKMGJBgK8yku6jOoE2IPsdB9-kfIGL1kBYF89yfNM,11555
+projectdavid-1.33.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.33.13.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.33.13.dist-info/RECORD,,