projectdavid 1.32.12__py3-none-any.whl → 1.32.14__py3-none-any.whl

projectdavid/clients/synchronous_inference_wrapper.py

@@ -14,9 +14,7 @@ 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
@@ -26,6 +24,7 @@ class SynchronousInferenceStream:
         self.run_id: Optional[str] = None
         self.api_key: Optional[str] = None
 
+    # ────────────────────────────────────────────────────────────
     def setup(
         self,
         user_id: str,
@@ -42,9 +41,7 @@ class SynchronousInferenceStream:
         self.run_id = run_id
         self.api_key = api_key
 
-    # --------------------------------------------------------------
-    # main streaming entry-point
-    # --------------------------------------------------------------
+    # ────────────────────────────────────────────────────────────
     def stream_chunks(
         self,
         provider: str,
@@ -71,60 +68,49 @@ class SynchronousInferenceStream:
 
         agen = _stream_chunks_async().__aiter__()
 
-        # ---------- suppression chain ----------
+        # ── build the <fc> suppressor chain ─────────────────────────
         if suppress_fc:
             _suppressor = FunctionCallSuppressor()
             _peek_gate = PeekGate(_suppressor)
 
-            def _filter_text(txt: str) -> str:
+            def _filter_text(txt: str) -> str:  # noqa: D401
                 return _peek_gate.feed(txt)
 
         else:
 
-            def _filter_text(txt: str) -> str:  # no-op
+            def _filter_text(txt: str) -> str:  # noqa: D401
                 return txt
 
-        # ---------------------------------------
-
+        # helper – drain any leftover bytes still buffered
+        def _flush_tail() -> Optional[dict]:
+            """
+            Force-flush PeekGate / FunctionCallSuppressor so the last few
+            characters (kept for safety-margin) reach the frontend.
+            Returns a ready-to-stream chunk or None.
+            """
+            if suppress_fc:
+                tail = _filter_text("")  # empty feed ⇒ flush
+                if tail:
+                    return {"type": "content", "content": tail}
+            return None
+
+        # ── main loop ─────────────────────────────────────────────
         while True:
             try:
                 chunk = self._GLOBAL_LOOP.run_until_complete(
                     asyncio.wait_for(agen.__anext__(), timeout=timeout_per_chunk)
                 )
 
-                # provider-labelled function_call
+                # ① drop provider-labelled function_call objects
                 if suppress_fc and chunk.get("type") == "function_call":
-                    LOG.debug("[SUPPRESSOR] blocked provider-labelled function_call")
-                    continue
-
-                if suppress_fc and isinstance(chunk.get("content"), str):
-                    chunk["content"] = _filter_text(chunk["content"])
-                    if chunk["content"] == "":
-                        # fully suppressed (either buffering or an <fc> block)
-                        continue
-
-                # ------------------------------------------------------
-                # allow the assistants response1 to bypass suppression
-                # -------------------------------------------------------
-                if chunk.get("type") == "content":
-                    yield chunk
-                    continue
-
-                # -------------------------------------
-                # allow hot_code to bypass suppression
-                # ------------------------------------
-                if chunk.get("type") == "hot_code":
-                    yield chunk
+                    LOG.debug("[SUPPRESS] provider function_call dropped")
                     continue
 
-                # allow hot_code_output to bypass suppression
-                if chunk.get("type") == "hot_code_output":
+                # ② hot-code & file-preview payloads always pass
+                if chunk.get("type") in ("hot_code", "hot_code_output"):
                     yield chunk
                     continue
 
-                # -------------------------------------------------------
-                # allow code_interpreter_stream to bypass suppression
-                # --------------------------------------------------------
                 if (
                     chunk.get("stream_type") == "code_execution"
                     and chunk.get("chunk", {}).get("type") == "code_interpreter_stream"
@@ -132,45 +118,35 @@ class SynchronousInferenceStream:
                     yield chunk
                     continue
 
-                # ---------------------------------
-                # inline content
-                # ----------------------------------
+                # ③ ordinary TEXT content — run through the <fc> filter
                 if isinstance(chunk.get("content"), str):
                     chunk["content"] = _filter_text(chunk["content"])
                     if chunk["content"] == "":
-                        continue  # fully suppressed (or still peeking)
-
-                    if (
-                        suppress_fc
-                        and '"name": "code_interpreter"' in chunk["content"]
-                        and '"arguments": {"code"' in chunk["content"]
-                    ):
-                        LOG.debug("[SUPPRESSOR] inline code_interpreter match blocked")
-                        continue
-
-                    if (
-                        suppress_fc
-                        and '"name": "file_search"' in chunk["content"]
-                        and '"arguments": {"query_text"' in chunk["content"]
-                    ):
-                        LOG.debug("[SUPPRESSOR] inline file_search match blocked")
-                        continue
+                        continue  # fully suppressed / still buffering
 
+                # ④ everything else streams unchanged
                 yield chunk
 
+            # ─────────── graceful endings ───────────
             except StopAsyncIteration:
+                if tail := _flush_tail():
+                    yield tail
                 LOG.info("Stream completed normally.")
                 break
+
             except asyncio.TimeoutError:
-                LOG.error("[TimeoutError] Timeout occurred, stopping stream.")
+                if tail := _flush_tail():
+                    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:  # noqa: BLE001
+                if tail := _flush_tail():
+                    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.32.12.dist-info → projectdavid-1.32.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.32.12
+Version: 1.32.14
 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.32.12.dist-info → projectdavid-1.32.14.dist-info}/RECORD

@@ -15,7 +15,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=blxVaUbGAnAtLvfP5XPWSy7Z4kNO0STYJ1akwZPqVSU,6680
+projectdavid/clients/synchronous_inference_wrapper.py,sha256=RuFOgvUar1p8xpklMZTMswDjZ8n2N3ghtjmDjSiI6Eo,6209
 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
@@ -34,8 +34,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.32.12.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.32.12.dist-info/METADATA,sha256=B-nKAnTCpljTbB-wvIY9uh2-j72k-vTQhPSKBSh1w6Q,10782
-projectdavid-1.32.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.32.12.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.32.12.dist-info/RECORD,,
+projectdavid-1.32.14.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.32.14.dist-info/METADATA,sha256=lwrij-9rEDGMo6elHx8cZyAmArJirSaL1Nit8177LeA,10782
+projectdavid-1.32.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.32.14.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.32.14.dist-info/RECORD,,