projectdavid-common 0.17.2__py3-none-any.whl → 0.17.4__py3-none-any.whl

projectdavid_common/schemas/assistants_schema.py

@@ -1,112 +1,62 @@
-from enum import Enum
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl, field_validator
+from pydantic import BaseModel, ConfigDict, Field, HttpUrl
 
-from projectdavid_common.constants.tools import PLATFORM_TOOLS
 from projectdavid_common.schemas.vectors_schema import VectorStoreRead
 
-ToolName = Enum("ToolName", {name.upper(): name for name in PLATFORM_TOOLS})
 
-
-# ────────────────────────────────────────────────────────────────────────────
+# ───────────────────────────────────────────────
 #  ASSISTANT  •  CREATE
-# ────────────────────────────────────────────────────────────────────────────
+# ───────────────────────────────────────────────
 class AssistantCreate(BaseModel):
-    id: Optional[str] = Field(
-        None,
-        description="Optional pre-generated assistant ID (leave blank for auto).",
-    )
+    id: Optional[str] = Field(None, description="Optional pre-generated assistant ID.")
+
+    # ─── core info ────────────────────────────
     name: str = Field(..., description="Assistant name")
     description: str = Field("", description="Brief description")
     model: str = Field(..., description="LLM model ID")
-    instructions: str = Field("", description="System instructions / guidelines for the assistant")
+    instructions: str = Field("", description="System instructions")
 
-    # ─── tool definitions ────────────────────────────────────────────
-    tools: Optional[List[dict]] = Field(
-        None, description="OpenAI-style tool specs (name, parameters …)"
-    )
-    platform_tools: Optional[List[Dict[str, Any]]] = Field(
-        None,
-        description=(
-            "Inline platform tools. "
-            "Example: [{'type': 'file_search', 'vector_store_ids': ['vs_123']}]"
-        ),
-    )
-    tool_resources: Optional[Dict[str, Dict[str, Any]]] = Field(
-        None,
-        description=(
-            "Per-tool resource map, keyed by tool type. Example:\n"
-            "{\n"
-            "  'code_interpreter': { 'file_ids': ['f_abc'] },\n"
-            "  'file_search':     { 'vector_store_ids': ['vs_123'] }\n"
-            "}"
-        ),
-    )
+    # ─── tools & resources ────────────────────
+    tools: Optional[List[dict]] = Field(None, description="OpenAI-style tool specs (dicts).")
+    tool_resources: Optional[Dict[str, Dict[str, Any]]] = None
 
-    # ─── misc settings ───────────────────────────────────────────────
-    meta_data: Optional[dict] = Field(None, description="Free-form metadata")
-    top_p: float = Field(1.0, ge=0, le=1, description="top-p sampling value")
-    temperature: float = Field(1.0, ge=0, le=2, description="temperature value")
-    response_format: str = Field("auto", description="Response format")
-
-    # ─── webhook settings ────────────────────────────────────────────
-    webhook_url: Optional[HttpUrl] = Field(
-        None,
-        description="Endpoint for run.action_required callbacks",
-        examples=["https://myapp.com/webhooks/actions"],
-    )
-    webhook_secret: Optional[str] = Field(
-        None,
-        min_length=16,
-        description="HMAC secret used to sign outgoing webhooks",
-        examples=["whsec_ReplaceWithARealSecureSecret123"],
-    )
+    # ─── misc settings ────────────────────────
+    meta_data: Optional[dict] = None
+    top_p: float = Field(1.0, ge=0, le=1)
+    temperature: float = Field(1.0, ge=0, le=2)
+    response_format: str = Field("auto")
 
-    @field_validator("platform_tools")
-    def validate_platform_tools(cls, v):
-        if v is None:
-            return v
-        for tool in v:
-            if "type" not in tool:
-                raise ValueError("Platform tool must have a 'type' field")
-            if tool["type"] not in [t.value for t in ToolName]:
-                raise ValueError(
-                    f"Invalid tool type: {tool['type']}. Allowed types are {[t.value for t in ToolName]}"
-                )
-        return v
+    # ─── webhooks ─────────────────────────────
+    webhook_url: Optional[HttpUrl] = None
+    webhook_secret: Optional[str] = Field(None, min_length=16)
 
     model_config = ConfigDict(
         json_schema_extra={
             "example": {
                 "name": "Search Assistant",
-                "description": "Assistant that can search company docs",
                 "model": "gpt-4o-mini",
-                "instructions": "Use tools when relevant.",
-                "platform_tools": [{"type": "file_search", "vector_store_ids": ["vs_docs"]}],
                 "tool_resources": {"file_search": {"vector_store_ids": ["vs_docs"]}},
-                "top_p": 0.9,
-                "temperature": 0.7,
             }
         }
     )
 
 
-# ────────────────────────────────────────────────────────────────────────────
+# ───────────────────────────────────────────────
 #  ASSISTANT  •  READ
-# ────────────────────────────────────────────────────────────────────────────
+# ───────────────────────────────────────────────
 class AssistantRead(BaseModel):
     id: str
     user_id: Optional[str] = None
     object: str
     created_at: int
+
     name: str
     description: Optional[str] = None
     model: str
     instructions: Optional[str] = None
 
     tools: Optional[List[dict]] = None
-    platform_tools: Optional[List[Dict[str, Any]]] = None
     tool_resources: Optional[Dict[str, Dict[str, Any]]] = None
 
     meta_data: Optional[Dict[str, Any]] = None
@@ -117,79 +67,34 @@ class AssistantRead(BaseModel):
     vector_stores: List[VectorStoreRead] = Field(default_factory=list)
     webhook_url: Optional[HttpUrl] = None
 
-    @field_validator("platform_tools")
-    def validate_platform_tools(cls, v):
-        if v is None:
-            return v
-        for tool in v:
-            if "type" not in tool:
-                raise ValueError("Platform tool must have a 'type' field")
-            if tool["type"] not in [t.value for t in ToolName]:
-                raise ValueError(
-                    f"Invalid tool type: {tool['type']}. Allowed types are {[t.value for t in ToolName]}"
-                )
-        return v
-
-    model_config = ConfigDict(
-        from_attributes=True,
-        json_schema_extra={
-            "example": {
-                "id": "asst_abc123",
-                "user_id": "user_xyz",
-                "object": "assistant",
-                "created_at": 1710000000,
-                "name": "Search Assistant",
-                "model": "gpt-4o-mini",
-                "platform_tools": [{"type": "file_search", "vector_store_ids": ["vs_docs"]}],
-                "tool_resources": {"file_search": {"vector_store_ids": ["vs_docs"]}},
-                "top_p": 1.0,
-                "temperature": 0.7,
-                "response_format": "auto",
-            }
-        },
-    )
+    model_config = ConfigDict(from_attributes=True)
 
 
-# ────────────────────────────────────────────────────────────────────────────
-#  ASSISTANT  •  UPDATE
-# ────────────────────────────────────────────────────────────────────────────
+# ───────────────────────────────────────────────
+#  ASSISTANT  •  UPDATE  (patched)
+# ───────────────────────────────────────────────
 class AssistantUpdate(BaseModel):
+    # ─── scalar fields ────────────────────────
     name: Optional[str] = None
     description: Optional[str] = None
     model: Optional[str] = None
     instructions: Optional[str] = None
-
-    tools: Optional[List[Any]] = None
-    platform_tools: Optional[List[Dict[str, Any]]] = None
-    tool_resources: Optional[Dict[str, Dict[str, Any]]] = None
-
     meta_data: Optional[Dict[str, Any]] = None
     top_p: Optional[float] = Field(None, ge=0, le=1)
     temperature: Optional[float] = Field(None, ge=0, le=2)
     response_format: Optional[str] = None
 
+    # ─── relationship IDs (lists of strings) ──
+    tools: Optional[List[str]] = None
+    users: Optional[List[str]] = None
+    vector_stores: Optional[List[str]] = None
+
+    # ─── JSON config ─────────────────────────
+    tool_resources: Optional[Dict[str, Dict[str, Any]]] = None
+
+    # ─── webhooks ─────────────────────────────
     webhook_url: Optional[HttpUrl] = None
     webhook_secret: Optional[str] = Field(None, min_length=16)
 
-    @field_validator("platform_tools")
-    def validate_platform_tools(cls, v):
-        if v is None:
-            return v
-        for tool in v:
-            if "type" not in tool:
-                raise ValueError("Platform tool must have a 'type' field")
-            if tool["type"] not in [t.value for t in ToolName]:
-                raise ValueError(
-                    f"Invalid tool type: {tool['type']}. Allowed types are {[t.value for t in ToolName]}"
-                )
-        return v
-
-    model_config = ConfigDict(
-        json_schema_extra={
-            "example": {
-                "name": "Updated name",
-                "platform_tools": [{"type": "calculator"}],
-                "tool_resources": {"code_interpreter": {"file_ids": ["f_new_readme"]}},
-            }
-        }
-    )
+    # forbid unknown keys so stray dicts can’t sneak in
+    model_config = ConfigDict(extra="forbid")

{projectdavid_common-0.17.2.dist-info → projectdavid_common-0.17.4.dist-info}/METADATA

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

{projectdavid_common-0.17.2.dist-info → projectdavid_common-0.17.4.dist-info}/RECORD

@@ -11,7 +11,7 @@ projectdavid_common/constants/tools.py,sha256=FOsrnmwccklDrxRP1OUr22Xx5Uswg80LFa
 projectdavid_common/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 projectdavid_common/schemas/actions_schema.py,sha256=fJPZoY9hoL0-e6Lp_NqpjVhSIr_qrNLjmQycJf5gmN0,2985
 projectdavid_common/schemas/api_key_schemas.py,sha256=PM6WOlzE-Y06v5YXLYXH5B2EmttMc8oiWbHd4Su81p4,4031
-projectdavid_common/schemas/assistants_schema.py,sha256=1-ciMT5dWW77cV97gbnMLG5ue0G8EA_zumIEziRxYTU,8493
+projectdavid_common/schemas/assistants_schema.py,sha256=TMH50SM2ZPbTdnaY7_qmvLev2CES8xQtrQAcwnBH5tI,4401
 projectdavid_common/schemas/enums.py,sha256=pQdkz_hmfU_vcZdn4XOvcPOcQihaX_iuQIFk-yKTiaw,692
 projectdavid_common/schemas/files_schema.py,sha256=hNMqVDRc5lsdhxyPWO79QjIpE7NKmKzdQ6hJG8L6LfA,3025
 projectdavid_common/schemas/inference_schema.py,sha256=LPjKDCq7jBPbQCgwlM97rxO477v3vWwb6RYh4DW0KIs,228
@@ -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.17.2.dist-info/METADATA,sha256=KifP4N7pUXuk1z3J8gbs2tl4Peo6C3IoSHp41KTWiOM,1673
-projectdavid_common-0.17.2.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-projectdavid_common-0.17.2.dist-info/entry_points.txt,sha256=Y8HAIUW0ifCKcAzAqR21wu1ATHNFWWWiUB33UYv095o,74
-projectdavid_common-0.17.2.dist-info/top_level.txt,sha256=lJ-jkZ0n0jWktoMJFcw-DzLoMTY2juuw5fgMIqYu1UU,20
-projectdavid_common-0.17.2.dist-info/RECORD,,
+projectdavid_common-0.17.4.dist-info/METADATA,sha256=nBPeZ6JUqPB14QVo7Qhf0YbIw7jC1e0kI6ObQqnbchA,1673
+projectdavid_common-0.17.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid_common-0.17.4.dist-info/entry_points.txt,sha256=Y8HAIUW0ifCKcAzAqR21wu1ATHNFWWWiUB33UYv095o,74
+projectdavid_common-0.17.4.dist-info/top_level.txt,sha256=lJ-jkZ0n0jWktoMJFcw-DzLoMTY2juuw5fgMIqYu1UU,20
+projectdavid_common-0.17.4.dist-info/RECORD,,

{projectdavid_common-0.17.2.dist-info → projectdavid_common-0.17.4.dist-info}/WHEEL

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