projectdavid 1.33.33__py3-none-any.whl → 1.34.0__py3-none-any.whl

projectdavid/clients/runs.py

@@ -2,7 +2,7 @@ import json
 import threading
 import time
 from enum import Enum
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional, Tuple
 
 import httpx
 import requests
@@ -190,36 +190,6 @@ class RunsClient(BaseAPIClient):
             )
             raise
 
-    def list_runs(self, limit: int = 20, order: str = "asc") -> List[ent_validator.Run]:
-        """
-        List runs with the given limit and order.
-
-        Args:
-            limit (int): Maximum number of runs to retrieve.
-            order (str): 'asc' or 'desc' for ordering.
-
-        Returns:
-            List[Run]: A list of runs.
-        """
-        logging_utility.info("Listing runs with limit: %d, order: %s", limit, order)
-        params = {"limit": limit, "order": order}
-        try:
-            response = self.client.get("/v1/runs", params=params)
-            response.raise_for_status()
-            runs = response.json()
-            validated_runs = [ent_validator.Run(**run) for run in runs]
-            logging_utility.info("Retrieved %d runs", len(validated_runs))
-            return validated_runs
-        except ValidationError as e:
-            logging_utility.error("Validation error: %s", e.json())
-            raise ValueError(f"Validation error: {e}")
-        except httpx.HTTPStatusError as e:
-            logging_utility.error("HTTP error occurred while listing runs: %s", str(e))
-            raise
-        except Exception as e:
-            logging_utility.error("An error occurred while listing runs: %s", str(e))
-            raise
-
     def delete_run(self, run_id: str) -> Dict[str, Any]:
         """
         Delete a run by its ID.
@@ -637,3 +607,138 @@ class RunsClient(BaseAPIClient):
         t = threading.Thread(target=_listen_and_handle, daemon=True)
         t.start()
         t.join()
+
+    def list_runs(self, limit: int = 20, order: str = "asc") -> List[ent_validator.Run]:
+
+        logging_utility.info("Listing runs with limit: %d, order: %s", limit, order)
+        params = {"limit": limit, "order": order if order in ("asc", "desc") else "asc"}
+        try:
+            resp = self.client.get("/v1/runs", params=params)
+            resp.raise_for_status()
+            payload = resp.json()
+
+            # Preferred: envelope
+            if isinstance(payload, dict) and "data" in payload:
+                env = ent_validator.RunListResponse(**payload)
+                logging_utility.info("Retrieved %d runs", len(env.data))
+                return list(env.data)
+
+            # Legacy: raw list of dicts
+            runs = [ent_validator.Run(**item) for item in payload]
+            logging_utility.info("Retrieved %d runs (legacy)", len(runs))
+            return runs
+
+        except ValidationError as e:
+            logging_utility.error("Validation error: %s", e.json())
+            raise ValueError(f"Validation error: {e}")
+        except httpx.HTTPStatusError as e:
+            logging_utility.error("HTTP error occurred while listing runs: %s", str(e))
+            raise
+        except Exception as e:
+            logging_utility.error("An error occurred while listing runs: %s", str(e))
+            raise
+
+    def list_runs_with_meta(
+        self, limit: int = 20, order: str = "asc"
+    ) -> Tuple[List[ent_validator.Run], Optional[str], Optional[str], bool]:
+        """
+        Returns (runs, first_id, last_id, has_more).
+        """
+        logging_utility.info("Listing runs (with meta) limit=%d order=%s", limit, order)
+        params = {"limit": limit, "order": order if order in ("asc", "desc") else "asc"}
+        try:
+            resp = self.client.get("/v1/runs", params=params)
+            resp.raise_for_status()
+            payload = resp.json()
+
+            if isinstance(payload, dict) and "data" in payload:
+                env = ent_validator.RunListResponse(**payload)
+                return list(env.data), env.first_id, env.last_id, env.has_more
+
+            # Legacy fallback: compute minimal meta
+            runs = [ent_validator.Run(**item) for item in payload]
+            first_id = runs[0].id if runs else None
+            last_id = runs[-1].id if runs else None
+            return runs, first_id, last_id, False
+
+        except ValidationError as e:
+            logging_utility.error("Validation error: %s", e.json())
+            raise ValueError(f"Validation error: {e}")
+        except httpx.HTTPStatusError as e:
+            logging_utility.error("HTTP error occurred while listing runs: %s", str(e))
+            raise
+        except Exception as e:
+            logging_utility.error("An error occurred while listing runs: %s", str(e))
+            raise
+
+    def list_runs_for_thread(
+        self, thread_id: str, limit: int = 20, order: str = "asc"
+    ) -> List[ent_validator.Run]:
+        logging_utility.info(
+            "Listing runs for thread_id=%s (limit=%d, order=%s)",
+            thread_id,
+            limit,
+            order,
+        )
+        params = {"limit": limit, "order": order if order in ("asc", "desc") else "asc"}
+        try:
+            resp = self.client.get(f"/v1/threads/{thread_id}/runs", params=params)
+            resp.raise_for_status()
+            payload = resp.json()
+
+            if isinstance(payload, dict) and "data" in payload:
+                env = ent_validator.RunListResponse(**payload)
+                logging_utility.info(
+                    "Retrieved %d runs for thread %s", len(env.data), thread_id
+                )
+                return list(env.data)
+
+            runs = [ent_validator.Run(**item) for item in payload]
+            logging_utility.info(
+                "Retrieved %d runs (legacy) for thread %s", len(runs), thread_id
+            )
+            return runs
+
+        except ValidationError as e:
+            logging_utility.error("Validation error: %s", e.json())
+            raise ValueError(f"Validation error: {e}")
+        except httpx.HTTPStatusError as e:
+            logging_utility.error("HTTP error listing runs for thread: %s", str(e))
+            raise
+        except Exception as e:
+            logging_utility.error("Error listing runs for thread: %s", str(e))
+            raise
+
+    def list_runs_for_thread_with_meta(
+        self, thread_id: str, limit: int = 20, order: str = "asc"
+    ) -> Tuple[List[ent_validator.Run], Optional[str], Optional[str], bool]:
+        logging_utility.info(
+            "Listing runs for thread_id=%s (with meta) limit=%d order=%s",
+            thread_id,
+            limit,
+            order,
+        )
+        params = {"limit": limit, "order": order if order in ("asc", "desc") else "asc"}
+        try:
+            resp = self.client.get(f"/v1/threads/{thread_id}/runs", params=params)
+            resp.raise_for_status()
+            payload = resp.json()
+
+            if isinstance(payload, dict) and "data" in payload:
+                env = ent_validator.RunListResponse(**payload)
+                return list(env.data), env.first_id, env.last_id, env.has_more
+
+            runs = [ent_validator.Run(**item) for item in payload]
+            first_id = runs[0].id if runs else None
+            last_id = runs[-1].id if runs else None
+            return runs, first_id, last_id, False
+
+        except ValidationError as e:
+            logging_utility.error("Validation error: %s", e.json())
+            raise ValueError(f"Validation error: {e}")
+        except httpx.HTTPStatusError as e:
+            logging_utility.error("HTTP error listing runs for thread: %s", str(e))
+            raise
+        except Exception as e:
+            logging_utility.error("Error listing runs for thread: %s", str(e))
+            raise

{projectdavid-1.33.33.dist-info → projectdavid-1.34.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.33.33
+Version: 1.34.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
@@ -20,7 +20,7 @@ Requires-Dist: pydantic<3.0,>=2.0
 Requires-Dist: python-dotenv<2.0,>=1.0.1
 Requires-Dist: aiofiles<25.0,>=23.2.1
 Requires-Dist: ollama<0.5.0,>=0.4.4
-Requires-Dist: projectdavid_common==0.17.11
+Requires-Dist: projectdavid_common==0.17.12
 Requires-Dist: qdrant-client<2.0.0,>=1.0.0
 Requires-Dist: pdfplumber<0.12.0,>=0.11.0
 Requires-Dist: validators<0.35.0,>=0.29.0

{projectdavid-1.33.33.dist-info → projectdavid-1.34.0.dist-info}/RECORD

@@ -15,7 +15,7 @@ projectdavid/clients/file_search.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 projectdavid/clients/files_client.py,sha256=XkIDzbQFGDrd88taf0Kouc_4YJOPIYEHiIyWYLKDofI,15581
 projectdavid/clients/inference_client.py,sha256=xz4ACPv5Tkis604QxO5mJX1inH_TGDfQP-31geETYpE,6609
 projectdavid/clients/messages_client.py,sha256=-tUubr5f62nLER6BxVY3ihp3vn3pnZH-ceigvQRSlYs,16825
-projectdavid/clients/runs.py,sha256=-fXOq5L9w2efDPmZkNxb0s2yjl6oN0XN4_aLXqaeceo,25270
+projectdavid/clients/runs.py,sha256=8VcFGxIcmbps8tU6wU04dUhY1C-H3ANqsCUxvlaek3c,29816
 projectdavid/clients/synchronous_inference_wrapper.py,sha256=qh94rtNlLqgIxiA_ZbQ1ncOwQTi9aBj5os3sMExLh4E,7070
 projectdavid/clients/threads_client.py,sha256=9RshJD09kfYxfarTysQz_Bwbv4XxQaHQXhCLRMdaWcI,7392
 projectdavid/clients/tools_client.py,sha256=GkCVOmwpAoPqVt6aYmH0G1HIFha3iEwR9IIf9teR0j8,11487
@@ -37,8 +37,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.33.33.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.33.33.dist-info/METADATA,sha256=N2yfT44Bx7pK-A5d3dRcOAAoOmSFEHS4SMMUvEAsuf0,11556
-projectdavid-1.33.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.33.33.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.33.33.dist-info/RECORD,,
+projectdavid-1.34.0.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.34.0.dist-info/METADATA,sha256=VxCflJwsHNlIc18malH4cofc6-Us2lU2Pm9PZ8B7tl4,11555
+projectdavid-1.34.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.34.0.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.34.0.dist-info/RECORD,,