projectdavid 1.32.0__tar.gz → 1.32.2__tar.gz

{projectdavid-1.32.0 → projectdavid-1.32.2}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.32.2](https://github.com/frankie336/projectdavid/compare/v1.32.1...v1.32.2) (2025-06-08)
+
+
+### Bug Fixes
+
+* supress mode code_interpreter_calls ([d7862d8](https://github.com/frankie336/projectdavid/commit/d7862d87234d1647ab7e4ba700971ed24d4a228e))
+
+## [1.32.1](https://github.com/frankie336/projectdavid/compare/v1.32.0...v1.32.1) (2025-06-08)
+
+
+### Bug Fixes
+
+* supress mode suppressing all content ([657ab23](https://github.com/frankie336/projectdavid/commit/657ab23668337133ce93995a6acce4b503d12fce))
+
 # [1.32.0](https://github.com/frankie336/projectdavid/compare/v1.31.1...v1.32.0) (2025-06-08)
 
 

{projectdavid-1.32.0/src/projectdavid.egg-info → projectdavid-1.32.2}/PKG-INFO

@@ -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 → projectdavid-1.32.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "projectdavid"
-version = "1.32.0"
+version = "1.32.2"
 description = "Python SDK for interacting with the Entities Assistant API."
 readme = "README.md"
 authors = [

{projectdavid-1.32.0 → projectdavid-1.32.2}/src/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-1.32.0 → projectdavid-1.32.2}/src/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-1.32.2/src/projectdavid/utils/peek_gate.py

@@ -0,0 +1,71 @@
+# ------------------------------------------------------------------
+# utils.peek_gate  (progressive flush version)
+# ------------------------------------------------------------------
+import re
+
+from projectdavid_common.utilities.logging_service import LoggingUtility
+
+from .function_call_suppressor import FunctionCallSuppressor
+
+LOG = LoggingUtility()
+
+
+class PeekGate:
+    """
+    • 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.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":
+            return self.downstream.filter_chunk(txt) if self.suppressing else txt
+
+        # still peeking …
+        self.buf += txt
+        m = re.search(r"<\s*fc\s*>", self.buf, flags=re.I)
+        if m:  # tag found
+            head = self.buf[: m.start()]
+            LOG.debug("[PEEK] <fc> located – engaging suppressor")
+            self.suppressing = True
+            self.mode = "normal"
+            tail, self.buf = self.buf[m.start() :], ""
+            return head + self.downstream.filter_chunk(tail)
+
+        # no tag yet – overflow?
+        if len(self.buf) >= self.peek_limit:
+            LOG.debug(
+                "[PEEK] no <fc> tag within first %d chars – " "streaming normally",
+                self.peek_limit,
+            )
+            flush, self.mode = self.buf, "normal"
+            self.buf = ""
+            return flush
+
+        # still undecided → flush safe part
+        return self._safe_flush()

{projectdavid-1.32.0 → projectdavid-1.32.2/src/projectdavid.egg-info}/PKG-INFO

@@ -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/src/projectdavid/utils/peek_gate.py

@@ -1,49 +0,0 @@
-import re
-
-from projectdavid_common.utilities.logging_service import LoggingUtility
-
-from .function_call_suppressor import FunctionCallSuppressor
-
-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.
-    """
-
-    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.suppressing = False
-
-    def feed(self, txt: str) -> str:
-        # decision already taken
-        if self.mode == "normal":
-            return self.downstream.filter_chunk(txt) if self.suppressing else txt
-
-        # still peeking …
-        self.buf += txt
-        m = re.search(r"<\s*fc\s*>", self.buf, flags=re.I)
-        if m:  # found a tag
-            head = self.buf[: m.start()]
-            LOG.debug("[PEEK] <fc> located after leading text – engaging suppressor")
-            self.suppressing = True
-            self.mode = "normal"
-            tail = self.buf[m.start() :]
-            self.buf = ""
-            return head + self.downstream.filter_chunk(tail)
-
-        if len(self.buf) >= self.peek_limit:  # give up
-            LOG.debug(
-                "[PEEK] no <fc> tag within first %d chars – no suppression",
-                self.peek_limit,
-            )
-            self.mode = "normal"
-            self.suppressing = False
-            out, self.buf = self.buf, ""
-            return out
-        return ""