half undo 83a49a3 to not introduce extra db-settings

This commit is contained in:
Shroominic
2025-11-23 12:29:00 -08:00
parent edd7bd40c5
commit ec60dbe568
3 changed files with 13 additions and 29 deletions
-1
View File
@@ -37,7 +37,6 @@ UPSTREAM_API_KEY=your-upstream-api-key
# BASE_URL=https://openrouter.ai/api/v1
# MODELS_PATH=models.json
# SOURCE=
# EXCLUDED_MODEL_IDS="openrouter/auto,google/gemini-2.5-pro-exp-03-25,opengvlab/internvl3-78b,openrouter/sonoma-dusk-alpha,openrouter/sonoma-sky-alpha"
# UI Configuration (for Next.js frontend)
# These variables are prefixed with NEXT_PUBLIC_ to be accessible in the browser
+2 -14
View File
@@ -16,7 +16,7 @@ class Settings(BaseSettings):
@classmethod
def parse_env_var(cls, field_name: str, raw_value: str) -> Any: # type: ignore[override]
if field_name in {"cashu_mints", "cors_origins", "relays", "excluded_model_ids"}:
if field_name in {"cashu_mints", "cors_origins", "relays"}:
v = str(raw_value).strip()
if v == "":
return []
@@ -55,18 +55,6 @@ class Settings(BaseSettings):
# Minimum per-request charge in millisatoshis when model pricing is free/zero
min_request_msat: int = Field(default=1, env="MIN_REQUEST_MSAT")
# Model filtering
excluded_model_ids: list[str] = Field(
default_factory=lambda: [
"openrouter/auto",
"google/gemini-2.5-pro-exp-03-25",
"opengvlab/internvl3-78b",
"openrouter/sonoma-dusk-alpha",
"openrouter/sonoma-sky-alpha"
],
env="EXCLUDED_MODEL_IDS"
)
# Network
cors_origins: list[str] = Field(default_factory=lambda: ["*"], env="CORS_ORIGINS")
tor_proxy_url: str = Field(default="socks5://127.0.0.1:9050", env="TOR_PROXY_URL")
@@ -317,4 +305,4 @@ class SettingsService:
for k, v in data.items():
setattr(settings, k, v)
cls._current = settings
return settings
return settings
+11 -14
View File
@@ -2,6 +2,7 @@ import asyncio
import json
import random
from pathlib import Path
from typing import Final
from urllib.request import urlopen
import httpx
@@ -19,6 +20,14 @@ logger = get_logger(__name__)
models_router = APIRouter()
DEFAULT_EXCLUDED_MODEL_IDS: Final[set[str]] = {
"openrouter/auto",
"google/gemini-2.5-pro-exp-03-25",
"opengvlab/internvl3-78b",
"openrouter/sonoma-dusk-alpha",
"openrouter/sonoma-sky-alpha",
}
class Architecture(BaseModel):
modality: str
@@ -87,15 +96,9 @@ def fetch_openrouter_models(source_filter: str | None = None) -> list[dict]:
model["id"] = model_id[len(source_prefix) :]
model_id = model["id"]
# Check if model should be excluded based on configuration
try:
excluded_ids = getattr(settings, "excluded_model_ids", [])
except Exception:
excluded_ids = []
if (
"(free)" in model.get("name", "")
or model_id in excluded_ids
or model_id in DEFAULT_EXCLUDED_MODEL_IDS
):
continue
@@ -130,15 +133,9 @@ async def async_fetch_openrouter_models(source_filter: str | None = None) -> lis
model["id"] = model_id[len(source_prefix) :]
model_id = model["id"]
# Check if model should be excluded based on configuration
try:
excluded_ids = getattr(settings, "excluded_model_ids", [])
except Exception:
excluded_ids = []
if (
"(free)" in model.get("name", "")
or model_id in excluded_ids
or model_id in DEFAULT_EXCLUDED_MODEL_IDS
):
continue