All verification is complete. Final report: **Phase 93 — Theme semantic completion: FINAL VERIFICATION PASS — ALL GREEN** - Verified full implementation in tree: migration `0016` (8 nullable semantic columns, applied at head), 17-var `BUILTIN_COLORS`/`COLOR_FIELDS`/`effective_settings`, API validation, `#view-theme` State-colors fieldset (17 pickers), `theme.js` FIELDS/PAIRS (5→8), `.page-head` surface panel (6 shell views + doc-edit + shared.html; login card / document sticky header audited as already-surfaced), mock_llm `content: None` fix - Fixed 2 pre-existing defects (both fail identically on baseline `d4f38ad`, proven via worktree A/B): `test_nav_rename_sources` — expected nav tail missing the phase-91 "Theme" link; `test_stale_ui_copy` — now truncates `saved_chats` before/after (house `test_suggestion_chips` pattern) so the seed-chip contract is deterministic on the shared dev DB (owner's 22 saved chats triggered phase-80 last-3-questions) - Tests: `uv run pytest --cov=app --cov-report=term-missing` → **1868 passed, app/ 99%** (>90% ✓); `uv run ruff check .` → clean; `uv run pyright` → **0 errors** - E2E: dedicated `uv run pytest tests/e2e/test_theme_semantic_completion.py -v --no-cov` → **8/8 in isolation** (all-gray 17-color theme: zero residual color on saved-result/Stale/Revoked/Local/tool-call elements, text labels intact, gray heads non-transparent, pre-paint tag, Reset → byte-identical no-tag); 15 theme/header/nav/responsive suites green in isolation; full 85-file combined run: only the 2 fixed pre-existing failures + 1 combined-run artifact (`test_sync_upload_progress`, green in isolation) - Completion criteria: (1) monochrome E2E ✓ (2) default byte-identical, no `#bor-theme` tag ✓ (3) all page heads on solid surface ✓ (4) suite/coverage/lint/E2E green ✓ (5) phases 01–92 no behavior change ✓ (6) commit left to harness per protocol - Notable: cleaned stray uvicorn leftovers from prior implementation pass (owner's `--reload` dev server untouched); no deviations from the phase design - Next pending phase: `94_ls_tree_drilldown`
278 lines
12 KiB
Python
278 lines
12 KiB
Python
"""Integration: the admin UI-settings gate + the /api/config effective
|
|
strings (phase 91, task 01).
|
|
|
|
The auth + public-contract half of task 01, driven through the real app
|
|
(TestClient keeps the cookie jar — the house ``test_auth_api`` /
|
|
``test_tokens_api`` admin-login pattern):
|
|
|
|
* the admin gate — ``GET /api/ui-settings`` and ``PUT`` are 403
|
|
``admin only`` for anonymous callers AND for a signed-in token USER
|
|
(role ``"user"`` — the router-wide ``require_admin`` closes the
|
|
surface on every method, the phase-79 token matrix contract), 200 for
|
|
the admin on both;
|
|
* ``/api/config`` effective strings (B1: DB-over-env) — an env-only
|
|
deployment (no ``ui_settings`` row) returns the env strings; after an
|
|
admin PUT, the ANONYMOUS ``/api/config`` returns the DB strings;
|
|
* the five-key /api/config contract: the retired CSS-file theming's
|
|
``theme`` key is GONE (task 03) — the app metadata, the docs flag,
|
|
and the two effective strings are the entire response.
|
|
|
|
Real Postgres (``podman compose up -d db``); no LLM involved.
|
|
|
|
Requires: podman compose up -d db
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from collections.abc import Iterator
|
|
|
|
import pytest
|
|
from fastapi.testclient import TestClient
|
|
from sqlalchemy import select, text
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.config import get_settings
|
|
from app.core import theming
|
|
from app.main import app as fastapi_app
|
|
from app.models import UiSettings
|
|
from tests.conftest import ADMIN_PASSWORD
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def clean_state(db: Session) -> Iterator[None]:
|
|
"""Both touched tables are global state: the single ui_settings row
|
|
and the api_tokens the token-user test creates (the house
|
|
TRUNCATE/DELETE reset pattern)."""
|
|
db.execute(text("DELETE FROM ui_settings"))
|
|
db.execute(text("TRUNCATE api_tokens"))
|
|
db.commit()
|
|
yield
|
|
db.execute(text("DELETE FROM ui_settings"))
|
|
db.execute(text("TRUNCATE api_tokens"))
|
|
db.commit()
|
|
|
|
|
|
def _admin_client() -> TestClient:
|
|
"""A fresh client signed in as the admin (the ``_admin_client``
|
|
pattern from test_auth_api.py)."""
|
|
c = TestClient(fastapi_app)
|
|
r = c.post("/api/login", json={"password": ADMIN_PASSWORD})
|
|
assert r.status_code == 204, f"admin login failed: {r.status_code} {r.text}"
|
|
return c
|
|
|
|
|
|
def test_anonymous_get_and_put_403(client: TestClient) -> None:
|
|
"""Router-level ``require_admin``: both routes are 403 ``admin only``
|
|
for the unsigned-in caller (one fixed detail — no enumeration)."""
|
|
r = client.get("/api/ui-settings")
|
|
assert r.status_code == 403
|
|
assert r.json() == {"detail": "admin only"}
|
|
r = client.put("/api/ui-settings", json={"app_name": "nope"})
|
|
assert r.status_code == 403
|
|
assert r.json() == {"detail": "admin only"}
|
|
|
|
|
|
def test_token_user_get_and_put_403(client: TestClient) -> None:
|
|
"""A signed-in token USER (role ``"user"``) is NOT the admin: the
|
|
Theme tab's surface is closed to them on both methods (the
|
|
phase-79 token matrix contract — only the admin themes the
|
|
deployment)."""
|
|
admin = _admin_client()
|
|
r = admin.post("/api/tokens", json={"label": "alice"})
|
|
assert r.status_code == 201, r.text
|
|
token = r.json()["token"]
|
|
assert client.post("/api/token-auth", json={"token": token}).status_code == 204
|
|
assert client.get("/api/whoami").json() == {"authenticated": True, "role": "user"}
|
|
|
|
r = client.get("/api/ui-settings")
|
|
assert r.status_code == 403
|
|
assert r.json() == {"detail": "admin only"}
|
|
r = client.put("/api/ui-settings", json={"brand": "#123456"})
|
|
assert r.status_code == 403
|
|
assert r.json() == {"detail": "admin only"}
|
|
|
|
|
|
def test_admin_get_and_put_200(client: TestClient, db: Session) -> None:
|
|
"""The admin passes the gate on both methods: GET reports the
|
|
effective defaults (row missing), PUT persists + reports the new
|
|
effective values, and a follow-up GET reads them back."""
|
|
client.post("/api/login", json={"password": ADMIN_PASSWORD})
|
|
|
|
r = client.get("/api/ui-settings")
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert set(body) == set(theming.STRING_FIELDS) | set(theming.COLOR_FIELDS)
|
|
assert body["app_name"] == get_settings().app_name
|
|
assert {k: body[k] for k in theming.COLOR_FIELDS} == theming.BUILTIN_COLORS
|
|
|
|
r = client.put(
|
|
"/api/ui-settings",
|
|
json={"app_name": "Reese Brain", "brand": "#818cf8"},
|
|
)
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["app_name"] == "Reese Brain"
|
|
assert r.json()["brand"] == "#818cf8"
|
|
|
|
r = client.get("/api/ui-settings")
|
|
assert r.status_code == 200
|
|
assert r.json()["app_name"] == "Reese Brain"
|
|
assert r.json()["brand"] == "#818cf8"
|
|
# Untouched fields stay at their defaults (DB-over-env / -built-in).
|
|
assert r.json()["footer_text"] == get_settings().footer_text
|
|
assert r.json()["bg"] == theming.BUILTIN_COLORS["bg"]
|
|
|
|
|
|
def test_admin_grid_line_validation_and_normalization(
|
|
client: TestClient, db: Session
|
|
) -> None:
|
|
"""Phase 92 (task 01): the 9th identity color against the LIVE API —
|
|
a bad hex is a 422 naming ``grid_line`` (same fixed detail as the
|
|
other 8); the built-in value stores NULL (the response still
|
|
reports the built-in — the no-op normalization); a non-built-in
|
|
value is stored and reported back. The admin gate itself is pinned
|
|
unchanged by the tests above (router-wide ``require_admin``)."""
|
|
client.post("/api/login", json={"password": ADMIN_PASSWORD})
|
|
|
|
r = client.put("/api/ui-settings", json={"grid_line": "nope"})
|
|
assert r.status_code == 422, r.text
|
|
assert r.json()["detail"] == "grid_line must be a #rrggbb hex color"
|
|
|
|
r = client.put("/api/ui-settings", json={"grid_line": "#4a2626"})
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["grid_line"] == theming.BUILTIN_COLORS["grid_line"]
|
|
row = db.execute(select(UiSettings).where(UiSettings.id == 1)).scalars().first()
|
|
assert row is not None, "the PUT upsert creates the id-1 row"
|
|
assert row.grid_line is None # built-in → NULL normalization
|
|
|
|
r = client.put("/api/ui-settings", json={"grid_line": "#123123"})
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["grid_line"] == "#123123"
|
|
r = client.get("/api/ui-settings")
|
|
assert r.status_code == 200
|
|
assert r.json()["grid_line"] == "#123123" # the stored value reads back
|
|
assert len(r.json()) == 20 # the 20-value shape (17 colors + 3 strings, phase 93)
|
|
|
|
|
|
def test_admin_semantic_fields_round_trip(client: TestClient, db: Session) -> None:
|
|
"""Phase 93 (task 01): the 8 semantic state colors against the LIVE
|
|
API — a bad hex is a 422 naming the field (same fixed detail as the
|
|
identity colors); a non-built-in value is lowercased on store and
|
|
reads back through GET; a built-in value stores NULL (the response
|
|
still reports the built-in); an absent (null) field stores NULL.
|
|
The response is the effective values for all 20 keys."""
|
|
client.post("/api/login", json={"password": ADMIN_PASSWORD})
|
|
|
|
r = client.put("/api/ui-settings", json={"ok_bg": "not-a-color"})
|
|
assert r.status_code == 422, r.text
|
|
assert r.json()["detail"] == "ok_bg must be a #rrggbb hex color"
|
|
|
|
r = client.put(
|
|
"/api/ui-settings",
|
|
json={"ok_ink": "#444444", "accent_bg": "#222222", "err_line": "#EFEFEF"},
|
|
)
|
|
assert r.status_code == 200, r.text
|
|
assert r.json()["ok_ink"] == "#444444" # stored + reported
|
|
assert r.json()["accent_bg"] == "#222222" # stored + reported
|
|
assert r.json()["err_line"] == "#efefef" # upper → lowercased on store
|
|
|
|
row = db.execute(select(UiSettings).where(UiSettings.id == 1)).scalars().first()
|
|
assert row is not None, "the PUT upsert creates the id-1 row"
|
|
assert row.ok_ink == "#444444"
|
|
assert row.accent_bg == "#222222"
|
|
assert row.err_line == "#efefef" # the stored column, lowercase
|
|
assert row.err_bg is None # absent (null) field → NULL
|
|
assert row.accent_ink is None # absent (null) field → NULL
|
|
|
|
r = client.get("/api/ui-settings")
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert set(body) == set(theming.STRING_FIELDS) | set(theming.COLOR_FIELDS)
|
|
assert len(body) == 20
|
|
# GET returns the EFFECTIVE values: the stored ones over the
|
|
# built-ins for the untouched 14 colors.
|
|
assert body["ok_ink"] == "#444444"
|
|
assert body["err_bg"] == theming.BUILTIN_COLORS["err_bg"]
|
|
assert body["accent_ink"] == theming.BUILTIN_COLORS["accent_ink"]
|
|
untouched = [k for k in theming.COLOR_FIELDS if k not in ("ok_ink", "accent_bg", "err_line")]
|
|
assert {k: body[k] for k in untouched} == {
|
|
k: theming.BUILTIN_COLORS[k] for k in untouched
|
|
} # the 14 untouched colors report their built-ins
|
|
|
|
# The built-in → NULL normalization: PUT the built-in back (one in
|
|
# uppercase) — the row's semantic columns return to NULL and the
|
|
# effective values are still the built-ins (no-op contract).
|
|
body_put = {"ok_ink": theming.BUILTIN_COLORS["ok_ink"].upper(),
|
|
"accent_bg": theming.BUILTIN_COLORS["accent_bg"],
|
|
"err_line": theming.BUILTIN_COLORS["err_line"]}
|
|
r = client.put("/api/ui-settings", json=body_put)
|
|
assert r.status_code == 200, r.text
|
|
db.expire_all()
|
|
row = db.execute(select(UiSettings).where(UiSettings.id == 1)).scalars().first()
|
|
assert row is not None
|
|
assert row.ok_ink is None # built-in (uppercase in) → NULL
|
|
assert row.accent_bg is None # built-in → NULL
|
|
assert row.err_line is None # built-in → NULL
|
|
for key in theming.COLOR_FIELDS:
|
|
assert r.json()[key] == theming.BUILTIN_COLORS[key]
|
|
|
|
|
|
def _config_keys() -> set[str]:
|
|
"""The /api/config key set after task 03: the five phase-39/59/62
|
|
keys — the retired CSS-file theming's ``theme`` key is gone."""
|
|
return {"app_name", "version", "docs_repo_configured",
|
|
"input_placeholder", "footer_text"}
|
|
|
|
|
|
def test_api_config_env_only_deployment_returns_env_strings(client: TestClient) -> None:
|
|
"""B1 with an empty ui_settings table: /api/config serves the ENV
|
|
strings (the code defaults — conftest pins them) and the key set is
|
|
the five-key contract (the retired theming's ``theme`` key is gone
|
|
— task 03)."""
|
|
r = client.get("/api/config")
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert set(body) == _config_keys()
|
|
assert body["app_name"] == get_settings().app_name
|
|
assert body["input_placeholder"] == get_settings().input_placeholder
|
|
assert body["footer_text"] == get_settings().footer_text
|
|
|
|
|
|
def test_api_config_carries_no_theme_key(client: TestClient) -> None:
|
|
"""Phase 91 (task 03): the retired CSS-file theming left NO trace
|
|
in the endpoint — the response has no ``theme`` key at all (an
|
|
env-only deployment and a themed one answer with the same keys; the
|
|
colors are injected pre-paint, they never ride this fetch)."""
|
|
r = client.get("/api/config")
|
|
assert r.status_code == 200
|
|
assert "theme" not in r.json()
|
|
|
|
|
|
def test_api_config_returns_db_strings_after_admin_put(
|
|
client: TestClient, db: Session
|
|
) -> None:
|
|
"""B1 with a set row: after an admin PUT, the ANONYMOUS /api/config
|
|
(the frontend's boot fetch — no admin needed) serves the DB strings
|
|
over the env values; the untouched fields keep the env values; the
|
|
five-key set is unchanged (the retired ``theme`` key is absent)."""
|
|
admin = _admin_client()
|
|
r = admin.put(
|
|
"/api/ui-settings",
|
|
json={
|
|
"app_name": "Brain of Testy",
|
|
"input_placeholder": "Ask the vault…",
|
|
"footer_text": "Powered by my own models",
|
|
},
|
|
)
|
|
assert r.status_code == 200, r.text
|
|
|
|
r = client.get("/api/config")
|
|
assert r.status_code == 200 # /api/config stays PUBLIC (no gate)
|
|
body = r.json()
|
|
assert set(body) == _config_keys()
|
|
assert body["app_name"] == "Brain of Testy"
|
|
assert body["input_placeholder"] == "Ask the vault…"
|
|
assert body["footer_text"] == "Powered by my own models"
|
|
# The colors never ride /api/config (the pre-paint injection is
|
|
# task 02; brand.js's surface is the five keys).
|
|
assert "theme" not in body
|
|
assert body["version"] == get_settings().app_version
|