projectdavid-common 0.16.2__py3-none-any.whl → 0.17.1__py3-none-any.whl

projectdavid_common/schemas/runs_schema.py

@@ -1,3 +1,8 @@
+"""
+schemas/run_schema.py
+Keeps client / server / SDK in sync with the new user_id column on runs.
+"""
+
 from datetime import datetime
 from enum import Enum
 from typing import Any, Dict, List, Optional
@@ -8,8 +13,31 @@ from projectdavid_common.schemas.actions_schema import ActionRead
 from projectdavid_common.schemas.tools_schema import Tool, ToolRead
 
 
+# --------------------------------------------------------------------------- #
+#  Status enum (unchanged)
+# --------------------------------------------------------------------------- #
+class RunStatus(str, Enum):
+    queued = "queued"
+    in_progress = "in_progress"
+    pending_action = "action_required"
+    completed = "completed"
+    failed = "failed"
+    cancelled = "cancelled"
+    pending = "pending"
+    processing = "processing"
+    expired = "expired"
+    retrying = "retrying"
+
+
+# --------------------------------------------------------------------------- #
+#  Base‑level model returned by most endpoints
+# --------------------------------------------------------------------------- #
 class Run(BaseModel):
     id: str
+    user_id: Optional[str] = Field(
+        default=None,
+        json_schema_extra={"readOnly": True},  # ← Ensure this is set
+    )
     assistant_id: str
     cancelled_at: Optional[int]
     completed_at: Optional[int]
@@ -28,7 +56,7 @@ class Run(BaseModel):
     required_action: Optional[str]
     response_format: str
     started_at: Optional[int]
-    status: str
+    status: RunStatus | str  # accepts Enum or raw str
     thread_id: str
     tool_choice: str
     tools: List[Tool]
@@ -41,9 +69,19 @@ class Run(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
 
+# --------------------------------------------------------------------------- #
+#  Payload used by SDK / tests when creating runs
+#  user_id is optional ‑ server overwrites it from auth context
+# --------------------------------------------------------------------------- #
 class RunCreate(BaseModel):
     id: str
     assistant_id: str
+    # ── NEW optional user_id (ignored by server if provided) ───────────── #
+    user_id: Optional[str] = Field(
+        default=None,
+        json_schema_extra={"readOnly": True},  # treated as server‑generated
+    )
+    # ───────────────────────────────────────────────────────────────────── #
     cancelled_at: Optional[int] = None
     completed_at: Optional[int] = None
     created_at: int
@@ -61,7 +99,7 @@ class RunCreate(BaseModel):
     required_action: Optional[str] = None
     response_format: str = "text"
     started_at: Optional[int] = None
-    status: str = "pending"
+    status: RunStatus | str = RunStatus.pending
     thread_id: str
     tool_choice: str = "none"
     tools: List[Tool] = Field(default_factory=list)
@@ -74,8 +112,12 @@ class RunCreate(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
 
+# --------------------------------------------------------------------------- #
+#  Rich read model with actions attached
+# --------------------------------------------------------------------------- #
 class RunReadDetailed(BaseModel):
     id: str
+    user_id: str  # ← NEW
     assistant_id: str
     cancelled_at: Optional[datetime] = None
     completed_at: Optional[datetime] = None
@@ -94,7 +136,7 @@ class RunReadDetailed(BaseModel):
     required_action: Optional[str] = None
     response_format: str
     started_at: Optional[int] = None
-    status: str
+    status: RunStatus | str
     thread_id: str
     tool_choice: str
     tools: List[ToolRead]
@@ -108,18 +150,8 @@ class RunReadDetailed(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
 
-class RunStatus(str, Enum):
-    queued = "queued"
-    in_progress = "in_progress"
-    pending_action = "action_required"
-    completed = "completed"
-    failed = "failed"
-    cancelled = "cancelled"
-    pending = "pending"
-    processing = "processing"
-    expired = "expired"
-    retrying = "retrying"
-
-
+# --------------------------------------------------------------------------- #
+#  Small helper for the status‑only update endpoint
+# --------------------------------------------------------------------------- #
 class RunStatusUpdate(BaseModel):
     status: RunStatus

{projectdavid_common-0.16.2.dist-info → projectdavid_common-0.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid_common
-Version: 0.16.2
+Version: 0.17.1
 Summary: Common shared custom packages
 Author-email: "Francis N." <francis.neequaye@projectdavid.co.uk>
 License: MIT

{projectdavid_common-0.16.2.dist-info → projectdavid_common-0.17.1.dist-info}/RECORD

@@ -16,7 +16,7 @@ projectdavid_common/schemas/enums.py,sha256=1fyrH1pKvxXaOUwCGpr3TZovJZOolgezdOXv
 projectdavid_common/schemas/files_schema.py,sha256=hNMqVDRc5lsdhxyPWO79QjIpE7NKmKzdQ6hJG8L6LfA,3025
 projectdavid_common/schemas/inference_schema.py,sha256=LPjKDCq7jBPbQCgwlM97rxO477v3vWwb6RYh4DW0KIs,228
 projectdavid_common/schemas/messages_schema.py,sha256=HNGFO-3_xPBDl133CauL5lK3hhUXpLCM3LU9VylyIDg,2589
-projectdavid_common/schemas/runs_schema.py,sha256=l8w68QpEBSe3kGHQIj15Fr4gMkk3_ftlHYs0UpHURDg,3552
+projectdavid_common/schemas/runs_schema.py,sha256=WBkNwqcXEnleEJiGhftqm1NNnM21do4aEtJQv31fs60,5445
 projectdavid_common/schemas/stream_schema.py,sha256=_0Op35E5TZ-XLM8j5b3xDRuUobGq2eh40oCx1RyGi_A,645
 projectdavid_common/schemas/threads_schema.py,sha256=DRqiVDoAdAvJ-ALhvjzyVoGkFVrewtA3GOGPVt0IG_0,1293
 projectdavid_common/schemas/tools_schema.py,sha256=RywLJk1a1-liPnqpf8s9IfTaMBG6uqj3YtV52H7U18g,1815
@@ -26,8 +26,8 @@ projectdavid_common/schemas/vectors_schema.py,sha256=KG4HSa6yVgBLe01iSdXKoU3UxRS
 projectdavid_common/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 projectdavid_common/utilities/identifier_service.py,sha256=7hL4_i7pGs6bibCSkXQIwpMSUCFASFE0VPm6gqMv4sk,2950
 projectdavid_common/utilities/logging_service.py,sha256=ONKy3PRjIrxIrTJ_X3iv7v9HA0wyejyw4WrQYlJy7Oc,2614
-projectdavid_common-0.16.2.dist-info/METADATA,sha256=K2Kb5kbGjHqZax05mOe5GxL7nXq-F5xyw6NXXhA_8ys,1673
-projectdavid_common-0.16.2.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-projectdavid_common-0.16.2.dist-info/entry_points.txt,sha256=Y8HAIUW0ifCKcAzAqR21wu1ATHNFWWWiUB33UYv095o,74
-projectdavid_common-0.16.2.dist-info/top_level.txt,sha256=lJ-jkZ0n0jWktoMJFcw-DzLoMTY2juuw5fgMIqYu1UU,20
-projectdavid_common-0.16.2.dist-info/RECORD,,
+projectdavid_common-0.17.1.dist-info/METADATA,sha256=wmRmu-GUl8dvZWjR-8In8PbZ0YWA_SFJe980d5X-mA8,1673
+projectdavid_common-0.17.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+projectdavid_common-0.17.1.dist-info/entry_points.txt,sha256=Y8HAIUW0ifCKcAzAqR21wu1ATHNFWWWiUB33UYv095o,74
+projectdavid_common-0.17.1.dist-info/top_level.txt,sha256=lJ-jkZ0n0jWktoMJFcw-DzLoMTY2juuw5fgMIqYu1UU,20
+projectdavid_common-0.17.1.dist-info/RECORD,,

{projectdavid_common-0.16.2.dist-info → projectdavid_common-0.17.1.dist-info}/WHEEL

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