mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 22:35:08 +00:00
* perf(timing): say which render-thread work a late frame followed The soak already says how often a moving frame reached the panel late, but not what the render thread was doing just before it. Vegas does two kinds of work there between frames -- building its strip (compose, extend) and, with live elements, patching changed pixels into it -- and deciding whether either is affordable needs their own numbers. - FrameTimingRecorder.note_op(kind, nbytes) tags the next presented frame. Totals gain op_frames, late_op_frames, op_freezes and op_bytes per kind; aggregate() still takes frames without ops. The file schema is unchanged. - Vegas tags compose and every strip extension (with the bytes it copied). - frame_soak prints an "after work" table: frames, late %, freezes and MB moved per kind, only when something tagged its work. - render_bench gains --strip-screens (Vegas-sized strips), --patch-bytes / --patch-every / --patch-where (in-place column writes, as a live element update does) and --extend-every-screens / --extend-width (append + trim on a fixed cadence that holds the strip's width). No runtime behaviour changes: this is the measurement gate for live Vegas elements. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): note the frame-op attribution and bench modes Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * perf(scroll): build the strip's PIL image only when something reads it Every Vegas strip extension rebuilt ScrollHelper.cached_image from cached_array in full, twice (append, then trim), on the render thread: Image.fromarray is 1.7ms for an 8,000px strip and 3.8ms for 20,000px on a Pi 4 (measured on ledpi), about two thirds of an extension's render-thread cost. Nothing on the frame path reads the image's pixels; every frame is cut from the array. cached_image is now a property. append_content and drop_scrolled_prefix defer it; the first read builds it from the array it started with and keeps it only if the strip has not changed meanwhile, so a sync push racing an extension cannot leave a stale image cached. Assigning cached_image stores exactly what was assigned, as before. has_strip() says whether there is a strip without building its image; the helper's frame path, Vegas and the adapter's scroll-cache invalidation use it. The strip is also no longer held in memory twice. In Vegas the image is now built only by a multi-display sync push. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): live elements -- a plugin API for content that changes while it scrolls Vegas bakes each plugin's pictures into one strip, so a card already on its way across the panel keeps what it showed when it was drawn. This adds the API and bookkeeping for content that can be updated in place; the worker that redraws and swaps it follows separately. No shipped plugin implements the hook yet, so nothing changes for users. Plugin API (core 3.8.0), all no-ops by default: - BasePlugin.get_vegas_elements() -> [VegasElement(key, image, version, live, refresh_hz)]: named, fixed-width pieces of Vegas content. - BasePlugin.redraw_vegas_element(key, width, height, at): a lock-free redraw for content that changes with time. - BasePlugin.notify_vegas_data_changed(): data that lands outside update(). - src/plugin_system/vegas_elements.py (VegasElement, re-exported from base_plugin). Core: - PluginAdapter asks a plugin that implements the hook for elements on the background fetch only (under its lock, on its own canvas); every other path keeps get_vegas_content(). Live elements are pinned (padded with content_padding, never trimmed), tagged with their key, digest and data epoch in Image.info so the existing cache and group plumbing carry them unchanged, and untagged if a width budget crops them. - RenderPipeline records where each live element lands (ElementRecord), in absolute strip columns a trim does not move; the block-start arithmetic is shared with the STATIC markers. - PluginManager update listeners (add/remove_update_listener, notify_data_changed): told the moment update() completes, not at the next ~4s Vegas poll. The coordinator uses one to move each plugin's data epoch on. - vegas_scroll.live_refresh (kill switch), live_max_hz, live_min_interval, live_lead_screens; per-plugin core-owned vegas_live. Live elements are off under multi-display sync, in swap mode and with offscreen_prefetch off. - scripts/check_plugin.py checks the element contract (src/plugin_system/testing/vegas.py); test/fixtures/plugins/vegas-live-stub is a working example. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): live elements update in place while they scroll One background worker (src/vegas_mode/live_worker.py) redraws a plugin's live elements when its data epoch moves on (update listener) or on their refresh_hz, nearest the screen first, and hands changed pixels lock-free to the render thread, which copies them into the strip between frames (RenderPipeline.apply_live_patches, ScrollHelper.patch_columns): at most four patches or two screens of bytes a frame, no drawing or locks there. The worker takes over group prefetch once a live element is placed, runs inside the render gate, and is supervised. Update tick 1s while live elements exist. Web UI switch for live_refresh. OFFSCREEN_RENDERING.md describes what was built and why SegmentStrip was not needed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(sports): live Vegas cards for the scoreboards (shared layer) One live element per game, drawn only when what the card shows changes, so a score changes on a card already crossing the panel. The shared part, so each scoreboard adopts it in a few lines: - src/common/sports_vegas.py: game_key, game_fingerprint (the whole game dict, frozen: no drawn field can be missed), dedupe_games, VegasCardCache, StickyOdds (odds a live poll left out stay drawn), finished_games / with_finished_games (a game that just went final keeps its card, after its league's live games; one a heuristic only judged over keeps its live state, so a tied end of regulation never shows FINAL early). - SportsScrollDisplay.make_vegas_renderer() is the override point; build_vegas_elements() and SportsScrollDisplayManager .get_vegas_elements_for() do the rest. A card's version includes its teams' ranks, which the renderer draws from the rankings cache. - SportsLiveSharedMixin._record_finished_game() / finished_games_snapshot(): held for FINISHED_GAME_TTL after it leaves the live list. A sport that does not implement make_vegas_renderer keeps its ordinary Vegas content, so no scoreboard changes until it opts in. scripts/render_plugin.py --vegas renders a plugin's Vegas block as the ticker lays it out, and --timeline stacks it at successive moments as the ticker would update it in place; the join is now render_pipeline.join_plugin_rows(). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sports): a default _determine_game_type on SportsScrollDisplay render_vegas_card looked the method up with getattr and a None default, which static analysis (Codacy) reports as calling something that may not be callable. The base class now has the default -- the card type from the game's state -- and the plugins that define their own override it as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: review follow-ups on the shared live-card layer - The reused Vegas renderer always gets the current rankings, empty included, so ranks cleared since are not kept drawn. - render_plugin.py: --timeline refuses --no-live (a timeline shows live elements changing), --timeline/--no-live need --vegas, and the Vegas paths create the output's directory like the display path does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
241 lines
10 KiB
Python
241 lines
10 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Plugin Visual Renderer
|
|
|
|
Loads a plugin, calls update() + display(), and saves the resulting
|
|
display as a PNG image for visual inspection.
|
|
|
|
Usage:
|
|
python scripts/render_plugin.py --plugin hello-world --output /tmp/hello.png
|
|
python scripts/render_plugin.py --plugin clock-simple --plugin-dir plugin-repos/ --output /tmp/clock.png
|
|
python scripts/render_plugin.py --plugin hello-world --config '{"message":"Test!"}' --output /tmp/test.png
|
|
python scripts/render_plugin.py --plugin football-scoreboard --mock-data mock_scores.json --output /tmp/football.png
|
|
"""
|
|
|
|
import sys
|
|
import os
|
|
import json
|
|
import argparse
|
|
from pathlib import Path
|
|
|
|
# Add project root to path
|
|
PROJECT_ROOT = Path(__file__).resolve().parent.parent
|
|
sys.path.insert(0, str(PROJECT_ROOT))
|
|
|
|
# Prevent hardware imports
|
|
os.environ['EMULATOR'] = 'true'
|
|
|
|
# Import logger after path setup so src.logging_config is importable
|
|
from src.logging_config import get_logger # noqa: E402
|
|
from src.plugin_system.testing.loading import ( # noqa: E402
|
|
build_full_config, find_plugin_dir, load_manifest,
|
|
)
|
|
logger = get_logger("[Render Plugin]")
|
|
|
|
MIN_DIMENSION = 1
|
|
MAX_DIMENSION = 512
|
|
|
|
|
|
def main() -> int:
|
|
"""Load a plugin, call update() + display(), and save the result as a PNG image."""
|
|
parser = argparse.ArgumentParser(description='Render a plugin display to a PNG image')
|
|
parser.add_argument('--plugin', '-p', required=True, help='Plugin ID to render')
|
|
parser.add_argument('--plugin-dir', '-d', default=None,
|
|
help='Directory to search for plugins (default: auto-detect)')
|
|
parser.add_argument('--config', '-c', default='{}',
|
|
help='Plugin config as JSON string')
|
|
parser.add_argument('--mock-data', '-m', default=None,
|
|
help='Path to JSON file with mock cache data')
|
|
parser.add_argument('--output', '-o', default='/tmp/plugin_render.png', # nosec B108 - dev script default; user can override
|
|
help='Output PNG path (default: /tmp/plugin_render.png)')
|
|
parser.add_argument('--width', type=int, default=128, help='Display width (default: 128)')
|
|
parser.add_argument('--height', type=int, default=32, help='Display height (default: 32)')
|
|
parser.add_argument('--skip-update', action='store_true',
|
|
help='Skip calling update() (render display only)')
|
|
parser.add_argument('--display-mode', default=None,
|
|
help='Display mode to render, for plugins that declare '
|
|
'more than one in their manifest (e.g. nrl_live). '
|
|
'Omitted, the plugin picks its own default.')
|
|
parser.add_argument('--vegas', action='store_true',
|
|
help="Render the plugin's block of the Vegas ticker strip "
|
|
"instead of display(): its live elements if it has "
|
|
"them, else its Vegas content, laid out as the "
|
|
"ticker lays them out. Also writes the live "
|
|
"elements' keys and columns to <output>.json")
|
|
parser.add_argument('--no-live', action='store_true',
|
|
help="With --vegas: ignore live elements and render the "
|
|
"plugin's ordinary Vegas content (for before/after)")
|
|
parser.add_argument('--timeline', type=int, default=0, metavar='ROWS',
|
|
help="With --vegas: render ROWS rows, each the block a "
|
|
"--timeline-step later as the ticker would update it "
|
|
"in place (animated elements redrawn for that moment)")
|
|
parser.add_argument('--timeline-step', type=float, default=0.25, metavar='SECONDS',
|
|
help="Seconds between --timeline rows (default 0.25)")
|
|
parser.add_argument('--timeline-update', action='store_true',
|
|
help="With --timeline: run update() before each row and "
|
|
"redraw every live element from the new data")
|
|
|
|
args = parser.parse_args()
|
|
|
|
if args.timeline > 1 and args.no_live:
|
|
# A timeline shows live elements changing; plain content never does.
|
|
parser.error("--timeline shows live elements; it cannot be combined with --no-live")
|
|
if (args.timeline or args.no_live) and not args.vegas:
|
|
parser.error("--timeline and --no-live need --vegas")
|
|
|
|
if not (MIN_DIMENSION <= args.width <= MAX_DIMENSION):
|
|
print(f"Error: --width must be between {MIN_DIMENSION} and {MAX_DIMENSION} (got {args.width})")
|
|
raise SystemExit(1)
|
|
if not (MIN_DIMENSION <= args.height <= MAX_DIMENSION):
|
|
print(f"Error: --height must be between {MIN_DIMENSION} and {MAX_DIMENSION} (got {args.height})")
|
|
raise SystemExit(1)
|
|
|
|
# Determine search directories
|
|
if args.plugin_dir:
|
|
search_dirs = [args.plugin_dir]
|
|
else:
|
|
search_dirs = [
|
|
str(PROJECT_ROOT / 'plugins'),
|
|
str(PROJECT_ROOT / 'plugin-repos'),
|
|
]
|
|
|
|
# Find plugin
|
|
plugin_dir = find_plugin_dir(args.plugin, search_dirs)
|
|
if not plugin_dir:
|
|
logger.error("Plugin '%s' not found in: %s", args.plugin, search_dirs)
|
|
return 1
|
|
|
|
logger.info("Found plugin at: %s", plugin_dir)
|
|
|
|
# Load manifest
|
|
manifest = load_manifest(Path(plugin_dir))
|
|
|
|
# Parse config: start with schema defaults, then apply overrides
|
|
try:
|
|
user_config = json.loads(args.config)
|
|
except json.JSONDecodeError as e:
|
|
logger.error("Invalid JSON config: %s", e)
|
|
return 1
|
|
|
|
config = build_full_config(Path(plugin_dir), cli_config=user_config)
|
|
|
|
# Load mock data if provided
|
|
mock_data = {}
|
|
if args.mock_data:
|
|
mock_data_path = Path(args.mock_data)
|
|
if not mock_data_path.exists():
|
|
logger.error("Mock data file not found: %s", args.mock_data)
|
|
return 1
|
|
with open(mock_data_path, 'r') as f:
|
|
mock_data = json.load(f)
|
|
|
|
# Create visual display manager and mocks
|
|
from src.plugin_system.testing import VisualTestDisplayManager, MockCacheManager, MockPluginManager
|
|
from src.plugin_system.plugin_loader import PluginLoader
|
|
|
|
display_manager = VisualTestDisplayManager(width=args.width, height=args.height)
|
|
cache_manager = MockCacheManager()
|
|
plugin_manager = MockPluginManager()
|
|
|
|
# Pre-populate cache with mock data
|
|
for key, value in mock_data.items():
|
|
cache_manager.set(key, value)
|
|
|
|
# Load and instantiate plugin
|
|
loader = PluginLoader()
|
|
|
|
try:
|
|
plugin_instance, _module = loader.load_plugin(
|
|
plugin_id=args.plugin,
|
|
manifest=manifest,
|
|
plugin_dir=Path(plugin_dir),
|
|
config=config,
|
|
display_manager=display_manager,
|
|
cache_manager=cache_manager,
|
|
plugin_manager=plugin_manager,
|
|
install_deps=False,
|
|
)
|
|
except (ImportError, OSError, ValueError) as e:
|
|
logger.error("Error loading plugin '%s': %s", args.plugin, e)
|
|
return 1
|
|
|
|
logger.info("Plugin '%s' loaded successfully", args.plugin)
|
|
|
|
# Run update() then display()
|
|
if not args.skip_update:
|
|
try:
|
|
plugin_instance.update()
|
|
logger.debug("update() completed")
|
|
except Exception as e:
|
|
logger.warning("update() raised: %s — continuing to display()", e)
|
|
|
|
if args.vegas:
|
|
Path(args.output).parent.mkdir(parents=True, exist_ok=True)
|
|
|
|
if args.vegas and args.timeline > 1:
|
|
from src.plugin_system.testing.vegas import render_vegas_timeline
|
|
image, rows = render_vegas_timeline(
|
|
plugin_instance, args.plugin, display_manager, steps=args.timeline,
|
|
step_seconds=args.timeline_step, run_update=args.timeline_update)
|
|
if image is None:
|
|
logger.error("Plugin '%s' has no Vegas content", args.plugin)
|
|
return 1
|
|
image.save(args.output)
|
|
logger.info("Saved a %d-row Vegas timeline (%dx%d) to %s",
|
|
rows, image.width, image.height, args.output)
|
|
return 0
|
|
|
|
if args.vegas:
|
|
from src.plugin_system.testing.vegas import render_vegas_strip
|
|
block, layout = render_vegas_strip(
|
|
plugin_instance, args.plugin, display_manager, live=not args.no_live)
|
|
if block is None:
|
|
logger.error("Plugin '%s' has no Vegas content", args.plugin)
|
|
return 1
|
|
block.save(args.output)
|
|
sidecar = Path(args.output).with_suffix('.json')
|
|
sidecar.write_text(json.dumps(
|
|
{"width": block.width, "height": block.height,
|
|
"live_elements": [{"key": k, "x": x, "width": w} for x, k, w in layout]},
|
|
indent=2) + "\n", encoding="utf-8")
|
|
logger.info("Saved Vegas strip %dx%d (%d live element(s)) to %s and %s",
|
|
block.width, block.height, len(layout), args.output, sidecar)
|
|
return 0
|
|
|
|
# A plugin that declares several display modes usually renders nothing
|
|
# useful without being told which one to draw: the scoreboards keep their
|
|
# state on per-mode sub-managers and their no-argument path returns False.
|
|
# Only pass the argument when asked for, so the many plugins whose display()
|
|
# takes no display_mode keep working untouched.
|
|
try:
|
|
if args.display_mode:
|
|
try:
|
|
plugin_instance.display(display_mode=args.display_mode,
|
|
force_clear=True)
|
|
except TypeError as error:
|
|
if ("unexpected keyword argument" not in str(error)
|
|
or "display_mode" not in str(error)):
|
|
raise
|
|
logger.warning(
|
|
"%s.display() does not accept display_mode; rendering its "
|
|
"default screen instead", args.plugin)
|
|
plugin_instance.display(force_clear=True)
|
|
else:
|
|
plugin_instance.display(force_clear=True)
|
|
logger.debug("display() completed")
|
|
except Exception as e:
|
|
logger.error("Error in display(): %s", e)
|
|
return 1
|
|
|
|
# Save the rendered image
|
|
output_path = Path(args.output)
|
|
output_path.parent.mkdir(parents=True, exist_ok=True)
|
|
display_manager.save_snapshot(str(output_path))
|
|
logger.info("Rendered image saved to: %s (%dx%d)", output_path, args.width, args.height)
|
|
|
|
return 0
|
|
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(main())
|