Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1917e367e7 |
File diff suppressed because one or more lines are too long
@@ -1353,9 +1353,6 @@ def migrate_ai_gateway_settings() -> None:
|
||||
if not get_setting("gateway_vision_key", "") and openrouter:
|
||||
set_setting("gateway_vision_key", openrouter)
|
||||
logger.info("Migrated gateway vision key from environment")
|
||||
if not get_setting("gateway_embed_key", "") and openrouter:
|
||||
set_setting("gateway_embed_key", openrouter)
|
||||
logger.info("Migrated gateway embed key from environment")
|
||||
for key in ("news_ai_url", "bot_api_url", "devii_ai_url"):
|
||||
if get_setting(key, "") == OLD_GATEWAY_URL:
|
||||
set_setting(key, INTERNAL_GATEWAY_URL)
|
||||
|
||||
@@ -76,7 +76,7 @@ The gateway is the only place that holds real provider URLs/models/keys. Every o
|
||||
- Defaults live in `config.py`: `INTERNAL_GATEWAY_URL` (`http://localhost:10500/openai/v1/chat/completions`, override with `DEVPLACE_INTERNAL_BASE_URL`) and `INTERNAL_MODEL` (`molodetz`). `news_ai_url`, `bot_api_url`, `devii_ai_url` default to `INTERNAL_GATEWAY_URL`; their model defaults to `molodetz`.
|
||||
- Each consumer's key falls back to `database.internal_gateway_key()` (reads the `gateway_internal_key` setting) when its own key field/env is unset - the provider-key fallbacks (`DEEPSEEK_API_KEY`/`OPENROUTER_API_KEY`) were removed from news and bots.
|
||||
- `gateway_force_model` (default on) and a `molodetz`/empty alias in `handle_chat` make the upstream always receive `gateway_model`, so `molodetz` is a stable generic alias.
|
||||
- `database.migrate_ai_gateway_settings()` (called at the end of `init_db()`, under the startup `init_lock`): generates `gateway_internal_key` (uuid4) if missing; migrates `DEEPSEEK_API_KEY`/`OPENROUTER_API_KEY` env into `gateway_api_key`/`gateway_vision_key`/`gateway_embed_key` when the db value is empty; and rewrites any consumer AI URL still equal to the old `openai.app.molodetz.nl` default to the gateway, plus `bot_model` `deepseek-chat` -> `molodetz` (only uncustomized values).
|
||||
- `database.migrate_ai_gateway_settings()` (called at the end of `init_db()`, under the startup `init_lock`): generates `gateway_internal_key` (uuid4) if missing; migrates `DEEPSEEK_API_KEY`/`OPENROUTER_API_KEY` env into `gateway_api_key`/`gateway_vision_key` when the db value is empty; and rewrites any consumer AI URL still equal to the old `openai.app.molodetz.nl` default to the gateway, plus `bot_model` `deepseek-chat` -> `molodetz` (only uncustomized values).
|
||||
- The gateway's `gateway_api_key`/`gateway_vision_key`/`gateway_internal_key` fields are **non-secret** so the admin services page shows the value actually in use, editable.
|
||||
- Bot LLM calls are synchronous `urllib` but already run via `asyncio.to_thread` (`bot/bot.py`), so the local round-trip never blocks the event loop.
|
||||
- Real provider keys/URLs/models live ONLY in the gateway. The gateway is `default_enabled=True`.
|
||||
|
||||
@@ -222,6 +222,8 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
max-height: calc(100vh - var(--nav-height) - 2rem);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.daily-topic-card {
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
border-radius: var(--radius-lg);
|
||||
box-shadow: var(--shadow-sm);
|
||||
padding: 1rem;
|
||||
max-height: calc(100vh - var(--nav-height) - 2rem);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.sidebar-card .sidebar-heading {
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# retoor <retoor@molodetz.nl>
|
||||
|
||||
from devplacepy.database import get_setting, set_setting
|
||||
from devplacepy.database.schema import migrate_ai_gateway_settings
|
||||
|
||||
|
||||
def test_migrate_embed_key_populates_db(local_db, monkeypatch):
|
||||
monkeypatch.setenv("OPENROUTER_API_KEY", "sk-or-v1-test-embed-key")
|
||||
set_setting("gateway_embed_key", "")
|
||||
migrate_ai_gateway_settings()
|
||||
assert get_setting("gateway_embed_key", "") == "sk-or-v1-test-embed-key"
|
||||
@@ -1,12 +0,0 @@
|
||||
# retoor <retoor@molodetz.nl>
|
||||
|
||||
from devplacepy.database import set_setting
|
||||
from devplacepy.services.openai_gateway import GatewayService
|
||||
|
||||
|
||||
def test_effective_config_fallback_embed_key(local_db):
|
||||
set_setting("gateway_embed_key", "")
|
||||
set_setting("gateway_vision_key", "sk-or-v1-vision-test-key")
|
||||
svc = GatewayService()
|
||||
cfg = svc.effective_config()
|
||||
assert cfg["gateway_embed_key"] == "sk-or-v1-vision-test-key"
|
||||
Reference in New Issue
Block a user