The sidebar was a 280px panel laid over the page below the phone breakpoint, opened from first paint, with the only control that closed it underneath it -- and that control existed on /chat and on none of the seven other pages carrying a sidebar, Settings included. It starts closed at that width now, slides, dims the page behind it, and closes by tapping beside it, by Escape, or by its own button, which is inside the drawer where it can be reached. Everything a finger has to hit was 36px, or 28 for renaming a chat, every action on a message and every panel's close button. Raising --control-h under a coarse pointer is the only fix that reaches all forty of them, which is what that token is for. The row and message actions were also hover-only, so on a phone they did not exist at all. Installing: the splash and the browser chrome follow the instance's theme rather than always being Moria's near-black; there are screenshots, so the install offer is a dialog rather than a one-line bar; a new release no longer takes over a page somebody is reading; the notification badge is a silhouette rather than a grey square; and a browser rotating its own subscription no longer ends notifications for good. Every request now says it is happening -- nothing did before, so anything slower than a few milliseconds looked like a click that had not registered. A chat can be archived. The column has been filtered on in four places since folders arrived and written by nothing, which is what made it look built. chat.css may contain media queries. The ban protected the composer toolbar from being "fixed" with a breakpoint; that guarantee is asserted directly now, and the old test would have passed a version of the file that wrapped the toolbar without one. scripts/shoot.py is the instrument all of this was found with: it renders a page through TestClient into a real headless browser at a real size and refuses to run if an asset URL was left pointing at testserver. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
285 lines
10 KiB
Python
285 lines
10 KiB
Python
"""Administration: OpenAI-compatible connections and their models."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import re
|
|
from datetime import UTC, datetime
|
|
|
|
from fastapi import APIRouter, Form, HTTPException, Request, Response, status
|
|
from fastapi.responses import RedirectResponse
|
|
from sqlalchemy import func, select
|
|
from sqlalchemy.orm import Session as DBSession
|
|
|
|
from lembas.api.deps import AdminUser, Db
|
|
from lembas.db.models import Connection, Model, User
|
|
from lembas.services import settings_store
|
|
from lembas.services.crypto import UNCHANGED_SENTINEL, decrypt, encrypt, mask
|
|
from lembas.services.llm.openai_client import Endpoint, LLMError, context_from, list_models
|
|
from lembas.web.templating import render
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
router = APIRouter(prefix="/admin", tags=["admin"])
|
|
|
|
|
|
def _connection(db: DBSession, connection_id: str) -> Connection:
|
|
connection = db.get(Connection, connection_id)
|
|
if connection is None:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, "That connection no longer exists.")
|
|
return connection
|
|
|
|
|
|
def _connections(db: DBSession) -> list[Connection]:
|
|
return list(db.scalars(select(Connection).order_by(Connection.position, Connection.name)))
|
|
|
|
|
|
@router.get("")
|
|
async def admin_home(user: AdminUser):
|
|
return RedirectResponse("/admin/general", status_code=status.HTTP_303_SEE_OTHER)
|
|
|
|
|
|
@router.get("/general")
|
|
async def general_page(request: Request, db: Db, user: AdminUser, saved: bool = False):
|
|
return render(
|
|
request,
|
|
"admin/general.html",
|
|
{
|
|
"values": settings_store.get_group(db),
|
|
"saved": saved,
|
|
"user_count": db.scalar(select(func.count()).select_from(User)),
|
|
},
|
|
)
|
|
|
|
|
|
@router.post("/general")
|
|
async def save_general(
|
|
db: Db,
|
|
user: AdminUser,
|
|
allow_signup: bool = Form(False),
|
|
system_prompt: str = Form(""),
|
|
compact_threshold: int = Form(95),
|
|
max_chat_rounds: int = Form(5),
|
|
) -> Response:
|
|
"""Save instance settings.
|
|
|
|
Unchecked checkboxes are simply absent from a form post, which is why
|
|
allow_signup defaults to False here -- that absence *is* the "off" signal.
|
|
"""
|
|
settings_store.update(
|
|
db,
|
|
{
|
|
"allow_signup": allow_signup,
|
|
"system_prompt": system_prompt.strip()[:8000],
|
|
# 0 is "never"; anything else is clamped into a band where it can
|
|
# do some good. 100 is useless -- you cannot compact after
|
|
# overflowing -- and below 50 it fires while there is plenty left.
|
|
"compact_threshold": (
|
|
0 if compact_threshold <= 0 else min(max(compact_threshold, 50), 99)
|
|
),
|
|
# Floor of 0, not 1: zero is how "no ceiling" is said, and the loop
|
|
# falls back to a runaway backstop rather than to this number.
|
|
"max_chat_rounds": min(max(max_chat_rounds, 0), 100),
|
|
},
|
|
)
|
|
log.info("registration %s by %s", "opened" if allow_signup else "closed", user.email)
|
|
return RedirectResponse("/admin/general?saved=1", status_code=status.HTTP_303_SEE_OTHER)
|
|
|
|
|
|
@router.get("/connections")
|
|
async def connections_page(request: Request, db: Db, user: AdminUser, message: str = ""):
|
|
connections = _connections(db)
|
|
return render(
|
|
request,
|
|
"admin/connections.html",
|
|
{
|
|
"connections": connections,
|
|
"masked": {c.id: mask(decrypt(c.api_key_encrypted)) for c in connections},
|
|
"model_counts": {
|
|
c.id: sum(1 for m in c.models if m.enabled) for c in connections
|
|
},
|
|
"message": message,
|
|
"unchanged": UNCHANGED_SENTINEL,
|
|
},
|
|
)
|
|
|
|
|
|
# Header names are a narrow set on purpose: a newline would let one field write
|
|
# a second header, and a colon in a name splits it. Anything outside it is
|
|
# dropped rather than repaired -- a header nobody can see the effect of is worse
|
|
# than one that is visibly missing.
|
|
_HEADER_NAME = re.compile(r"^[A-Za-z0-9!#$%&'*+.^_`|~-]{1,64}$")
|
|
|
|
|
|
def _parse_headers(raw: str) -> dict[str, str]:
|
|
"""`Name: value` per line, into the dict the client sends verbatim."""
|
|
headers: dict[str, str] = {}
|
|
for line in (raw or "").splitlines()[:20]:
|
|
name, _, value = line.partition(":")
|
|
name = name.strip()
|
|
value = value.strip()[:500]
|
|
if name and value and _HEADER_NAME.match(name):
|
|
headers[name] = value
|
|
return headers
|
|
|
|
|
|
@router.post("/connections")
|
|
async def create_connection(
|
|
db: Db,
|
|
user: AdminUser,
|
|
name: str = Form(...),
|
|
base_url: str = Form(...),
|
|
api_key: str = Form(""),
|
|
) -> Response:
|
|
base_url = base_url.strip().rstrip("/")
|
|
if not base_url.startswith(("http://", "https://")):
|
|
raise HTTPException(
|
|
status.HTTP_400_BAD_REQUEST,
|
|
"The base URL must start with http:// or https://",
|
|
)
|
|
|
|
position = db.scalar(select(func.coalesce(func.max(Connection.position), -1))) + 1
|
|
connection = Connection(
|
|
name=name.strip()[:120] or "Connection",
|
|
base_url=base_url,
|
|
api_key_encrypted=encrypt(api_key.strip()),
|
|
position=position,
|
|
)
|
|
db.add(connection)
|
|
db.commit()
|
|
|
|
# Discover models immediately: a connection that lists nothing is
|
|
# indistinguishable from a broken one, and finding out now is the point.
|
|
await _refresh_models(db, connection)
|
|
return RedirectResponse("/admin/connections", status_code=status.HTTP_303_SEE_OTHER)
|
|
|
|
|
|
@router.post("/connections/{connection_id}")
|
|
async def update_connection(
|
|
db: Db,
|
|
user: AdminUser,
|
|
connection_id: str,
|
|
name: str = Form(...),
|
|
base_url: str = Form(...),
|
|
api_key: str = Form(""),
|
|
enabled: bool = Form(False),
|
|
unload_url: str = Form(""),
|
|
unload_method: str = Form("POST"),
|
|
extra_headers: str = Form(""),
|
|
) -> Response:
|
|
connection = _connection(db, connection_id)
|
|
connection.name = name.strip()[:120] or connection.name
|
|
connection.base_url = base_url.strip().rstrip("/")
|
|
connection.enabled = enabled
|
|
# How to ask this endpoint to drop its model, for image generation's
|
|
# Preserve VRAM. Empty means it cannot be unloaded, which is the honest
|
|
# answer for anything not running on the machine ComfyUI is on.
|
|
connection.unload_url = unload_url.strip()[:500]
|
|
method = unload_method.strip().upper()
|
|
connection.unload_method = method if method in ("GET", "POST") else "POST"
|
|
|
|
# `extra_headers_json` has been sent with every request to this endpoint
|
|
# since it was added and written by no form in the application, so its one
|
|
# documented use -- OpenRouter wants an `HTTP-Referer` and an `X-Title` --
|
|
# was unreachable. One `Name: value` per line, because a JSON textarea asks
|
|
# somebody to get braces right in a settings screen.
|
|
connection.extra_headers_json = _parse_headers(extra_headers)
|
|
|
|
submitted = api_key.strip()
|
|
if submitted and submitted != UNCHANGED_SENTINEL:
|
|
connection.api_key_encrypted = encrypt(submitted)
|
|
elif not submitted:
|
|
# An explicitly emptied field means "this endpoint needs no key".
|
|
connection.api_key_encrypted = ""
|
|
|
|
db.commit()
|
|
return RedirectResponse("/admin/connections", status_code=status.HTTP_303_SEE_OTHER)
|
|
|
|
|
|
@router.post("/connections/{connection_id}/test")
|
|
async def test_connection(
|
|
request: Request, db: Db, user: AdminUser, connection_id: str
|
|
) -> Response:
|
|
"""Contact the endpoint and refresh its model list."""
|
|
connection = _connection(db, connection_id)
|
|
count, error = await _refresh_models(db, connection)
|
|
|
|
message = (
|
|
f"{connection.name}: {error}"
|
|
if error
|
|
else f"{connection.name}: found {count} model{'s' if count != 1 else ''}."
|
|
)
|
|
return render(
|
|
request,
|
|
"admin/_connection_row.html",
|
|
{
|
|
"connection": connection,
|
|
"masked": mask(decrypt(connection.api_key_encrypted)),
|
|
"message": message,
|
|
"message_kind": "error" if error else "success",
|
|
"unchanged": UNCHANGED_SENTINEL,
|
|
},
|
|
)
|
|
|
|
|
|
async def _refresh_models(db: DBSession, connection: Connection) -> tuple[int, str]:
|
|
"""Sync the cached model list. Returns (count, error message)."""
|
|
try:
|
|
discovered = await list_models(Endpoint.from_connection(connection))
|
|
except LLMError as exc:
|
|
connection.last_error = exc.message
|
|
connection.last_checked_at = datetime.now(UTC)
|
|
db.commit()
|
|
return 0, exc.message
|
|
|
|
existing = {model.model_id: model for model in connection.models}
|
|
seen: set[str] = set()
|
|
|
|
# New models land after everything already ordered, rather than all at
|
|
# position 0 where they would sort by id and shuffle the existing list.
|
|
# No `or -1` after the coalesce: position 0 is falsy, so that idiom sent the
|
|
# second discovered model back to 0 on top of the first.
|
|
highest = db.scalar(select(func.coalesce(func.max(Model.position), -1)))
|
|
next_position = int(highest if highest is not None else -1) + 1
|
|
|
|
for entry in discovered:
|
|
model_id = str(entry["id"])[:300]
|
|
seen.add(model_id)
|
|
if model_id in existing:
|
|
# A context length is filled in only when nobody has one yet. A
|
|
# refresh must never overwrite a number an administrator typed --
|
|
# they are usually correcting the endpoint.
|
|
model = existing[model_id]
|
|
if not model.context_length:
|
|
model.context_length = context_from(entry)
|
|
continue
|
|
db.add(
|
|
Model(
|
|
connection_id=connection.id,
|
|
model_id=model_id,
|
|
position=next_position,
|
|
context_length=context_from(entry),
|
|
)
|
|
)
|
|
next_position += 1
|
|
|
|
# Models that vanished upstream are dropped, so the picker never offers
|
|
# something the endpoint will reject.
|
|
for model_id, model in existing.items():
|
|
if model_id not in seen:
|
|
db.delete(model)
|
|
|
|
connection.last_error = ""
|
|
connection.last_checked_at = datetime.now(UTC)
|
|
db.commit()
|
|
log.info("connection %s: %d models", connection.name, len(seen))
|
|
return len(seen), ""
|
|
|
|
|
|
@router.post("/connections/{connection_id}/delete")
|
|
async def delete_connection(db: Db, user: AdminUser, connection_id: str) -> Response:
|
|
connection = _connection(db, connection_id)
|
|
db.delete(connection)
|
|
db.commit()
|
|
return RedirectResponse("/admin/connections", status_code=status.HTTP_303_SEE_OTHER)
|