projectdavid 1.32.7__py3-none-any.whl → 1.32.9__py3-none-any.whl

projectdavid/clients/synchronous_inference_wrapper.py

@@ -11,16 +11,12 @@ LOG = UtilsInterface.LoggingUtility()
 
 
 class SynchronousInferenceStream:
-    """Wrap an async token/JSON stream in a synchronous iterator while
-    hiding function-call payloads from the UI.
-    """
-
     _GLOBAL_LOOP = asyncio.new_event_loop()
     asyncio.set_event_loop(_GLOBAL_LOOP)
 
-    # ------------------------------------------------------------------ #
-    # construction / setup
-    # ------------------------------------------------------------------ #
+    # --------------------------------------------------------------
+    # ctor / setup
+    # --------------------------------------------------------------
     def __init__(self, inference) -> None:
         self.inference_client = inference
         self.user_id: Optional[str] = None
@@ -46,9 +42,9 @@ class SynchronousInferenceStream:
         self.run_id = run_id
         self.api_key = api_key
 
-    # ------------------------------------------------------------------ #
+    # --------------------------------------------------------------
     # main streaming entry-point
-    # ------------------------------------------------------------------ #
+    # --------------------------------------------------------------
     def stream_chunks(
         self,
         provider: str,
@@ -58,23 +54,14 @@ class SynchronousInferenceStream:
         timeout_per_chunk: float = 280.0,
         suppress_fc: bool = True,
     ) -> Generator[dict, None, None]:
-        """
-        Yield provider chunks synchronously.
-
-        When *suppress_fc* is True:
 
-        • `{"type":"function_call", …}` chunks are dropped.
-        • Inline `<fc> … </fc>` text is stripped.
-        • *Everything else* is forwarded unchanged.
-        """
+        resolved_api_key = api_key or self.api_key
 
-        resolved_key = api_key or self.api_key
-
-        async def _async_gen():
+        async def _stream_chunks_async():
             async for chk in self.inference_client.stream_inference_response(
                 provider=provider,
                 model=model,
-                api_key=resolved_key,
+                api_key=resolved_api_key,
                 thread_id=self.thread_id,
                 message_id=self.message_id,
                 run_id=self.run_id,
@@ -82,9 +69,9 @@ class SynchronousInferenceStream:
             ):
                 yield chk
 
-        agen = _async_gen().__aiter__()
+        agen = _stream_chunks_async().__aiter__()
 
-        # ---------- inline suppressor chain ----------------------------
+        # ---------- suppression chain ----------
         if suppress_fc:
             _suppressor = FunctionCallSuppressor()
             _peek_gate = PeekGate(_suppressor)
@@ -94,27 +81,33 @@ class SynchronousInferenceStream:
 
         else:
 
-            def _filter_text(txt: str) -> str:  # noqa: D401
-                return txt  # pass-through
+            def _filter_text(txt: str) -> str:  # no-op
+                return txt
+
+        # ---------------------------------------
 
-        # ---------- 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
                 if suppress_fc and chunk.get("type") == "function_call":
-                    LOG.debug("[SUPPRESSOR] dropped provider function_call chunk")
+                    LOG.debug("[SUPPRESSOR] blocked provider-labelled function_call")
                     continue
 
-                # ② never touch hot_code
+                # allow hot_code to bypass suppression
                 if chunk.get("type") == "hot_code":
                     yield chunk
                     continue
 
-                # ③ never touch code_interpreter_stream previews
+                # allow hot_code_output to bypass suppression
+                if chunk.get("type") == "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"
@@ -122,32 +115,35 @@ class SynchronousInferenceStream:
                     yield chunk
                     continue
 
-                # ④ scrub inline <fc> tags in plain-text content
+                # inline content
                 if isinstance(chunk.get("content"), str):
                     chunk["content"] = _filter_text(chunk["content"])
                     if chunk["content"] == "":
-                        # completely removed (or still buffering) – skip emit
+                        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
 
-                # ⑤ forward every other chunk verbatim
                 yield chunk
 
             except StopAsyncIteration:
                 LOG.info("Stream completed normally.")
                 break
             except asyncio.TimeoutError:
-                LOG.error(
-                    "[TimeoutError] no chunk received for %.1f s – aborting",
-                    timeout_per_chunk,
-                )
+                LOG.error("[TimeoutError] Timeout occurred, stopping stream.")
                 break
-            except Exception as exc:  # pylint: disable=broad-except
-                LOG.error("Streaming error: %s", exc, exc_info=True)
+            except Exception as e:
+                LOG.error("Unexpected error during streaming completions: %s", e)
                 break
 
-    # ------------------------------------------------------------------ #
+    # --------------------------------------------------------------
     # housekeeping
-    # ------------------------------------------------------------------ #
+    # --------------------------------------------------------------
     @classmethod
     def shutdown_loop(cls) -> None:
         if cls._GLOBAL_LOOP and not cls._GLOBAL_LOOP.is_closed():

{projectdavid-1.32.7.dist-info → projectdavid-1.32.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.32.7
+Version: 1.32.9
 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.7.dist-info → projectdavid-1.32.9.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=-J21v2hDEP2yz343Gx0a05UW9sGUeAFq9eNT9iGP4Pc,5517
+projectdavid/clients/synchronous_inference_wrapper.py,sha256=5G2AhUlfQ5hWzUwtlaiy8K063bQFNhEpJfxrUZU8uE8,5330
 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.7.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.32.7.dist-info/METADATA,sha256=8SMqcudaTwLDg6B7m27v_U0mUAKjCFEHs9wtnt7W7Bg,10781
-projectdavid-1.32.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.32.7.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.32.7.dist-info/RECORD,,
+projectdavid-1.32.9.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.32.9.dist-info/METADATA,sha256=D2FjSoU4yYLQYkIiplainIQtmBww4KmrglQBBos2fBQ,10781
+projectdavid-1.32.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.32.9.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.32.9.dist-info/RECORD,,