projectdavid-common 0.21.4__tar.gz → 0.21.6__tar.gz

{projectdavid_common-0.21.4/src/projectdavid_common.egg-info → projectdavid_common-0.21.6}/PKG-INFO

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

{projectdavid_common-0.21.4 → projectdavid_common-0.21.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "projectdavid_common"
-version = "0.21.4"
+version = "0.21.6"
 description = "Common shared custom packages"
 readme = "README.md"
 authors = [

{projectdavid_common-0.21.4 → projectdavid_common-0.21.6}/src/projectdavid_common/constants/ai_model_map.py

@@ -67,12 +67,17 @@ TOGETHER_AI_MODELS = {
     # Misc
     "together-ai/Qwen/Qwen-Image": "Qwen/Qwen-Image",
     "together-ai/Qwen/Qwen2-7B": "Qwen/Qwen2-7B",
+    # OpenAI
+    "together-ai/openai/gpt-oss-120b": "openai/gpt-oss-120b",
+    "together-ai/openai/gpt-oss-20b": "openai/gpt-oss-20b",
 }
 
 
 HYPERBOLIC_MODELS = {
     # DeepSeek
     "hyperbolic/deepseek-ai/DeepSeek-V3-0324": "deepseek-ai/DeepSeek-V3-0324",
+    # new
+    "hyperbolic/deepseek-ai/DeepSeek-R1-0528": "deepseek-ai/DeepSeek-R1-0528",
     "hyperbolic/deepseek-ai/DeepSeek-R1": "deepseek-ai/DeepSeek-R1",
     "hyperbolic/deepseek-ai/DeepSeek-V3": "deepseek-ai/DeepSeek-V3",
     # llama
@@ -84,6 +89,7 @@ HYPERBOLIC_MODELS = {
     "hyperbolic/meta-llama/Meta-Llama-3-70B-Instruct": "meta-llama/Meta-Llama-3-70B-Instruct",
     # Quen
     "hyperbolic/Qwen/QwQ-32B": "Qwen/QwQ-32B",
+    "hyperbolic/Qwen/Qwen2.5-VL-7B-Instruct": "Qwen/Qwen2.5-VL-7B-Instruct",
     "hyperbolic/Qwen/Qwen2.5-Coder-32B-Instruct": "Qwen/Qwen2.5-Coder-32B-Instruct",
     "hyperbolic/Qwen/Qwen2.5-72B-Instruct": "Qwen/Qwen2.5-72B-Instruct",
     "hyperbolic/Qwen/Qwen3-Next-80B-A3B-Thinking": "Qwen/Qwen3-Next-80B-A3B-Thinking",
@@ -93,6 +99,8 @@ HYPERBOLIC_MODELS = {
     # OpenAI
     "hyperbolic/openai/gpt-oss-120b": "openai/gpt-oss-120b",
     "hyperbolic/openai/gpt-oss-20b": "openai/gpt-oss-20b",
+    # New
+    "hyperbolic/openai/gpt-oss-120b-turbo": "openai/gpt-oss-120b-turbo",
 }
 
 

{projectdavid_common-0.21.4 → projectdavid_common-0.21.6}/src/projectdavid_common/schemas/runs_schema.py

@@ -9,7 +9,6 @@ from typing import Any, Dict, List, Literal, Optional
 from pydantic import BaseModel, ConfigDict, Field
 
 from projectdavid_common.schemas.actions_schema import ActionRead
-from projectdavid_common.schemas.tools_schema import Tool, ToolRead
 
 
 # --------------------------------------------------------------------------- #
@@ -65,7 +64,6 @@ class Run(BaseModel):
     status: RunStatus
     thread_id: str
     tool_choice: str
-    tools: List[Tool]
     # Accept 'auto' or None on read
     truncation_strategy: Optional[TruncationStrategy] = None
     usage: Optional[Any]
@@ -106,7 +104,6 @@ class RunCreate(BaseModel):
     status: RunStatus = RunStatus.pending
     thread_id: str
     tool_choice: str = "none"
-    tools: List[Tool] = Field(default_factory=list)
     # Optional so callers can omit and let DB default 'auto' apply
     truncation_strategy: Optional[TruncationStrategy] = None
     usage: Optional[Any] = None
@@ -143,7 +140,6 @@ class RunReadDetailed(BaseModel):
     status: RunStatus
     thread_id: str
     tool_choice: Optional[str] = None
-    tools: List[ToolRead]
     # Accept 'auto' or None on read
     truncation_strategy: Optional[TruncationStrategy] = None
     usage: Optional[Any] = None

projectdavid_common-0.21.6/src/projectdavid_common/schemas/stream_schema.py

@@ -0,0 +1,37 @@
+from typing import Optional
+
+from pydantic import (  # Added ConfigDict and field_validator
+    BaseModel,
+    ConfigDict,
+    field_validator,
+)
+
+from projectdavid_common.constants.ai_model_map import MODEL_MAP
+
+
+class StreamRequest(BaseModel):
+    # 1. FIX: Tell Pydantic to allow fields starting with "model_"
+    model_config = ConfigDict(protected_namespaces=())
+
+    provider: str
+    model: str
+    api_key: Optional[str] = None  # Added default None
+    thread_id: str
+    message_id: str
+    run_id: str
+    assistant_id: str
+    content: Optional[str] = None
+
+    # 2. UPDATED: Using Pydantic v2 field_validator
+    @field_validator("model")
+    @classmethod
+    def validate_model_key(cls, v: str) -> str:
+        if v not in MODEL_MAP:
+            # Note: Ensure MODEL_MAP contains "hyperbolic/deepseek-ai/DeepSeek-V3-0324"
+            # as seen in your logs, or this will throw a 422 error.
+            raise ValueError(f"Invalid model '{v}'. Must be one of: {', '.join(MODEL_MAP.keys())}")
+        return v
+
+    @property
+    def mapped_model(self) -> str:
+        return MODEL_MAP[self.model]

{projectdavid_common-0.21.4 → projectdavid_common-0.21.6}/src/projectdavid_common/validation.py

@@ -53,14 +53,6 @@ from projectdavid_common.schemas.threads_schema import (
     ThreadReadDetailed,
     ThreadUpdate,
 )
-from projectdavid_common.schemas.tools_schema import (
-    Tool,
-    ToolCreate,
-    ToolFunction,
-    ToolList,
-    ToolRead,
-    ToolUpdate,
-)
 from projectdavid_common.schemas.users_schema import (
     UserBase,
     UserCreate,
@@ -159,12 +151,6 @@ class ValidationInterface:
     ThreadDeleted = ThreadDeleted
 
     # Tools schemas
-    ToolFunction = ToolFunction
-    Tool = Tool
-    ToolCreate = ToolCreate
-    ToolRead = ToolRead
-    ToolUpdate = ToolUpdate
-    ToolList = ToolList
 
     # Users schemas
     UserBase = UserBase

{projectdavid_common-0.21.4 → projectdavid_common-0.21.6/src/projectdavid_common.egg-info}/PKG-INFO

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

{projectdavid_common-0.21.4 → projectdavid_common-0.21.6}/src/projectdavid_common.egg-info/SOURCES.txt

@@ -28,7 +28,6 @@ src/projectdavid_common/schemas/messages_schema.py
 src/projectdavid_common/schemas/runs_schema.py
 src/projectdavid_common/schemas/stream_schema.py
 src/projectdavid_common/schemas/threads_schema.py
-src/projectdavid_common/schemas/tools_schema.py
 src/projectdavid_common/schemas/users_schema.py
 src/projectdavid_common/schemas/vector_search_envelope.py
 src/projectdavid_common/schemas/vectors_schema.py

projectdavid_common-0.21.4/src/projectdavid_common/schemas/stream_schema.py

@@ -1,26 +0,0 @@
-from typing import Optional
-
-from pydantic import BaseModel, validator
-
-from projectdavid_common.constants.ai_model_map import MODEL_MAP
-
-
-class StreamRequest(BaseModel):
-    provider: str
-    model: str
-    api_key: Optional[str]
-    thread_id: str
-    message_id: str
-    run_id: str
-    assistant_id: str
-    content: Optional[str] = None
-
-    @validator("model")
-    def validate_model_key(cls, v):
-        if v not in MODEL_MAP:
-            raise ValueError(f"Invalid model '{v}'. Must be one of: {', '.join(MODEL_MAP.keys())}")
-        return v
-
-    @property
-    def mapped_model(self) -> str:
-        return MODEL_MAP[self.model]

projectdavid_common-0.21.4/src/projectdavid_common/schemas/tools_schema.py

@@ -1,65 +0,0 @@
-from typing import List, Optional
-
-from pydantic import BaseModel, ConfigDict, Field, field_validator
-
-
-class ToolFunction(BaseModel):
-    function: Optional[dict] = Field(default=None, description="Tool function definition")
-
-    @field_validator("function", mode="before")
-    @classmethod
-    def parse_function(cls, v):
-        if isinstance(v, dict) and "name" in v and "description" in v:
-            return v
-        elif isinstance(v, dict) and "function" in v:
-            return v["function"]
-        raise ValueError("Invalid function format")
-
-
-class Tool(BaseModel):
-    id: str
-    type: str
-    name: Optional[str] = Field(default=None)
-    function: Optional[ToolFunction] = Field(default=None)
-
-    model_config = ConfigDict(from_attributes=True)
-
-
-class ToolCreate(BaseModel):
-    name: str
-    type: str
-    function: Optional[ToolFunction] = Field(default=None)
-
-    @field_validator("function", mode="before")
-    @classmethod
-    def parse_function(cls, v):
-        if isinstance(v, ToolFunction):
-            return v
-        if isinstance(v, dict) and "function" in v:
-            return ToolFunction(function=v["function"])
-        return ToolFunction(**v)
-
-
-class ToolRead(Tool):
-    @field_validator("function", mode="before")
-    @classmethod
-    def parse_function(cls, v):
-        if isinstance(v, dict):
-            return ToolFunction(**v)
-        elif v is None:
-            return None
-        raise ValueError("Invalid function format")
-
-    model_config = ConfigDict(from_attributes=True)
-
-
-class ToolUpdate(BaseModel):
-    type: Optional[str] = Field(default=None)
-    name: Optional[str] = Field(default=None)
-    function: Optional[ToolFunction] = Field(default=None)
-
-
-class ToolList(BaseModel):
-    tools: List[ToolRead]
-
-    model_config = ConfigDict(from_attributes=True)