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

projectdavid/clients/synchronous_inference_wrapper.py

@@ -4,13 +4,19 @@ from typing import Generator, Optional
 
 from projectdavid_common import UtilsInterface
 
-logging_utility = UtilsInterface.LoggingUtility()
+from projectdavid.utils.function_call_suppressor import FunctionCallSuppressor
+from projectdavid.utils.peek_gate import PeekGate
+
+LOG = UtilsInterface.LoggingUtility()
 
 
 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
@@ -36,31 +42,24 @@ class SynchronousInferenceStream:
         self.run_id = run_id
         self.api_key = api_key
 
+    # --------------------------------------------------------------
+    # main streaming entry-point
+    # --------------------------------------------------------------
     def stream_chunks(
         self,
         provider: str,
         model: str,
-        *,  # Following parameters are keyword-only.
+        *,  # keyword-only from here
         api_key: Optional[str] = None,
         timeout_per_chunk: float = 280.0,
+        suppress_fc: bool = True,  # ← NEW switch
     ) -> Generator[dict, None, None]:
-        """
-        Streams inference response chunks synchronously by wrapping an async generator.
-
-        Args:
-            provider (str): The provider name.
-            model (str): The model name.
-            api_key (Optional[str]): API key for authentication. If not provided, falls back to the value from setup().
-            timeout_per_chunk (float): Timeout per chunk in seconds.
-
-        Yields:
-            dict: A chunk of the inference response.
-        """
-        # Prefer direct input over self.api_key
+
         resolved_api_key = api_key or self.api_key
 
-        async def _stream_chunks_async() -> Generator[dict, None, None]:
-            async for chunk in self.inference_client.stream_inference_response(
+        # ------------- build async generator ----------------------
+        async def _stream_chunks_async():
+            async for chk in self.inference_client.stream_inference_response(
                 provider=provider,
                 model=model,
                 api_key=resolved_api_key,
@@ -69,30 +68,60 @@ class SynchronousInferenceStream:
                 run_id=self.run_id,
                 assistant_id=self.assistant_id,
             ):
-                yield chunk
+                yield chk
+
+        agen = _stream_chunks_async().__aiter__()
+
+        # ------------- optional suppression chain -----------------
+        if suppress_fc:
+            _suppressor = FunctionCallSuppressor()
+            _peek_gate = PeekGate(_suppressor)  # 2 KB default
+
+            def _filter_text(txt: str) -> str:
+                return _peek_gate.feed(txt)
+
+        else:
 
-        gen = _stream_chunks_async().__aiter__()
+            def _filter_text(txt: str) -> str:  # no-op
+                return txt
+
+        # ----------------------------------------------------------
 
         while True:
             try:
                 chunk = self._GLOBAL_LOOP.run_until_complete(
-                    asyncio.wait_for(gen.__anext__(), timeout=timeout_per_chunk)
+                    asyncio.wait_for(agen.__anext__(), timeout=timeout_per_chunk)
                 )
+
+                # --- provider-labelled function_call blocks -------
+                if suppress_fc and chunk.get("type") == "function_call":
+                    LOG.debug(
+                        "[SUPPRESSOR] blocked provider-labelled function_call chunk"
+                    )
+                    continue
+
+                # --- inline content filtering --------------------
+                if isinstance(chunk.get("content"), str):
+                    chunk["content"] = _filter_text(chunk["content"])
+                    if not chunk["content"]:
+                        # fully suppressed → skip forwarding
+                        continue
+
                 yield chunk
+
             except StopAsyncIteration:
-                logging_utility.info("Stream completed normally.")
+                LOG.info("Stream completed normally.")
                 break
             except asyncio.TimeoutError:
-                logging_utility.error(
-                    "[TimeoutError] Timeout occurred, stopping stream."
-                )
+                LOG.error("[TimeoutError] Timeout occurred, stopping stream.")
                 break
             except Exception as e:
-                logging_utility.error(
-                    "Unexpected error during streaming completions: %s", 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/utils/function_call_suppressor.py

@@ -0,0 +1,41 @@
+import re
+
+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)
+
+    def __init__(self):
+        self.in_fc = False
+        self.buf = ""
+
+    def filter_chunk(self, chunk: str) -> str:
+        self.buf += chunk
+        out = ""
+
+        while self.buf:
+            if not self.in_fc:
+                m = self.OPEN_RE.search(self.buf)
+                if not m:
+                    out += self.buf
+                    self.buf = ""
+                    break
+                out += self.buf[: m.start()]
+                LOG.debug("[SUPPRESSOR] <fc> detected")
+                self.buf = self.buf[m.end() :]
+                self.in_fc = True
+            else:
+                m = self.CLOSE_RE.search(self.buf)
+                if not m:
+                    break  # wait for more tokens
+                LOG.debug("[SUPPRESSOR] </fc> detected — block suppressed")
+                self.buf = self.buf[m.end() :]
+                self.in_fc = False
+        return out

projectdavid/utils/peek_gate.py

@@ -0,0 +1,49 @@
+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 ""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.31.1
+Version: 1.32.0
 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.31.1.dist-info → projectdavid-1.32.0.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=25dNSel5DVieu2aFg6G1e4ENo5WWB4EB8_jugIiVzlo,3433
+projectdavid/clients/synchronous_inference_wrapper.py,sha256=sikHDDmx3NFhK9eoFL0PVlZ0CaFG-CIWfDmgFkH48Do,4594
 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,11 +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/monitor_launcher.py,sha256=3YAgJdeuaUvq3JGvpA4ymqFsAnk29nH5q93cwStP4hc,2836
+projectdavid/utils/peek_gate.py,sha256=odQIZJYTygRPu5IfOBBgqqeSXiWfQ73-lRBYM2KbY4I,1630
 projectdavid/utils/run_monitor.py,sha256=F_WkqIP-qnWH-4llIbileWWLfRj2Q1Cg-ni23SR1rec,3786
 projectdavid/utils/vector_search_formatter.py,sha256=YTe3HPGec26qGY7uxY8_GS8lc4QaN6aNXMzkl29nZpI,1735
-projectdavid-1.31.1.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.31.1.dist-info/METADATA,sha256=f-SkJ06HipWaVJZ0W-bECBP7-2OjCNqTNc58kN7A0qw,10781
-projectdavid-1.31.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-projectdavid-1.31.1.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.31.1.dist-info/RECORD,,
+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.31.1.dist-info → projectdavid-1.32.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any