projectdavid 1.33.10__py3-none-any.whl → 1.33.12__py3-none-any.whl

projectdavid/clients/synchronous_inference_wrapper.py

@@ -14,9 +14,6 @@ class SynchronousInferenceStream:
     _GLOBAL_LOOP = asyncio.new_event_loop()
     asyncio.set_event_loop(_GLOBAL_LOOP)
 
-    # --------------------------------------------------------------
-    # ctor / setup
-    # --------------------------------------------------------------
     def __init__(self, inference) -> None:
         self.inference_client = inference
         self.user_id: Optional[str] = None
@@ -42,9 +39,6 @@ class SynchronousInferenceStream:
         self.run_id = run_id
         self.api_key = api_key
 
-    # --------------------------------------------------------------
-    # main streaming entry-point
-    # --------------------------------------------------------------
     def stream_chunks(
         self,
         provider: str,
@@ -71,7 +65,6 @@ class SynchronousInferenceStream:
 
         agen = _stream_chunks_async().__aiter__()
 
-        # ---------- suppression chain ----------
         if suppress_fc:
             _suppressor = FunctionCallSuppressor()
             _peek_gate = PeekGate(_suppressor)
@@ -81,10 +74,28 @@ class SynchronousInferenceStream:
 
         else:
 
-            def _filter_text(txt: str) -> str:  # no-op
+            def _filter_text(txt: str) -> str:
                 return txt
 
-        # ---------------------------------------
+        def _drain_filters() -> Optional[dict]:
+            if not suppress_fc:
+                return None
+            parts: list[str] = []
+            while True:
+                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),
+                    "run_id": self.run_id,
+                }
+            return None
 
         while True:
             try:
@@ -92,40 +103,52 @@ class SynchronousInferenceStream:
                     asyncio.wait_for(agen.__anext__(), timeout=timeout_per_chunk)
                 )
 
-                # provider-labelled function_call
-                if suppress_fc and chunk.get("type") == "function_call":
-                    LOG.debug("[SUPPRESSOR] blocked provider-labelled function_call")
+                # Always attach run_id
+                chunk["run_id"] = self.run_id
+
+                # ------------------------------------------------------
+                # allow status chunks to bypass suppression suppression
+                # -------------------------------------------------------
+                if chunk.get("type") == "status":
+                    yield chunk
+                    continue
+
+                if chunk.get("type") in ("hot_code", "hot_code_output"):
+                    yield chunk
+                    continue
+
+                if (
+                    chunk.get("stream_type") == "code_execution"
+                    and chunk.get("chunk", {}).get("type") == "code_interpreter_stream"
+                ):
+                    yield chunk
                     continue
 
-                # inline content
                 if isinstance(chunk.get("content"), str):
                     chunk["content"] = _filter_text(chunk["content"])
                     if chunk["content"] == "":
-                        continue  # fully suppressed (or still peeking)
-
-                    # additional raw inline suppression for partial JSON
-                    if (
-                        '"name": "code_interpreter"' in chunk["content"]
-                        and '"arguments": {"code"' in chunk["content"]
-                    ):
-                        LOG.debug("[SUPPRESSOR] inline code_interpreter match blocked")
                         continue
 
                 yield chunk
 
             except StopAsyncIteration:
+                if tail := _drain_filters():
+                    yield tail
                 LOG.info("Stream completed normally.")
                 break
+
             except asyncio.TimeoutError:
-                LOG.error("[TimeoutError] Timeout occurred, stopping stream.")
+                if tail := _drain_filters():
+                    yield tail
+                LOG.error("[TimeoutError] Chunk wait expired – aborting stream.")
                 break
-            except Exception as e:
-                LOG.error("Unexpected error during streaming completions: %s", e)
+
+            except Exception as exc:
+                if tail := _drain_filters():
+                    yield tail
+                LOG.error("Unexpected streaming error: %s", exc, exc_info=True)
                 break
 
-    # --------------------------------------------------------------
-    # housekeeping
-    # --------------------------------------------------------------
     @classmethod
     def shutdown_loop(cls) -> None:
         if cls._GLOBAL_LOOP and not cls._GLOBAL_LOOP.is_closed():

{projectdavid-1.33.10.dist-info → projectdavid-1.33.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.33.10
+Version: 1.33.12
 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.10.dist-info → projectdavid-1.33.12.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=Rv7TGZBnzMOBDw3BwguDOHcVmwLvcjHp7j6V8OAqpwM,4686
+projectdavid/clients/synchronous_inference_wrapper.py,sha256=mN5WAHmv0aRoeMIb7XPgv3cuqrMPzu378UsZ02jEvRY,5090
 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.10.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.33.10.dist-info/METADATA,sha256=fLLv7ywPdpBY5QMaooyy9CEFhx2cnVIY_Z8E-rvfgvk,11555
-projectdavid-1.33.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.33.10.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.33.10.dist-info/RECORD,,
+projectdavid-1.33.12.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.33.12.dist-info/METADATA,sha256=NmKw2v_K20Uq-H0yEjxkDpAGdMi4wQdIjLrtP-Sthr8,11555
+projectdavid-1.33.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.33.12.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.33.12.dist-info/RECORD,,