ticket #102 attempt 1

devplacepy/database/schema.py

@@ -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)

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

devplacepy/services/xmlrpc/__init__.py

@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+import socket
 import subprocess
 import sys
+import time
 
 from devplacepy.config import XMLRPC_BIND, XMLRPC_PORT
 from devplacepy.services.base import BaseService
@@ -25,20 +27,48 @@ class XmlrpcService(BaseService):
     def __init__(self) -> None:
         super().__init__("xmlrpc", interval_seconds=XMLRPC_INTERVAL_SECONDS)
         self._process: subprocess.Popen | None = None
+        self._last_stderr: str | None = None
 
     def _alive(self) -> bool:
         return self._process is not None and self._process.poll() is None
 
     def _spawn(self) -> None:
+        self._last_stderr = None
         self._process = subprocess.Popen(
             [sys.executable, "-m", SERVER_MODULE],
             stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
+            stderr=subprocess.PIPE,
         )
         self.log(
-            f"Forking XML-RPC server started (pid {self._process.pid}) on "
+            f"Forking XML-RPC server spawning (pid {self._process.pid}) on "
             f"{XMLRPC_BIND}:{XMLRPC_PORT}"
         )
+        time.sleep(0.5)
+        if self._process.poll() is not None:
+            stderr_data = self._process.communicate()[1]
+            if stderr_data:
+                self._last_stderr = stderr_data.decode("utf-8", errors="replace")
+            self.log(
+                f"Forking XML-RPC server died after spawn (pid {self._process.pid}, "
+                f"exit code {self._process.returncode})"
+            )
+            if self._last_stderr:
+                for line in self._last_stderr.strip().split("\n"):
+                    self.log(f"  stderr: {line}")
+            return
+        try:
+            sock = socket.create_connection((XMLRPC_BIND, XMLRPC_PORT), timeout=1)
+            sock.close()
+        except (OSError, socket.timeout):
+            self.log(
+                f"Forking XML-RPC server not yet ready (pid {self._process.pid}) "
+                f"on {XMLRPC_BIND}:{XMLRPC_PORT}"
+            )
+        else:
+            self.log(
+                f"Forking XML-RPC server started (pid {self._process.pid}) on "
+                f"{XMLRPC_BIND}:{XMLRPC_PORT}"
+            )
 
     def _terminate(self) -> None:
         if not self._alive():
@@ -65,6 +95,13 @@ class XmlrpcService(BaseService):
             self.log(f"XML-RPC server healthy (pid {self._process.pid})")
             return
         self.log("XML-RPC server not running, starting it")
+        if self._process is not None:
+            self.log(
+                f"Previous process exited with code {self._process.returncode}"
+            )
+            if self._last_stderr:
+                for line in self._last_stderr.strip().split("\n"):
+                    self.log(f"  last stderr: {line}")
         self._spawn()
 
     def collect_metrics(self) -> dict:

devplacepy/services/xmlrpc/server.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import sys
 from socketserver import ForkingMixIn
 from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
 
@@ -116,6 +117,9 @@ def main() -> None:
         server.serve_forever()
     except KeyboardInterrupt:
         logger.info("XML-RPC server interrupted")
+    except Exception:
+        logging.exception("XML-RPC server crashed with unhandled exception")
+        sys.exit(1)
     finally:
         server.server_close()
 

tests/unit/services/openai_gateway/schema_test.py

@@ -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"

tests/unit/services/openai_gateway/service_test.py

@@ -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"