projectdavid-common 0.21.5__tar.gz → 0.21.7__tar.gz

{projectdavid_common-0.21.5/src/projectdavid_common.egg-info → projectdavid_common-0.21.7}/PKG-INFO

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

{projectdavid_common-0.21.5 → projectdavid_common-0.21.7}/pyproject.toml

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

{projectdavid_common-0.21.5 → projectdavid_common-0.21.7}/src/projectdavid_common/constants/ai_model_map.py

@@ -18,61 +18,100 @@ DEEPSEEK_NATIVE_MODELS = {
 
 
 TOGETHER_AI_MODELS = {
-    # --- DeepSeek ---
+    # --- Qwen ---
+    "together-ai/Qwen/QwQ-32B": "Qwen/QwQ-32B",
+    "together-ai/Qwen/Qwen-Image": "Qwen/Qwen-Image",
+    "together-ai/Qwen/Qwen2-7B": "Qwen/Qwen2-7B",
+    "together-ai/Qwen/Qwen2-VL-72B-Instruct": "Qwen/Qwen2-VL-72B-Instruct",
+    "together-ai/Qwen/Qwen2.5-1.5B": "Qwen/Qwen2.5-1.5B",
+    "together-ai/Qwen/Qwen2.5-72B-Instruct-Turbo": "Qwen/Qwen2.5-72B-Instruct-Turbo",
+    "together-ai/Qwen/Qwen2.5-7B-Instruct-Turbo": "Qwen/Qwen2.5-7B-Instruct-Turbo",
+    "together-ai/Qwen/Qwen2.5-Coder-32B-Instruct": "Qwen/Qwen2.5-Coder-32B-Instruct",
+    "together-ai/Qwen/Qwen2.5-VL-72B-Instruct": "Qwen/Qwen2.5-VL-72B-Instruct",
+    "together-ai/Qwen/Qwen3-14B-Base": "Qwen/Qwen3-14B-Base",
+    "together-ai/Qwen/Qwen3-235B-A22B-Instruct-2507-tput": "Qwen/Qwen3-235B-A22B-Instruct-2507-tput",
+    "together-ai/Qwen/Qwen3-235B-A22B-Thinking-2507": "Qwen/Qwen3-235B-A22B-Thinking-2507",
+    "together-ai/Qwen/Qwen3-235B-A22B-fp8-tput": "Qwen/Qwen3-235B-A22B-fp8-tput",
+    "together-ai/Qwen/Qwen3-8B": "Qwen/Qwen3-8B",
+    "together-ai/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": "Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8",
+    "together-ai/Qwen/Qwen3-Next-80B-A3B-Instruct": "Qwen/Qwen3-Next-80B-A3B-Instruct",
+    "together-ai/Qwen/Qwen3-Next-80B-A3B-Instruct-FP8": "Qwen/Qwen3-Next-80B-A3B-Instruct-FP8",
+    "together-ai/Qwen/Qwen3-Next-80B-A3B-Thinking": "Qwen/Qwen3-Next-80B-A3B-Thinking",
+    "together-ai/Qwen/Qwen3-VL-235B-A22B-Instruct-FP": "Qwen/Qwen3-VL-235B-A22B-Instruct-FP",
+    "together-ai/Qwen/Qwen3-VL-32B-Instruct": "Qwen/Qwen3-VL-32B-Instruct",
+    "together-ai/Qwen/Qwen3-VL-8B-Instruct": "Qwen/Qwen3-VL-8B-Instruct",
+    # --- Servicenow-ai ---
+    "together-ai/ServiceNow-AI/Apriel-1.5-15b-Thinker": "ServiceNow-AI/Apriel-1.5-15b-Thinker",
+    "together-ai/ServiceNow-AI/Apriel-1.6-15b-Thinker": "ServiceNow-AI/Apriel-1.6-15b-Thinker",
+    # --- Arcee-ai ---
+    "together-ai/arcee-ai/trinity-mini": "arcee-ai/trinity-mini",
+    # --- Arize-ai ---
+    "together-ai/arize-ai/qwen-2-1.5b-instruct": "arize-ai/qwen-2-1.5b-instruct",
+    # --- Deepcogito ---
+    "together-ai/deepcogito/cogito-v2-1-671b": "deepcogito/cogito-v2-1-671b",
+    "together-ai/deepcogito/cogito-v2-preview-llama-109B-MoE": "deepcogito/cogito-v2-preview-llama-109B-MoE",
+    "together-ai/deepcogito/cogito-v2-preview-llama-405B": "deepcogito/cogito-v2-preview-llama-405B",
+    "together-ai/deepcogito/cogito-v2-preview-llama-70B": "deepcogito/cogito-v2-preview-llama-70B",
+    # --- Deepseek-ai ---
     "together-ai/deepseek-ai/DeepSeek-R1": "deepseek-ai/DeepSeek-R1",
-    "together-ai/deepseek-ai/DeepSeek-V3": "deepseek-ai/DeepSeek-V3",
+    "together-ai/deepseek-ai/DeepSeek-R1-0528-tput": "deepseek-ai/DeepSeek-R1-0528-tput",
+    "together-ai/deepseek-ai/DeepSeek-R1-Distill-Llama-70B-free": "deepseek-ai/DeepSeek-R1-Distill-Llama-70B-free",
     "together-ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B": "deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B",
+    "together-ai/deepseek-ai/DeepSeek-V3": "deepseek-ai/DeepSeek-V3",
+    "together-ai/deepseek-ai/DeepSeek-V3.1": "deepseek-ai/DeepSeek-V3.1",
     "together-ai/deepseek-ai/deepseek-ai/DeepSeek-R1-Distill-Qwen-14B": "deepseek-ai/DeepSeek-R1-Distill-Qwen-14B",
-    "together-ai/deepseek-ai/DeepSeek-R1-Distill-Llama-70B-free": "deepseek-ai/DeepSeek-R1-Distill-Llama-70B-free",
-    # --- Meta Llama ---
-    "together-ai/meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8": "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
-    "together-ai/meta-llama/Llama-4-Scout-17B-16E-Instruct": "meta-llama/Llama-4-Scout-17B-16E-Instruct",
-    "together-ai/meta-llama/Llama-3.3-70B-Instruct-Turbo": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+    # --- Essentialai ---
+    "together-ai/essentialai/rnj-1-instruct": "essentialai/rnj-1-instruct",
+    # --- Google ---
+    "together-ai/google/gemma-2-9b-it": "google/gemma-2-9b-it",
+    "together-ai/google/gemma-2b-it-Ishan": "google/gemma-2b-it-Ishan",
+    "together-ai/google/gemma-3n-E4B-it": "google/gemma-3n-E4B-it",
+    # --- Marin-community ---
+    "together-ai/marin-community/marin-8b-instruct": "marin-community/marin-8b-instruct",
+    # --- Meta-llama ---
     "together-ai/meta-llama/Llama-3.2-11B-Vision-Instruct-Turbo": "meta-llama/Llama-3.2-11B-Vision-Instruct-Turbo",
+    "together-ai/meta-llama/Llama-3.2-3B-Instruct-Turbo": "meta-llama/Llama-3.2-3B-Instruct-Turbo",
     "together-ai/meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo": "meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo",
+    "together-ai/meta-llama/Llama-3.3-70B-Instruct-Turbo": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+    "together-ai/meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8": "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
+    "together-ai/meta-llama/Llama-4-Scout-17B-16E-Instruct": "meta-llama/Llama-4-Scout-17B-16E-Instruct",
     "together-ai/meta-llama/Llama-Vision-Free": "meta-llama/Llama-Vision-Free",
     "together-ai/meta-llama/LlamaGuard-2-8b": "meta-llama/LlamaGuard-2-8b",
-    # --- Google ---
-    "together-ai/google/gemma-2-9b-it": "google/gemma-2-9b-it",
-    # --- Mistral ---
+    "together-ai/meta-llama/Meta-Llama-3-8B-Instruct-Lite": "meta-llama/Meta-Llama-3-8B-Instruct-Lite",
+    "together-ai/meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo": "meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo",
+    "together-ai/meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo": "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",
+    "together-ai/meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo": "meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo",
+    # --- Mistralai ---
+    "together-ai/mistralai/Ministral-3-14B-Instruct-2512": "mistralai/Ministral-3-14B-Instruct-2512",
     "together-ai/mistralai/Mistral-7B-Instruct-v0.2": "mistralai/Mistral-7B-Instruct-v0.2",
     "together-ai/mistralai/Mistral-7B-Instruct-v0.3": "mistralai/Mistral-7B-Instruct-v0.3",
-    # --- Qwen (Legacy/Existing) ---
-    "together-ai/Qwen/QwQ-32B": "Qwen/QwQ-32B",
-    "together-ai/Qwen/Qwen2.5-Coder-32B-Instruct": "Qwen/Qwen2.5-Coder-32B-Instruct",
-    "together-ai/Qwen/Qwen2-VL-72B-Instruct": "Qwen/Qwen2-VL-72B-Instruct",
-    # --- Qwen (New Additions) ---
-    # Qwen 3 Series
-    "together-ai/Qwen/Qwen3-Next-80B-A3B-Instruct": "Qwen/Qwen3-Next-80B-A3B-Instruct",
-    "together-ai/Qwen/Qwen3-Next-80B-A3B-Thinking": "Qwen/Qwen3-Next-80B-A3B-Thinking",
-    "together-ai/Qwen/Qwen3-Next-80B-A3B-Instruct-FP8": "Qwen/Qwen3-Next-80B-A3B-Instruct-FP8",
-    "together-ai/Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8": "Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8",
-    "together-ai/Qwen/Qwen3-235B-A22B-Instruct-2507-tput": "Qwen/Qwen3-235B-A22B-Instruct-2507-tput",
-    "together-ai/Qwen/Qwen3-235B-A22B-fp8-tput": "Qwen/Qwen3-235B-A22B-fp8-tput",
-    "together-ai/Qwen/Qwen3-235B-A22B-Thinking-2507": "Qwen/Qwen3-235B-A22B-Thinking-2507",
-    "together-ai/Qwen/Qwen3-VL-8B-Instruct": "Qwen/Qwen3-VL-8B-Instruct",
-    "together-ai/Qwen/Qwen3-VL-32B-Instruct": "Qwen/Qwen3-VL-32B-Instruct",
-    "together-ai/Qwen/Qwen3-VL-235B-A22B-Instruct-FP": "Qwen/Qwen3-VL-235B-A22B-Instruct-FP",
-    "together-ai/Qwen/Qwen3-8B": "Qwen/Qwen3-8B",
-    "together-ai/Qwen/Qwen3-14B-Base": "Qwen/Qwen3-14B-Base",
-    # OpenAI
+    "together-ai/mistralai/Mistral-Small-24B-Instruct-2501": "mistralai/Mistral-Small-24B-Instruct-2501",
+    "together-ai/mistralai/Mixtral-8x7B-Instruct-v0.1": "mistralai/Mixtral-8x7B-Instruct-v0.1",
+    # --- Moonshotai ---
+    "together-ai/moonshotai/Kimi-K2-Instruct-0905": "moonshotai/Kimi-K2-Instruct-0905",
+    "together-ai/moonshotai/Kimi-K2-Thinking": "moonshotai/Kimi-K2-Thinking",
+    # --- Nvidia ---
+    "together-ai/nvidia/NVIDIA-Nemotron-Nano-9B-v2": "nvidia/NVIDIA-Nemotron-Nano-9B-v2",
+    # --- Openai ---
     "together-ai/openai/gpt-oss-120b": "openai/gpt-oss-120b",
     "together-ai/openai/gpt-oss-20b": "openai/gpt-oss-20b",
-    # Qwen 2.5 Series
-    "together-ai/Qwen/Qwen2.5-72B-Instruct": "Qwen/Qwen2.5-72B-Instruct",
-    "together-ai/Qwen/Qwen2.5-72B-Instruct-Turbo": "Qwen/Qwen2.5-72B-Instruct-Turbo",
-    "together-ai/Qwen/Qwen2.5-VL-72B-Instruct": "Qwen/Qwen2.5-VL-72B-Instruct",
-    "together-ai/Qwen/Qwen2.5-7B-Instruct-Turbo": "Qwen/Qwen2.5-7B-Instruct-Turbo",
-    "together-ai/Qwen/Qwen2.5-1.5B": "Qwen/Qwen2.5-1.5B",
-    # Misc
-    "together-ai/Qwen/Qwen-Image": "Qwen/Qwen-Image",
-    "together-ai/Qwen/Qwen2-7B": "Qwen/Qwen2-7B",
+    # --- Togethercomputer ---
+    "together-ai/togethercomputer/MoA-1": "togethercomputer/MoA-1",
+    "together-ai/togethercomputer/MoA-1-Turbo": "togethercomputer/MoA-1-Turbo",
+    "together-ai/togethercomputer/Refuel-Llm-V2": "togethercomputer/Refuel-Llm-V2",
+    "together-ai/togethercomputer/Refuel-Llm-V2-Small": "togethercomputer/Refuel-Llm-V2-Small",
+    # --- Zai-org ---
+    "together-ai/zai-org/GLM-4.5-Air-FP8": "zai-org/GLM-4.5-Air-FP8",
+    "together-ai/zai-org/GLM-4.6": "zai-org/GLM-4.6",
+    "together-ai/zai-org/GLM-4.7": "zai-org/GLM-4.7",
 }
 
 
 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 +123,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 +133,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.7/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.5 → projectdavid_common-0.21.7/src/projectdavid_common.egg-info}/PKG-INFO

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

projectdavid_common-0.21.5/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]