projectdavid 1.32.0__py3-none-any.whl → 1.32.2__py3-none-any.whl

projectdavid/clients/synchronous_inference_wrapper.py

@@ -49,15 +49,14 @@ class SynchronousInferenceStream:
         self,
         provider: str,
         model: str,
-        *,  # keyword-only from here
+        *,
         api_key: Optional[str] = None,
         timeout_per_chunk: float = 280.0,
-        suppress_fc: bool = True,  # ← NEW switch
+        suppress_fc: bool = True,
     ) -> Generator[dict, None, None]:
 
         resolved_api_key = api_key or self.api_key
 
-        # ------------- build async generator ----------------------
         async def _stream_chunks_async():
             async for chk in self.inference_client.stream_inference_response(
                 provider=provider,
@@ -72,10 +71,10 @@ class SynchronousInferenceStream:
 
         agen = _stream_chunks_async().__aiter__()
 
-        # ------------- optional suppression chain -----------------
+        # ---------- suppression chain ----------
         if suppress_fc:
             _suppressor = FunctionCallSuppressor()
-            _peek_gate = PeekGate(_suppressor)  # 2 KB default
+            _peek_gate = PeekGate(_suppressor)
 
             def _filter_text(txt: str) -> str:
                 return _peek_gate.feed(txt)
@@ -85,7 +84,7 @@ class SynchronousInferenceStream:
             def _filter_text(txt: str) -> str:  # no-op
                 return txt
 
-        # ----------------------------------------------------------
+        # ---------------------------------------
 
         while True:
             try:
@@ -93,18 +92,23 @@ class SynchronousInferenceStream:
                     asyncio.wait_for(agen.__anext__(), timeout=timeout_per_chunk)
                 )
 
-                # --- provider-labelled function_call blocks -------
+                # provider-labelled function_call
                 if suppress_fc and chunk.get("type") == "function_call":
-                    LOG.debug(
-                        "[SUPPRESSOR] blocked provider-labelled function_call chunk"
-                    )
+                    LOG.debug("[SUPPRESSOR] blocked provider-labelled function_call")
                     continue
 
-                # --- inline content filtering --------------------
+                # inline content
                 if isinstance(chunk.get("content"), str):
                     chunk["content"] = _filter_text(chunk["content"])
-                    if not chunk["content"]:
-                        # fully suppressed → skip forwarding
+                    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

projectdavid/utils/function_call_suppressor.py

@@ -1,3 +1,6 @@
+# ------------------------------------------------------------------
+# utils.function_call_suppressor (unchanged except for logger)
+# ------------------------------------------------------------------
 import re
 
 from projectdavid_common.utilities.logging_service import LoggingUtility
@@ -5,9 +8,6 @@ from projectdavid_common.utilities.logging_service import LoggingUtility
 LOG = LoggingUtility()
 
 
-# ─────────────────────────────────────────────────────────────────────
-#  function-call filter helpers  (unchanged except for logger)
-# ─────────────────────────────────────────────────────────────────────
 class FunctionCallSuppressor:
     OPEN_RE = re.compile(r"<\s*fc\s*>", re.I)
     CLOSE_RE = re.compile(r"</\s*fc\s*>", re.I)
@@ -16,10 +16,9 @@ class FunctionCallSuppressor:
         self.in_fc = False
         self.buf = ""
 
-    def filter_chunk(self, chunk: str) -> str:
-        self.buf += chunk
+    def filter_chunk(self, txt: str) -> str:
+        self.buf += txt
         out = ""
-
         while self.buf:
             if not self.in_fc:
                 m = self.OPEN_RE.search(self.buf)
@@ -34,7 +33,7 @@ class FunctionCallSuppressor:
             else:
                 m = self.CLOSE_RE.search(self.buf)
                 if not m:
-                    break  # wait for more tokens
+                    break
                 LOG.debug("[SUPPRESSOR] </fc> detected — block suppressed")
                 self.buf = self.buf[m.end() :]
                 self.in_fc = False

projectdavid/utils/peek_gate.py

@@ -1,3 +1,6 @@
+# ------------------------------------------------------------------
+# utils.peek_gate  (progressive flush version)
+# ------------------------------------------------------------------
 import re
 
 from projectdavid_common.utilities.logging_service import LoggingUtility
@@ -9,17 +12,35 @@ LOG = LoggingUtility()
 
 class PeekGate:
     """
-    Turns the suppressor on only if a <fc> block appears in the first
-    `peek_limit` characters; otherwise passes text through unchanged.
+    • Streams *most* text immediately while the gate decides whether
+      a <fc> block will appear.
+    • Keeps only SAFETY_MARGIN bytes back so a tag split across two
+      chunks can still be caught.
     """
 
+    SAFETY_MARGIN = 8  # enough to hold "<fc>" + whitespace
+
     def __init__(self, downstream: FunctionCallSuppressor, peek_limit: int = 2048):
         self.downstream = downstream
         self.peek_limit = peek_limit
         self.buf = ""
-        self.mode = "peeking"  # -> "normal" after decision
+        self.mode = "peeking"  # → "normal" after decision
         self.suppressing = False
 
+    # ----------------------------------------------------------
+    def _safe_flush(self, new_txt: str = "") -> str:
+        """
+        Return everything except the last SAFETY_MARGIN chars,
+        which are kept for tag-boundary safety.
+        """
+        self.buf += new_txt
+        if len(self.buf) <= self.SAFETY_MARGIN:
+            return ""
+        flush_len = len(self.buf) - self.SAFETY_MARGIN
+        head, self.buf = self.buf[:flush_len], self.buf[flush_len:]
+        return head
+
+    # ----------------------------------------------------------
     def feed(self, txt: str) -> str:
         # decision already taken
         if self.mode == "normal":
@@ -28,22 +49,23 @@ class PeekGate:
         # still peeking …
         self.buf += txt
         m = re.search(r"<\s*fc\s*>", self.buf, flags=re.I)
-        if m:  # found a tag
+        if m:  # tag found
             head = self.buf[: m.start()]
-            LOG.debug("[PEEK] <fc> located after leading text – engaging suppressor")
+            LOG.debug("[PEEK] <fc> located – engaging suppressor")
             self.suppressing = True
             self.mode = "normal"
-            tail = self.buf[m.start() :]
-            self.buf = ""
+            tail, self.buf = self.buf[m.start() :], ""
             return head + self.downstream.filter_chunk(tail)
 
-        if len(self.buf) >= self.peek_limit:  # give up
+        # no tag yet – overflow?
+        if len(self.buf) >= self.peek_limit:
             LOG.debug(
-                "[PEEK] no <fc> tag within first %d chars – no suppression",
+                "[PEEK] no <fc> tag within first %d chars – " "streaming normally",
                 self.peek_limit,
             )
-            self.mode = "normal"
-            self.suppressing = False
-            out, self.buf = self.buf, ""
-            return out
-        return ""
+            flush, self.mode = self.buf, "normal"
+            self.buf = ""
+            return flush
+
+        # still undecided → flush safe part
+        return self._safe_flush()

{projectdavid-1.32.0.dist-info → projectdavid-1.32.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.32.0
+Version: 1.32.2
 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.0.dist-info → projectdavid-1.32.2.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=sikHDDmx3NFhK9eoFL0PVlZ0CaFG-CIWfDmgFkH48Do,4594
+projectdavid/clients/synchronous_inference_wrapper.py,sha256=Rv7TGZBnzMOBDw3BwguDOHcVmwLvcjHp7j6V8OAqpwM,4686
 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
@@ -29,13 +29,13 @@ projectdavid/synthesis/prompt.py,sha256=Jlya6avnWV5ryaJaibt4W29XYxRlJRV6rwHfjgYy
 projectdavid/synthesis/reranker.py,sha256=aFjdLDoqnhgzxPIoRfs4y_Z_F6T88g5Sg8R5m0HMxdU,868
 projectdavid/synthesis/retriever.py,sha256=8R5HIgPXMKIQxV5KsN8u_gVVP4JY-wsDwJd92A-74-o,2300
 projectdavid/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-projectdavid/utils/function_call_suppressor.py,sha256=uTjB6e1JDs_nkSVtRuqretb-zYDbAAC3jN3gpzqVauo,1616
+projectdavid/utils/function_call_suppressor.py,sha256=LsDhySVH0kS8nydPBrHrOtT30yhVvwU24QHApGu1P34,1305
 projectdavid/utils/monitor_launcher.py,sha256=3YAgJdeuaUvq3JGvpA4ymqFsAnk29nH5q93cwStP4hc,2836
-projectdavid/utils/peek_gate.py,sha256=odQIZJYTygRPu5IfOBBgqqeSXiWfQ73-lRBYM2KbY4I,1630
+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.0.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.32.0.dist-info/METADATA,sha256=F3ZVLx0ylA3omK6BEsxsTrbaroIwcE42FO0GUcT0EkU,10781
-projectdavid-1.32.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.32.0.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.32.0.dist-info/RECORD,,
+projectdavid-1.32.2.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.32.2.dist-info/METADATA,sha256=FS7ZUJmxyRntFkY4FQjaDPXkqihI8i6yzwpYFC_N2rI,10781
+projectdavid-1.32.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.32.2.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.32.2.dist-info/RECORD,,