forked from retoor/devplacepy
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6970f8a270 |
File diff suppressed because one or more lines are too long
@@ -18,6 +18,7 @@ NOTIFICATION_TYPES = [
|
|||||||
{"key": "reminder", "label": "Reminders", "description": "A reminder or scheduled task you asked Devii to run fires"},
|
{"key": "reminder", "label": "Reminders", "description": "A reminder or scheduled task you asked Devii to run fires"},
|
||||||
{"key": "harvest_stolen", "label": "Farm raids", "description": "Someone steals a ready build from your Code Farm"},
|
{"key": "harvest_stolen", "label": "Farm raids", "description": "Someone steals a ready build from your Code Farm"},
|
||||||
{"key": "award", "label": "Awards", "description": "Someone gives you an award on your profile"},
|
{"key": "award", "label": "Awards", "description": "Someone gives you an award on your profile"},
|
||||||
|
{"key": "admin_alert", "label": "Admin alerts", "description": "System alerts requiring admin attention"},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1353,9 +1353,6 @@ def migrate_ai_gateway_settings() -> None:
|
|||||||
if not get_setting("gateway_vision_key", "") and openrouter:
|
if not get_setting("gateway_vision_key", "") and openrouter:
|
||||||
set_setting("gateway_vision_key", openrouter)
|
set_setting("gateway_vision_key", openrouter)
|
||||||
logger.info("Migrated gateway vision key from environment")
|
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"):
|
for key in ("news_ai_url", "bot_api_url", "devii_ai_url"):
|
||||||
if get_setting(key, "") == OLD_GATEWAY_URL:
|
if get_setting(key, "") == OLD_GATEWAY_URL:
|
||||||
set_setting(key, INTERNAL_GATEWAY_URL)
|
set_setting(key, INTERNAL_GATEWAY_URL)
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ from devplacepy.utils import (
|
|||||||
require_user,
|
require_user,
|
||||||
)
|
)
|
||||||
from devplacepy.services.audit import record as audit
|
from devplacepy.services.audit import record as audit
|
||||||
|
from devplacepy.services.devii.quota import notify_admins_quota_blocked
|
||||||
|
|
||||||
logger = logging.getLogger("devii.router")
|
logger = logging.getLogger("devii.router")
|
||||||
|
|
||||||
@@ -279,6 +280,7 @@ async def devii_ws(websocket: WebSocket):
|
|||||||
summary=f"AI request by {username or owner_id} blocked - 24h quota reached",
|
summary=f"AI request by {username or owner_id} blocked - 24h quota reached",
|
||||||
metadata={"limit_usd": limit, "owner_kind": owner_kind},
|
metadata={"limit_usd": limit, "owner_kind": owner_kind},
|
||||||
)
|
)
|
||||||
|
notify_admins_quota_blocked(owner_kind, owner_id, username)
|
||||||
await websocket.send_json(
|
await websocket.send_json(
|
||||||
{
|
{
|
||||||
"type": "error",
|
"type": "error",
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# retoor <retoor@molodetz.nl>
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from devplacepy.database import get_table
|
||||||
|
from devplacepy.utils.notifications import create_notification
|
||||||
|
|
||||||
|
logger = logging.getLogger("devii.quota")
|
||||||
|
|
||||||
|
ADMIN_ALERT_TYPE = "admin_alert"
|
||||||
|
|
||||||
|
|
||||||
|
def notify_admins_quota_blocked(owner_kind: str, owner_id: str, username: str) -> None:
|
||||||
|
if owner_kind != "user":
|
||||||
|
return
|
||||||
|
admins = get_table("users").find(role="Admin")
|
||||||
|
for admin in admins:
|
||||||
|
if admin["uid"] == owner_id:
|
||||||
|
continue
|
||||||
|
create_notification(
|
||||||
|
admin["uid"],
|
||||||
|
ADMIN_ALERT_TYPE,
|
||||||
|
f"User {username} blocked - 24h AI quota reached",
|
||||||
|
owner_id,
|
||||||
|
"/admin/users",
|
||||||
|
)
|
||||||
@@ -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`.
|
- 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.
|
- 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.
|
- `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.
|
- 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.
|
- 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`.
|
- Real provider keys/URLs/models live ONLY in the gateway. The gateway is `default_enabled=True`.
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ from typing import Any
|
|||||||
|
|
||||||
from devplacepy.database import get_table
|
from devplacepy.database import get_table
|
||||||
from devplacepy.services.audit import record as audit
|
from devplacepy.services.audit import record as audit
|
||||||
|
from devplacepy.services.devii.quota import notify_admins_quota_blocked
|
||||||
from devplacepy.services.manager import service_manager
|
from devplacepy.services.manager import service_manager
|
||||||
from devplacepy.utils import is_admin, is_primary_admin
|
from devplacepy.utils import is_admin, is_primary_admin
|
||||||
|
|
||||||
@@ -400,6 +401,7 @@ class TelegramBridge:
|
|||||||
summary=f"Telegram AI request by {user.get('username', owner_id)} blocked - 24h quota reached",
|
summary=f"Telegram AI request by {user.get('username', owner_id)} blocked - 24h quota reached",
|
||||||
metadata={"limit_usd": limit},
|
metadata={"limit_usd": limit},
|
||||||
)
|
)
|
||||||
|
notify_admins_quota_blocked("user", owner_id, user.get("username", ""))
|
||||||
await self._service.send(
|
await self._service.send(
|
||||||
chat_id, "Your daily AI quota is reached (100%). Please try again later."
|
chat_id, "Your daily AI quota is reached (100%). Please try again later."
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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