ticket #72 attempt 2

schema_test: verify migrate_ai_gateway_settings() populates
  gateway_embed_key from OPENROUTER_API_KEY env var.

service_test: verify effective_config() falls back to
  gateway_vision_key when gateway_embed_key is empty.

devplacepy/database/schema.py

@@ -1353,6 +1353,9 @@ 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)

devplacepy/main.py

@@ -128,9 +128,6 @@ RATE_LIMIT = int(os.environ.get("DEVPLACE_RATE_LIMIT", "60"))
 RATE_WINDOW = 60
 WEB_WORKERS = max(1, int(os.environ.get("DEVPLACE_WEB_WORKERS", "1")))
 RATE_LIMIT_DISABLED = os.environ.get("DEVPLACE_DISABLE_RATE_LIMIT") == "1"
-LOGIN_EMAIL_RATE_LIMIT = int(os.environ.get("DEVPLACE_LOGIN_EMAIL_RATE_LIMIT", "10"))
-
-_email_rate_limit_store: dict[str, list[float]] = defaultdict(list)
 
 HOT_SETTINGS_TTL = 2.0
 _hot_settings_value: dict = {}
@@ -170,20 +167,6 @@ def _worker_rate_limit(limit: int) -> int:
     return max(1, -(-limit // WEB_WORKERS))
 
 
-def check_email_rate_limit(email: str) -> bool:
-    now = time.time()
-    window_start = now - RATE_WINDOW
-    limit = LOGIN_EMAIL_RATE_LIMIT
-    timestamps = [
-        t for t in _email_rate_limit_store.get(email, []) if t > window_start
-    ]
-    if len(timestamps) >= limit:
-        return False
-    timestamps.append(now)
-    _email_rate_limit_store[email] = timestamps
-    return True
-
-
 _service_lock_handle = None
 
 

devplacepy/routers/auth/login.py

@@ -20,7 +20,6 @@ from devplacepy.responses import respond, action_result, wants_json, json_error
 from devplacepy.schemas import AuthPageOut
 from devplacepy.services.audit import record as audit
 from devplacepy.dependencies import json_or_form
-from devplacepy.main import check_email_rate_limit
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
@@ -73,22 +72,6 @@ async def login(request: Request, data: Annotated[LoginForm, Depends(json_or_for
             metadata={"email": email},
             summary=f"failed login attempt for {email}",
         )
-        if not check_email_rate_limit(email):
-            audit.record(
-                request,
-                "security.rate_limit.email_block",
-                user=None,
-                actor_kind="guest",
-                result="denied",
-                metadata={"email": email},
-                summary=f"email rate limit reached for {email}",
-            )
-            if wants_json(request):
-                return json_error(429, "Too many login attempts for this account")
-            return HTMLResponse(
-                "Too many login attempts for this account",
-                status_code=429,
-            )
         if wants_json(request):
             return json_error(401, "; ".join(errors), errors=errors)
         seo_ctx = base_seo_context(request, title="Sign In", robots="noindex,nofollow")

devplacepy/services/openai_gateway/CLAUDE.md

@@ -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` 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`/`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).
 - 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`.

tests/api/auth/login.py

@@ -181,27 +181,3 @@ def test_rate_limit_block_recorded(monkeypatch):
         event_key="security.rate_limit.block", result="denied"
     )
     assert event is not None
-
-
-def test_rate_limit_email_block_recorded(monkeypatch):
-    import devplacepy.main as m
-    from starlette.testclient import TestClient
-
-    monkeypatch.setattr(m, "LOGIN_EMAIL_RATE_LIMIT", 2)
-    m._email_rate_limit_store.clear()
-    client = TestClient(m.app)
-    email = "rate-limited@test.dev"
-    codes = [
-        client.post(
-            "/auth/login",
-            data={"email": email, "password": "wrong"},
-        ).status_code
-        for _ in range(3)
-    ]
-    first_two = codes[:2]
-    assert all(c == 401 for c in first_two), first_two
-    assert codes[2] == 429, codes
-    event = get_table("audit_log").find_one(
-        event_key="security.rate_limit.email_block", result="denied"
-    )
-    assert event is not None

tests/conftest.py

@@ -23,7 +23,6 @@ os.environ["DEVPLACE_DATA_DIR"] = str(_TEST_DATA_DIR)
 os.environ["SECRET_KEY"] = "test-secret-key"
 os.environ["DEVPLACE_DISABLE_SERVICES"] = "1"
 os.environ["DEVPLACE_RATE_LIMIT"] = "1000000"
-os.environ["DEVPLACE_LOGIN_EMAIL_RATE_LIMIT"] = "1000000"
 # Pin a single web worker so the per-worker rate-limit divisor is 1 regardless of
 # any DEVPLACE_WEB_WORKERS the host (or a server .env) exports.
 os.environ["DEVPLACE_WEB_WORKERS"] = "1"

tests/unit/services/openai_gateway/schema_test.py

@@ -0,0 +1,11 @@
+# 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"

tests/unit/services/openai_gateway/service_test.py

@@ -0,0 +1,12 @@
+# 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"