Jaroslav Beneš
1d3f6c450b
Four features, plus the schema machinery they needed. **Schema sync.** The first live instance had data in it, and create_all only creates missing *tables* -- a new column silently never appeared. db/migrations.py now diffs the declared models against the database and ALTER TABLE ... ADD COLUMN for what is missing, deriving a backfill default from the column type (SQLite refuses a NOT NULL column without one, and a Python-side `default=dict` cannot be expressed in DDL). Verified against a copy of the live database: eight changes applied, all rows preserved, second run a no-op. Renames, drops and retypes are still manual and say so. **Permissions.** A flat set of named booleans: an instance baseline widened by each group the user belongs to. A group grants and never denies -- with denies, "why can this user not do X" cannot be answered without simulating every group. Admins bypass entirely, because an admin can grant it back to themselves in two clicks and pretending otherwise is theatre. Model *access* is separate: public, or granted to groups. The picker is not the boundary -- switching a chat to a model you cannot reach is a 403. **Model settings.** Ordering, pinned-first, an instance default and a per-user default, display names, descriptions, capability flags, and uploaded images. Images are stored and served locally rather than by URL: a remote URL makes every page render a request to a third party. Uploads are validated by magic number, not the declared content type, and stored under a random name. Models with no image get a generated initial whose hue is derived from the model id, so it is stable. **Reasoning display.** Streams into its own collapsible block above the answer, labelled "Thought for 14 seconds", collapsed once finished, and never replayed as context on the next turn. Two sources: the reasoning_content delta field, and <think> tags inline in content -- the latter needs a streaming splitter because the tags arrive split across chunks. Models emitting no reasoning show nothing, via a :has() rule rather than JavaScript. Verified against qwen35-9b on llama-swap: 694 reasoning events, 52 answer tokens, cleanly separated. Two bugs found and fixed while testing: - A bare `Mapped[list]` relationship is treated by SQLAlchemy as a scalar and returns None instead of []. It needs the element type. - FastAPI substitutes the default for an empty form value, so with `x: str | None = Form(None)` a submitted `x=` is indistinguishable from an absent field. That silently broke clearing a system prompt or a temperature. update_chat now reads the raw form and checks key presence. 143 tests, ruff clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
79 lines
2.4 KiB
Python
79 lines
2.4 KiB
Python
"""Jinja environment and the context every template receives."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from fastapi import Request
|
|
from fastapi.templating import Jinja2Templates
|
|
|
|
from lembas import __version__
|
|
from lembas.config import settings
|
|
from lembas.db.models import User
|
|
from lembas.services.reasoning import format_duration
|
|
|
|
TEMPLATE_DIR = Path(__file__).parent / "templates"
|
|
STATIC_DIR = Path(__file__).parent / "static"
|
|
|
|
templates = Jinja2Templates(directory=str(TEMPLATE_DIR))
|
|
templates.env.trim_blocks = True
|
|
templates.env.lstrip_blocks = True
|
|
|
|
# {{ message.reasoning_ms | duration }} -> "8 seconds"
|
|
templates.env.filters["duration"] = format_duration
|
|
|
|
|
|
def stable_hue(value: str) -> int:
|
|
"""A deterministic 0-359 hue for a string.
|
|
|
|
Used for generated model avatars so each model gets its own colour without
|
|
anyone choosing one, and the same model looks the same on every page and
|
|
after every restart. Python's hash() is salted per process, hence md5.
|
|
"""
|
|
import hashlib
|
|
|
|
digest = hashlib.md5(value.encode("utf-8"), usedforsecurity=False).digest()
|
|
return int.from_bytes(digest[:2], "big") % 360
|
|
|
|
|
|
templates.env.filters["stable_hue"] = stable_hue
|
|
|
|
|
|
def resolve_theme(user: User | None) -> str:
|
|
"""Theme to render with on the server.
|
|
|
|
Only ever a first guess: the inline script in base.html corrects it from
|
|
localStorage before first paint. Getting it close server-side is what stops
|
|
a signed-in user seeing a flash of the wrong theme on every navigation.
|
|
"""
|
|
if user is not None:
|
|
chosen = (user.settings_json or {}).get("theme")
|
|
if chosen in ("moria", "shire"):
|
|
return chosen
|
|
return settings.default_theme
|
|
|
|
|
|
def render(
|
|
request: Request,
|
|
template: str,
|
|
context: dict[str, Any] | None = None,
|
|
**kwargs: Any,
|
|
):
|
|
"""Render a template with the globals every page expects.
|
|
|
|
Using this instead of templates.TemplateResponse directly is what
|
|
guarantees `user` and `theme` are always defined, so templates never need
|
|
to guard against a missing variable.
|
|
"""
|
|
user = getattr(request.state, "user", None)
|
|
payload: dict[str, Any] = {
|
|
"request": request,
|
|
"user": user,
|
|
"theme": resolve_theme(user),
|
|
"version": __version__,
|
|
"allow_signup": settings.allow_signup,
|
|
}
|
|
payload.update(context or {})
|
|
return templates.TemplateResponse(request, template, payload, **kwargs)
|