This commit is contained in:
2026-07-09 02:52:54 +02:00
parent 818568c609
commit 48bb6c2ec2
95 changed files with 6115 additions and 267 deletions
+288 -3
View File
@@ -7,7 +7,7 @@ from dataclasses import dataclass
from datetime import datetime, timezone
from typing import Optional
from pydantic import BaseModel, Field, field_validator
from pydantic import BaseModel, Field, field_validator, model_validator
from devplacepy.database import (
bump_cache_version,
@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
PROVIDERS_TABLE = "gateway_providers"
MODELS_TABLE = "gateway_models"
CACHE_NAME = "gateway_routing"
KINDS = ("chat", "embed")
KINDS = ("chat", "embed", "image")
_ROUTING_CACHE: dict = {}
@@ -47,6 +47,27 @@ def _embed_url_from_base(base_url: str) -> str:
return base_url
def _image_url_from_base(base_url: str) -> str:
base_url = (base_url or "").strip()
if not base_url:
return ""
if base_url.endswith("/chat/completions"):
return base_url[: -len("/chat/completions")] + "/images"
return base_url
MODEL_TIER2_COLUMNS = (
"context_tier_threshold_tokens",
"price_cache_hit_per_m_tier2",
"price_cache_miss_per_m_tier2",
"price_output_per_m_tier2",
"price_input_per_m_tier2",
"off_peak_start_minute",
"off_peak_end_minute",
"off_peak_discount_pct",
)
def ensure_tables() -> None:
db.query(
"CREATE TABLE IF NOT EXISTS "
@@ -62,8 +83,17 @@ def ensure_tables() -> None:
"vision_model TEXT, context_window INTEGER DEFAULT 0, "
"price_cache_hit_per_m REAL DEFAULT 0, price_cache_miss_per_m REAL DEFAULT 0, "
"price_output_per_m REAL DEFAULT 0, price_input_per_m REAL DEFAULT 0, "
"context_tier_threshold_tokens INTEGER DEFAULT 0, "
"price_cache_hit_per_m_tier2 REAL, price_cache_miss_per_m_tier2 REAL, "
"price_output_per_m_tier2 REAL, price_input_per_m_tier2 REAL, "
"off_peak_start_minute INTEGER, off_peak_end_minute INTEGER, "
"off_peak_discount_pct REAL DEFAULT 0, "
"is_active INTEGER DEFAULT 1, created_at TEXT, updated_at TEXT)"
)
models_table = get_table(MODELS_TABLE)
for column in MODEL_TIER2_COLUMNS:
if not models_table.has_column(column):
models_table.create_column_by_example(column, 0.0)
try:
db.query(
"CREATE UNIQUE INDEX IF NOT EXISTS idx_gateway_providers_name ON "
@@ -121,6 +151,14 @@ class ModelRouteIn(BaseModel):
price_cache_miss_per_m: float = Field(default=0.0, ge=0)
price_output_per_m: float = Field(default=0.0, ge=0)
price_input_per_m: float = Field(default=0.0, ge=0)
context_tier_threshold_tokens: int = Field(default=0, ge=0, le=100_000_000)
price_cache_hit_per_m_tier2: Optional[float] = Field(default=None, ge=0)
price_cache_miss_per_m_tier2: Optional[float] = Field(default=None, ge=0)
price_output_per_m_tier2: Optional[float] = Field(default=None, ge=0)
price_input_per_m_tier2: Optional[float] = Field(default=None, ge=0)
off_peak_start_minute: Optional[int] = Field(default=None, ge=0, le=1439)
off_peak_end_minute: Optional[int] = Field(default=None, ge=0, le=1439)
off_peak_discount_pct: float = Field(default=0.0, ge=0, le=100)
is_active: bool = True
@field_validator("source_model", "target_model")
@@ -141,9 +179,19 @@ class ModelRouteIn(BaseModel):
def _clean_kind(cls, value: str) -> str:
value = (value or "chat").strip().lower()
if value not in KINDS:
raise ValueError("Kind must be 'chat' or 'embed'")
raise ValueError("Kind must be 'chat', 'embed', or 'image'")
return value
@model_validator(mode="after")
def _check_off_peak_window(self) -> "ModelRouteIn":
has_start = self.off_peak_start_minute is not None
has_end = self.off_peak_end_minute is not None
if has_start != has_end:
raise ValueError(
"Off-peak start and end minute must both be set, or both left blank"
)
return self
@dataclass(frozen=True)
class ModelRoute:
@@ -158,9 +206,27 @@ class ModelRoute:
price_cache_miss_per_m: float
price_output_per_m: float
price_input_per_m: float
context_tier_threshold_tokens: int
price_cache_hit_per_m_tier2: Optional[float]
price_cache_miss_per_m_tier2: Optional[float]
price_output_per_m_tier2: Optional[float]
price_input_per_m_tier2: Optional[float]
off_peak_start_minute: Optional[int]
off_peak_end_minute: Optional[int]
off_peak_discount_pct: float
is_active: bool
def _opt_float(row: dict, key: str) -> Optional[float]:
value = row.get(key)
return float(value) if value is not None else None
def _opt_int(row: dict, key: str) -> Optional[int]:
value = row.get(key)
return int(value) if value is not None else None
def _route_from_row(row: dict) -> ModelRoute:
return ModelRoute(
source_model=str(row.get("source_model") or ""),
@@ -174,6 +240,16 @@ def _route_from_row(row: dict) -> ModelRoute:
price_cache_miss_per_m=float(row.get("price_cache_miss_per_m") or 0.0),
price_output_per_m=float(row.get("price_output_per_m") or 0.0),
price_input_per_m=float(row.get("price_input_per_m") or 0.0),
context_tier_threshold_tokens=int(
row.get("context_tier_threshold_tokens") or 0
),
price_cache_hit_per_m_tier2=_opt_float(row, "price_cache_hit_per_m_tier2"),
price_cache_miss_per_m_tier2=_opt_float(row, "price_cache_miss_per_m_tier2"),
price_output_per_m_tier2=_opt_float(row, "price_output_per_m_tier2"),
price_input_per_m_tier2=_opt_float(row, "price_input_per_m_tier2"),
off_peak_start_minute=_opt_int(row, "off_peak_start_minute"),
off_peak_end_minute=_opt_int(row, "off_peak_end_minute"),
off_peak_discount_pct=float(row.get("off_peak_discount_pct") or 0.0),
is_active=_as_bool(row.get("is_active", 1)),
)
@@ -291,6 +367,14 @@ class ModelStore:
"price_cache_miss_per_m": payload.price_cache_miss_per_m,
"price_output_per_m": payload.price_output_per_m,
"price_input_per_m": payload.price_input_per_m,
"context_tier_threshold_tokens": payload.context_tier_threshold_tokens,
"price_cache_hit_per_m_tier2": payload.price_cache_hit_per_m_tier2,
"price_cache_miss_per_m_tier2": payload.price_cache_miss_per_m_tier2,
"price_output_per_m_tier2": payload.price_output_per_m_tier2,
"price_input_per_m_tier2": payload.price_input_per_m_tier2,
"off_peak_start_minute": payload.off_peak_start_minute,
"off_peak_end_minute": payload.off_peak_end_minute,
"off_peak_discount_pct": payload.off_peak_discount_pct,
"is_active": 1 if payload.is_active else 0,
"updated_at": _now(),
}
@@ -318,6 +402,63 @@ class ModelStore:
provider_store = ProviderStore()
model_store = ModelStore()
DEEPSEEK_DEFAULT_ROUTES = (
{
"source_model": "deepseek-v4-flash",
"target_model": "deepseek-v4-flash",
"context_window": 1_048_576,
"price_cache_hit_per_m": 0.0028,
"price_cache_miss_per_m": 0.14,
"price_output_per_m": 0.28,
},
{
"source_model": "deepseek-v4-pro",
"target_model": "deepseek-v4-pro",
"context_window": 1_048_576,
"price_cache_hit_per_m": 0.003625,
"price_cache_miss_per_m": 0.435,
"price_output_per_m": 0.87,
},
)
def seed_default_deepseek_routes() -> None:
ensure_tables()
table = get_table(MODELS_TABLE)
seeded = False
for defaults in DEEPSEEK_DEFAULT_ROUTES:
if table.find_one(source_model=defaults["source_model"]):
continue
record = {
"source_model": defaults["source_model"],
"provider": "",
"target_model": defaults["target_model"],
"kind": "chat",
"vision_provider": "",
"vision_model": "",
"context_window": defaults["context_window"],
"price_cache_hit_per_m": defaults["price_cache_hit_per_m"],
"price_cache_miss_per_m": defaults["price_cache_miss_per_m"],
"price_output_per_m": defaults["price_output_per_m"],
"price_input_per_m": 0.0,
"context_tier_threshold_tokens": 0,
"price_cache_hit_per_m_tier2": None,
"price_cache_miss_per_m_tier2": None,
"price_output_per_m_tier2": None,
"price_input_per_m_tier2": None,
"off_peak_start_minute": None,
"off_peak_end_minute": None,
"off_peak_discount_pct": 0.0,
"is_active": 1,
"created_at": _now(),
"updated_at": _now(),
}
table.insert(record)
seeded = True
if seeded:
bump_cache_version(CACHE_NAME)
_ROUTING_CACHE.clear()
def _provider_overlay(name: str, base_key: str, url_key: str, overlay: dict) -> None:
provider = provider_store.get(name)
@@ -339,6 +480,13 @@ def chat_overlay(requested_model: Optional[str], base_cfg: dict) -> Optional[dic
"gateway_price_cache_hit_per_m": route.price_cache_hit_per_m,
"gateway_price_cache_miss_per_m": route.price_cache_miss_per_m,
"gateway_price_output_per_m": route.price_output_per_m,
"gateway_price_cache_hit_per_m_tier2": route.price_cache_hit_per_m_tier2,
"gateway_price_cache_miss_per_m_tier2": route.price_cache_miss_per_m_tier2,
"gateway_price_output_per_m_tier2": route.price_output_per_m_tier2,
"gateway_context_tier_threshold_tokens": route.context_tier_threshold_tokens,
"gateway_off_peak_start_minute": route.off_peak_start_minute,
"gateway_off_peak_end_minute": route.off_peak_end_minute,
"gateway_off_peak_discount_pct": route.off_peak_discount_pct,
}
if route.provider:
_provider_overlay(
@@ -355,6 +503,12 @@ def chat_overlay(requested_model: Optional[str], base_cfg: dict) -> Optional[dic
overlay["gateway_vision_model"] = route.vision_model
overlay["gateway_vision_price_input_per_m"] = route.price_input_per_m
overlay["gateway_vision_price_output_per_m"] = route.price_output_per_m
overlay["gateway_vision_price_input_per_m_tier2"] = (
route.price_input_per_m_tier2
)
overlay["gateway_vision_price_output_per_m_tier2"] = (
route.price_output_per_m_tier2
)
vision_provider = route.vision_provider or route.provider
if vision_provider:
_provider_overlay(
@@ -371,6 +525,11 @@ def embed_overlay(requested_model: Optional[str], base_cfg: dict) -> Optional[di
"gateway_force_model": True,
"gateway_embed_model": route.target_model,
"gateway_embed_price_input_per_m": route.price_input_per_m,
"gateway_embed_price_input_per_m_tier2": route.price_input_per_m_tier2,
"gateway_context_tier_threshold_tokens": route.context_tier_threshold_tokens,
"gateway_off_peak_start_minute": route.off_peak_start_minute,
"gateway_off_peak_end_minute": route.off_peak_end_minute,
"gateway_off_peak_discount_pct": route.off_peak_discount_pct,
}
provider = provider_store.get(route.provider) if route.provider else None
if provider:
@@ -379,3 +538,129 @@ def embed_overlay(requested_model: Optional[str], base_cfg: dict) -> Optional[di
if provider.get("api_key"):
overlay["gateway_embed_key"] = provider["api_key"]
return overlay
def image_overlay(requested_model: Optional[str], base_cfg: dict) -> Optional[dict]:
route = model_store.resolve(requested_model, "image")
if route is None:
return None
overlay: dict = {
"gateway_force_model": True,
"gateway_image_model": route.target_model,
"gateway_image_price_per_call": route.price_input_per_m,
"gateway_off_peak_start_minute": route.off_peak_start_minute,
"gateway_off_peak_end_minute": route.off_peak_end_minute,
"gateway_off_peak_discount_pct": route.off_peak_discount_pct,
}
provider = provider_store.get(route.provider) if route.provider else None
if provider:
if provider.get("base_url"):
overlay["gateway_image_url"] = _image_url_from_base(provider["base_url"])
if provider.get("api_key"):
overlay["gateway_image_key"] = provider["api_key"]
return overlay
OPENROUTER_PROVIDER_NAME = "openrouter"
FLUX_TARGET_MODEL = "black-forest-labs/flux.2-pro"
IMAGE_SOURCE_MODEL = "molodetz-img-small"
RETIRED_IMAGE_MODELS = {
"black-forest-labs/flux-1.1-pro": FLUX_TARGET_MODEL,
"black-forest-labs/flux-schnell": "black-forest-labs/flux.2-klein-4b",
}
LEGACY_IMAGE_URL = "https://openrouter.ai/api/v1/images/generations"
def seed_default_image_routes() -> None:
import os
from devplacepy.services.openai_gateway import config as gw_config
ensure_tables()
openrouter_key = os.environ.get("OPENROUTER_API_KEY", "")
if openrouter_key:
existing_provider = provider_store.get(OPENROUTER_PROVIDER_NAME)
if existing_provider is None:
provider_store.set(
ProviderIn(
name=OPENROUTER_PROVIDER_NAME,
base_url="https://openrouter.ai/api/v1/chat/completions",
api_key=openrouter_key,
is_active=True,
)
)
models_table = get_table(MODELS_TABLE)
if models_table.find_one(source_model=IMAGE_SOURCE_MODEL):
return
record = {
"source_model": IMAGE_SOURCE_MODEL,
"provider": OPENROUTER_PROVIDER_NAME if openrouter_key else "",
"target_model": FLUX_TARGET_MODEL,
"kind": "image",
"vision_provider": "",
"vision_model": "",
"context_window": 0,
"price_cache_hit_per_m": 0.0,
"price_cache_miss_per_m": 0.0,
"price_output_per_m": 0.0,
"price_input_per_m": gw_config.IMAGE_PRICE_PER_CALL_DEFAULT,
"context_tier_threshold_tokens": 0,
"price_cache_hit_per_m_tier2": None,
"price_cache_miss_per_m_tier2": None,
"price_output_per_m_tier2": None,
"price_input_per_m_tier2": None,
"off_peak_start_minute": None,
"off_peak_end_minute": None,
"off_peak_discount_pct": 0.0,
"is_active": 1,
"created_at": _now(),
"updated_at": _now(),
}
models_table.insert(record)
bump_cache_version(CACHE_NAME)
_ROUTING_CACHE.clear()
def migrate_retired_image_gateway() -> None:
from devplacepy.database import get_setting, set_setting
from devplacepy.services.openai_gateway import config as gw_config
ensure_tables()
models_table = get_table(MODELS_TABLE)
now = _now()
changed = False
for row in models_table.find(kind="image"):
target = str(row.get("target_model") or "")
replacement = RETIRED_IMAGE_MODELS.get(target)
if not replacement:
continue
models_table.update(
{
"source_model": row["source_model"],
"target_model": replacement,
"updated_at": now,
},
["source_model"],
)
changed = True
image_url = get_setting("gateway_image_url", "")
if image_url in (LEGACY_IMAGE_URL, ""):
set_setting("gateway_image_url", gw_config.IMAGE_URL_DEFAULT)
changed = True
elif image_url.endswith("/images/generations"):
set_setting(
"gateway_image_url",
image_url[: -len("/generations")],
)
changed = True
image_model = get_setting("gateway_image_model", "")
replacement = RETIRED_IMAGE_MODELS.get(image_model)
if replacement:
set_setting("gateway_image_model", replacement)
changed = True
elif not image_model:
set_setting("gateway_image_model", gw_config.IMAGE_MODEL_DEFAULT)
changed = True
if changed:
bump_cache_version(CACHE_NAME)
_ROUTING_CACHE.clear()