chore: pre-phase-1 cleanup - OpenRouter config fallback and PLAN.md

This commit is contained in:
Your Name
2026-03-14 22:37:36 +02:00
parent 2b3367cdea
commit 3217681108
7 changed files with 138 additions and 17 deletions

View File

@@ -2,10 +2,11 @@
from dataclasses import dataclass
import os
from dotenv import dotenv_values
from flask import current_app, has_app_context
DEFAULT_OPENROUTER_MODEL = "stepfun/step-3.5-flash:free"
DEFAULT_OPENROUTER_MODEL = "nvidia/nemotron-3-super-120b-a12b:free"
DEFAULT_OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1/chat/completions"
@@ -16,22 +17,71 @@ class OpenRouterSettings:
base_url: str
def _load_dotenv_settings() -> dict[str, str]:
"""Read .env values directly so workers can recover from blank in-app config."""
service_dir = os.path.abspath(os.path.dirname(__file__))
backend_dir = os.path.abspath(os.path.join(service_dir, "..", ".."))
repo_root = os.path.abspath(os.path.join(backend_dir, ".."))
settings: dict[str, str] = {}
for env_path in (os.path.join(repo_root, ".env"), os.path.join(backend_dir, ".env")):
if not os.path.exists(env_path):
continue
for key, value in dotenv_values(env_path).items():
if value is not None:
settings[key] = value.strip()
return settings
def _first_non_empty(*values: str, default: str = "") -> str:
"""Return the first non-empty string value, or the provided default."""
for value in values:
normalized = str(value or "").strip()
if normalized:
return normalized
return default
def get_openrouter_settings() -> OpenRouterSettings:
"""Return the effective OpenRouter settings for the current execution context."""
dotenv_settings = _load_dotenv_settings()
env_api_key = os.getenv("OPENROUTER_API_KEY", "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")
env_model = os.getenv("OPENROUTER_MODEL", DEFAULT_OPENROUTER_MODEL)
env_base_url = os.getenv("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL)
if has_app_context():
api_key = str(current_app.config.get("OPENROUTER_API_KEY", "")).strip()
model = str(
current_app.config.get("OPENROUTER_MODEL", DEFAULT_OPENROUTER_MODEL)
).strip() or DEFAULT_OPENROUTER_MODEL
base_url = str(
current_app.config.get("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL)
).strip() or DEFAULT_OPENROUTER_BASE_URL
api_key = _first_non_empty(
current_app.config.get("OPENROUTER_API_KEY", "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"),
env_api_key,
dotenv_settings.get("OPENROUTER_API_KEY", "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"),
)
model = _first_non_empty(
current_app.config.get("OPENROUTER_MODEL", DEFAULT_OPENROUTER_MODEL),
env_model,
dotenv_settings.get("OPENROUTER_MODEL", DEFAULT_OPENROUTER_MODEL),
default=DEFAULT_OPENROUTER_MODEL,
)
base_url = _first_non_empty(
current_app.config.get("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL),
env_base_url,
dotenv_settings.get("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL),
default=DEFAULT_OPENROUTER_BASE_URL,
)
return OpenRouterSettings(api_key=api_key, model=model, base_url=base_url)
return OpenRouterSettings(
api_key=os.getenv("OPENROUTER_API_KEY", "").strip(),
model=os.getenv("OPENROUTER_MODEL", DEFAULT_OPENROUTER_MODEL).strip()
or DEFAULT_OPENROUTER_MODEL,
base_url=os.getenv("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL).strip()
or DEFAULT_OPENROUTER_BASE_URL,
api_key=_first_non_empty(
env_api_key,
dotenv_settings.get("OPENROUTER_API_KEY", ""),
),
model=_first_non_empty(
env_model,
dotenv_settings.get("OPENROUTER_MODEL", DEFAULT_OPENROUTER_MODEL),
default=DEFAULT_OPENROUTER_MODEL,
),
base_url=_first_non_empty(
env_base_url,
dotenv_settings.get("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL),
default=DEFAULT_OPENROUTER_BASE_URL,
),
)