mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-08-01 08:48:05 +00:00
* feat(element-style): universal per-element style resolver One shared implementation of the three things every customizable plugin re-invented: a font loader, the customization.layout x/y-offset reader, and the "did the user actually override this font?" check. The override check is the load-bearing piece: the web UI's save flow writes full schema defaults into config.json on every save, and the plugin manager merges defaults again before instantiation, so key presence never means user intent. The resolver compares against the plugin's own schema defaults (via schema_manager), degrading to caller-supplied classic defaults when unavailable. This retires the hand-maintained _CLASSIC_FONT_DEFAULTS dicts that shipped broken twice. The loader is a superset of the four per-plugin variants: alias resolution (baseball), truetype for TTF/OTF/BDF (FreeType loads BDF at native size), .pil sidecar fallback for BDF (football), fallback font, PIL default — never raises. Also introduces the text_color convention ([r,g,b], absent = keep the plugin's hardcoded color). BasePlugin gains a lazy style_resolver property (invalidated on config change) and element_style() sugar; standalone helpers receive the resolver from their owning plugin. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * feat(element-style): x-style-elements schema expansion + color provenance Plugins can now declare styleable display elements once, compactly, on their customization schema ("x-style-elements") instead of hand-copying the ~50-line font/font_size/text_color/offset property blocks (currently duplicated 52x across the plugin monorepo). SchemaManager.load_schema expands declarations before caching, so the config form, save path, validation, and defaults generation all see the same shape; the single expansion implementation lives in src.element_style and is also applied by defaults_from_schema_file, keeping the web UI's view and a plugin's raw-schema-file view of the defaults provably identical (parity test). Generated blocks use only widgets the config form already renders (font-selector, color-picker, number inputs) and update x-propertyOrder when present (the template only renders listed keys). Expansion is idempotent, never mutates its input or the cached/on-disk schema, and a hand-written block for the same element always wins. Color gets the same provenance rule as fonts: the web form always posts the RGB inputs, so a saved config carries the schema-default color whether or not the user touched it — the resolver now only honors a color that DIFFERS from the schema default, and keeps the plugin's classic (possibly state-dependent, e.g. gold-on-touchdown) color otherwise. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * feat(web): live plugin preview on the config page Adds POST /api/v3/plugins/preview: renders a plugin headlessly with the CANDIDATE (unsaved) config and returns a PNG — so users can see exactly what the panel will show before saving, at their real panel size (from display.hardware) or a chosen test size. Two extractions make it drift-proof rather than parallel-implemented: - dev_server's _render_once moves to src/plugin_system/testing/render_service.py (pure PIL via VisualTestDisplayManager, install_deps=False always — safe in the web process, which never touches display hardware); the dev server now wraps it. - save_plugin_config's ~350-line form->config conversion is extracted verbatim as parse_plugin_config_form and shared by the preview endpoint, so preview and save can never interpret the form differently. update() is skipped by default (no network on the request thread); plugins with a test/harness.json get their mock-data fixture primed instead, and ?skip_update=0 opts into a live update. The config page gains a Live Preview panel (HTMX hx-include of the existing form, size selector, pixelated img fragment) — works for every plugin with zero per-plugin code, including the x-style-elements font/size/color fields. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(web): expand x-style-elements in the config-page form render too pages_v3's plugin-config partial loads config_schema.json directly from disk rather than through SchemaManager.load_schema, so declared style elements expanded everywhere EXCEPT the form the user actually sees. Found live on the devpi: the API served the expanded schema and the save path validated against it, but the config page rendered no font/color/offset fields. Apply the same (idempotent) expansion here. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(web): preview size selector — htmx caches hx-post, use hx-vals Found live on the devpi: selecting a preview size did nothing because htmx snapshots the request path when it processes the button, so the size dropdown's onchange mutation of hx-post never took effect. The size now travels as a __preview_size=WxH form field attached via hx-vals (evaluated at request time); the endpoint honors it (query args still win for API callers) and strips it before form parsing so it can't leak into the candidate config. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(web): allowlist plugin_id in the preview endpoint's dir lookup Same defense as the dev server's find_plugin_dir (and pages_v3's existing pattern): plugin_id arrives in request input and is used to build filesystem paths — reject anything outside ^[a-zA-Z0-9_-]{1,64}$ before touching the filesystem. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix: harden preview + resolver edges found in self-review - extract_schema_defaults now matches SchemaManager's array handling ([] for arrays without defaults, [item] for item-level defaults) — the documented parity guarantee was false for array-typed properties; parity test extended to cover them. - render_plugin_once calls plugin cleanup() in a finally (image captured first — cleanup may clear the canvas): preview instances could leak sessions/threads per request in the long-running web process. - Preview JSON path deep-merges the candidate onto the saved config, matching the form path — a shallow update() silently dropped saved sibling values in any nested section the candidate touched. - Preview render is bounded (15s, 504 on timeout, daemonized worker): a hanging plugin display() no longer pins a web worker forever. - ElementStyleResolver.is_for(config): public staleness check for callers that cache a resolver, instead of poking _config. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam * fix(render-service): adopt the dev server's exception-detail policy Port c6962701's convention into the shared render service (which supersedes the inline _render_once it patched): full tracebacks to the server log via exc_info, only the exception class name to the client. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqzC1nzTWL4kaqgMaQZFam --------- Co-authored-by: Chuck <chuck@example.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
253 lines
10 KiB
Python
253 lines
10 KiB
Python
"""Tests for POST /api/v3/plugins/preview — the config-page live preview.
|
|
|
|
The endpoint renders a plugin headlessly (pure PIL, no hardware, no pip)
|
|
with a CANDIDATE config: either the current form state (parsed by the same
|
|
parse_plugin_config_form used by save, so preview and save can never
|
|
disagree) or a JSON config body.
|
|
"""
|
|
|
|
import base64
|
|
import io
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
from flask import Flask
|
|
from PIL import Image
|
|
|
|
project_root = Path(__file__).parent.parent.parent
|
|
sys.path.insert(0, str(project_root))
|
|
|
|
from web_interface.blueprints import api_v3 as api_v3_module # noqa: E402
|
|
from web_interface.blueprints.api_v3 import api_v3 # noqa: E402
|
|
|
|
PLUGIN_ID = "preview-test-plugin"
|
|
|
|
MANAGER_PY = '''
|
|
from PIL import ImageFont
|
|
from src.plugin_system.base_plugin import BasePlugin
|
|
|
|
|
|
class PreviewTestPlugin(BasePlugin):
|
|
def update(self):
|
|
return True
|
|
|
|
def display(self, force_clear=False):
|
|
if force_clear:
|
|
self.display_manager.clear()
|
|
text = self.config.get("message", "hello")
|
|
self.display_manager.draw.text((1, 1), text, fill=(255, 255, 255))
|
|
self.display_manager.update_display()
|
|
'''
|
|
|
|
MANIFEST = {
|
|
"id": PLUGIN_ID,
|
|
"name": "Preview Test Plugin",
|
|
"version": "1.0.0",
|
|
"class_name": "PreviewTestPlugin",
|
|
"entry_point": "manager.py",
|
|
"display_modes": ["preview_test"],
|
|
}
|
|
|
|
SCHEMA = {
|
|
"type": "object",
|
|
"properties": {
|
|
"enabled": {"type": "boolean", "default": True},
|
|
"message": {"type": "string", "default": "hello"},
|
|
},
|
|
}
|
|
|
|
|
|
@pytest.fixture
|
|
def plugin_dir(tmp_path):
|
|
plugin = tmp_path / PLUGIN_ID
|
|
plugin.mkdir()
|
|
(plugin / "manager.py").write_text(MANAGER_PY)
|
|
(plugin / "manifest.json").write_text(json.dumps(MANIFEST))
|
|
(plugin / "config_schema.json").write_text(json.dumps(SCHEMA))
|
|
return plugin
|
|
|
|
|
|
@pytest.fixture
|
|
def client(plugin_dir, tmp_path):
|
|
from src.plugin_system.schema_manager import SchemaManager
|
|
|
|
test_app = Flask(__name__)
|
|
test_app.register_blueprint(api_v3, url_prefix="/api/v3")
|
|
|
|
config_manager = MagicMock()
|
|
config_manager.load_config.return_value = {
|
|
"display": {"hardware": {"cols": 64, "chain_length": 2,
|
|
"rows": 32, "parallel": 1}},
|
|
PLUGIN_ID: {"enabled": False, "message": "saved"},
|
|
}
|
|
|
|
plugin_manager = MagicMock()
|
|
plugin_manager.plugins_dir = str(tmp_path)
|
|
|
|
old = (getattr(api_v3_module.api_v3, "config_manager", None),
|
|
getattr(api_v3_module.api_v3, "plugin_manager", None),
|
|
getattr(api_v3_module.api_v3, "schema_manager", None))
|
|
api_v3_module.api_v3.config_manager = config_manager
|
|
api_v3_module.api_v3.plugin_manager = plugin_manager
|
|
api_v3_module.api_v3.schema_manager = SchemaManager(plugins_dir=tmp_path)
|
|
|
|
with test_app.test_client() as c:
|
|
yield c
|
|
|
|
(api_v3_module.api_v3.config_manager,
|
|
api_v3_module.api_v3.plugin_manager,
|
|
api_v3_module.api_v3.schema_manager) = old
|
|
|
|
|
|
def _decode_image(data_url):
|
|
assert data_url.startswith("data:image/png;base64,")
|
|
raw = base64.b64decode(data_url.split(",", 1)[1])
|
|
return Image.open(io.BytesIO(raw))
|
|
|
|
|
|
class TestPreviewEndpoint:
|
|
def test_json_body_renders_at_default_panel_size(self, client):
|
|
"""No width/height -> the user's real panel (64*2 x 32*1)."""
|
|
resp = client.post(f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}",
|
|
json={"config": {"message": "hi"}})
|
|
assert resp.status_code == 200
|
|
data = resp.get_json()["data"]
|
|
img = _decode_image(data["image"])
|
|
assert img.size == (128, 32)
|
|
assert data["errors"] == []
|
|
|
|
def test_explicit_size(self, client):
|
|
resp = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=64&height=64",
|
|
json={"config": {}})
|
|
assert resp.status_code == 200
|
|
img = _decode_image(resp.get_json()["data"]["image"])
|
|
assert img.size == (64, 64)
|
|
|
|
def test_form_encoding_matches_json(self, client):
|
|
"""The form path (what HTMX posts) and the JSON path must render
|
|
the same candidate config identically."""
|
|
via_json = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
json={"config": {"message": "same"}})
|
|
via_form = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
data={"message": "same"})
|
|
a = _decode_image(via_json.get_json()["data"]["image"])
|
|
b = _decode_image(via_form.get_json()["data"]["image"])
|
|
assert list(a.getdata()) == list(b.getdata())
|
|
|
|
def test_candidate_config_wins_over_saved(self, client):
|
|
"""The preview must show the UNSAVED form state, not the saved
|
|
config ('saved' vs 'candidate' render differently)."""
|
|
saved = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
json={"config": {}})
|
|
candidate = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
json={"config": {"message": "candidate"}})
|
|
a = _decode_image(saved.get_json()["data"]["image"])
|
|
b = _decode_image(candidate.get_json()["data"]["image"])
|
|
assert list(a.getdata()) != list(b.getdata())
|
|
|
|
def test_disabled_plugin_still_previews(self, client):
|
|
"""Saved config has enabled: False — preview forces enabled."""
|
|
resp = client.post(f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}",
|
|
json={"config": {}})
|
|
assert resp.status_code == 200
|
|
assert resp.get_json()["data"]["errors"] == []
|
|
|
|
def test_preview_size_form_field(self, client):
|
|
"""The UI size selector posts __preview_size=WxH via hx-vals (htmx
|
|
caches hx-post's path, so it can't ride the query string). It must
|
|
set the render size and must NOT leak into the candidate config."""
|
|
resp = client.post(f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}",
|
|
data={"message": "hi", "__preview_size": "64x64"})
|
|
assert resp.status_code == 200
|
|
data = resp.get_json()["data"]
|
|
img = _decode_image(data["image"])
|
|
assert img.size == (64, 64)
|
|
assert data["errors"] == []
|
|
|
|
def test_query_args_beat_preview_size_field(self, client):
|
|
resp = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
data={"message": "hi", "__preview_size": "64x64"})
|
|
img = _decode_image(resp.get_json()["data"]["image"])
|
|
assert img.size == (128, 32)
|
|
|
|
def test_malformed_preview_size_falls_back_to_panel(self, client):
|
|
resp = client.post(f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}",
|
|
data={"message": "hi", "__preview_size": "bogus x"})
|
|
img = _decode_image(resp.get_json()["data"]["image"])
|
|
assert img.size == (128, 32) # cols*chain x rows*parallel
|
|
|
|
def test_json_candidate_deep_merges_onto_saved_config(self, client):
|
|
"""A partial JSON candidate must not wipe saved sibling values in
|
|
the same nested section (form path and save both deep-merge)."""
|
|
# Saved config has message "saved"; posting an unrelated nested key
|
|
# must not discard it — render must still differ from a candidate
|
|
# that explicitly changes message.
|
|
keep_saved = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
json={"config": {}})
|
|
explicit = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=128&height=32",
|
|
json={"config": {"message": "saved"}})
|
|
a = _decode_image(keep_saved.get_json()["data"]["image"])
|
|
b = _decode_image(explicit.get_json()["data"]["image"])
|
|
assert list(a.getdata()) == list(b.getdata())
|
|
|
|
def test_hanging_plugin_times_out(self, client, plugin_dir, monkeypatch):
|
|
"""A plugin whose display() hangs must not pin the web worker.
|
|
|
|
Uses its own plugin id: the loader caches the module per id, so
|
|
reusing PLUGIN_ID would run the already-imported (non-hanging) code
|
|
when this test follows others in the suite.
|
|
"""
|
|
from web_interface.blueprints import api_v3 as api_v3_module
|
|
monkeypatch.setattr(api_v3_module, "PREVIEW_RENDER_TIMEOUT_SEC", 1)
|
|
hang_id = "preview-hang-plugin"
|
|
hang_dir = plugin_dir.parent / hang_id
|
|
hang_dir.mkdir()
|
|
(hang_dir / "manager.py").write_text(MANAGER_PY.replace(
|
|
"self.display_manager.update_display()",
|
|
"import time; time.sleep(10); self.display_manager.update_display()"))
|
|
manifest = dict(MANIFEST, id=hang_id, name="Hang Plugin")
|
|
(hang_dir / "manifest.json").write_text(json.dumps(manifest))
|
|
(hang_dir / "config_schema.json").write_text(json.dumps(SCHEMA))
|
|
resp = client.post(f"/api/v3/plugins/preview?plugin_id={hang_id}",
|
|
json={"config": {}})
|
|
assert resp.status_code == 504
|
|
|
|
def test_htmx_gets_html_fragment(self, client):
|
|
resp = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=64&height=32",
|
|
data={"message": "hi"}, headers={"HX-Request": "true"})
|
|
assert resp.status_code == 200
|
|
assert resp.mimetype == "text/html"
|
|
body = resp.get_data(as_text=True)
|
|
assert "<img" in body and "data:image/png;base64," in body
|
|
|
|
def test_unknown_plugin_404(self, client):
|
|
resp = client.post("/api/v3/plugins/preview?plugin_id=nope",
|
|
json={"config": {}})
|
|
assert resp.status_code == 404
|
|
|
|
def test_missing_plugin_id_400(self, client):
|
|
resp = client.post("/api/v3/plugins/preview", json={"config": {}})
|
|
assert resp.status_code == 400
|
|
|
|
def test_absurd_size_rejected(self, client):
|
|
resp = client.post(
|
|
f"/api/v3/plugins/preview?plugin_id={PLUGIN_ID}&width=99999&height=32",
|
|
json={"config": {}})
|
|
assert resp.status_code == 400
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(pytest.main([__file__, "-v"]))
|