Compare commits

..
Author SHA1 Message Date
Typosaurus 3e12f9b27f ticket #57 attempt 1 2026-07-19 20:05:09 +00:00
13 changed files with 109 additions and 28 deletions
File diff suppressed because one or more lines are too long
-3
View File
@@ -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)
+1 -1
View File
@@ -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`.
+42
View File
@@ -8,6 +8,11 @@ export class CommentManager {
this.initCommentReply();
this.initCommentEdit();
this.initCommentDelete();
document.addEventListener("paste", (event) => {
const textarea = event.target.closest("form textarea[name='body'], form textarea[name='content']");
if (!textarea) return;
this._onPaste(event, textarea);
});
}
initCommentDelete() {
@@ -208,4 +213,41 @@ export class CommentManager {
if (btn) btn.disabled = true;
});
}
_onPaste(event, textarea) {
const items = event.clipboardData?.items;
if (!items) return;
for (const item of items) {
if (item.kind === "file" && item.type.startsWith("image/")) {
event.preventDefault();
const file = item.getAsFile();
const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
this._uploadImage(namedFile, textarea);
break;
}
}
}
async _uploadImage(file, textarea) {
const formData = new FormData();
formData.append("file", file, file.name);
try {
const response = await fetch("/uploads/upload", {
method: "POST",
headers: {
"Accept": "application/json",
"X-Requested-With": "fetch",
},
body: formData,
});
if (!response.ok) {
const data = await response.json().catch(() => ({}));
throw new Error(data.error || `Upload failed (${response.status})`);
}
const result = await response.json();
window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
} catch (err) {
Http.notifyError(err.message);
}
}
}
+42
View File
@@ -12,6 +12,48 @@ export class IssueReporter {
event.preventDefault();
this.submit(form);
});
document.addEventListener("paste", (event) => {
const textarea = event.target.closest("form[data-issue-create] [name='description']");
if (!textarea) return;
this._onPaste(event, textarea);
});
}
_onPaste(event, textarea) {
const items = event.clipboardData?.items;
if (!items) return;
for (const item of items) {
if (item.kind === "file" && item.type.startsWith("image/")) {
event.preventDefault();
const file = item.getAsFile();
const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
this._uploadImage(namedFile, textarea);
break;
}
}
}
async _uploadImage(file, textarea) {
const formData = new FormData();
formData.append("file", file, file.name);
try {
const response = await fetch("/uploads/upload", {
method: "POST",
headers: {
"Accept": "application/json",
"X-Requested-With": "fetch",
},
body: formData,
});
if (!response.ok) {
const data = await response.json().catch(() => ({}));
throw new Error(data.error || `Upload failed (${response.status})`);
}
const result = await response.json();
window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
} catch (err) {
Http.notifyError(err.message);
}
}
async submit(form) {
+14
View File
@@ -240,3 +240,17 @@ def test_delete_own_allowed_other_user_forbidden(app_server):
bob = _session_uploads()
assert bob.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 403
assert alice.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 200
def test_paste_image_upload_returns_url(app_server):
s = _session_uploads()
r = s.post(
f"{BASE_URL}/uploads/upload",
files={"file": ("clipboard.png", _png_bytes_uploads(), "image/png")},
)
assert r.status_code == 201, r.text
data = r.json()
assert "url" in data
assert data["url"].startswith("/static/uploads/attachments/")
assert data["uid"]
assert data["is_image"] is True
@@ -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"
+1
View File
@@ -0,0 +1 @@
python3
+1
View File
@@ -0,0 +1 @@
/usr/bin/python3
+1
View File
@@ -0,0 +1 @@
python3
Symlink
+1
View File
@@ -0,0 +1 @@
lib
+5
View File
@@ -0,0 +1,5 @@
home = /usr/bin
include-system-site-packages = false
version = 3.11.2
executable = /usr/bin/python3.11
command = /usr/bin/python3 -m venv /workspace/repo/venv