mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
* fix(display): tear down Vegas mode on controller cleanup DisplayController.cleanup() never called VegasModeCoordinator.cleanup(), so the Vegas teardown (stop, pipeline/stream reset, adapter cache drop) was unreachable. Call it before the display manager is cleaned up, and skip it when Vegas was never created. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(vegas): default max_cycle_duration to the documented 240s The template, the web UI help, CONFIG_REFERENCE and the controller all say 240, but the code defaulted to 600 in two places, so a config without the key ran Vegas iterations 2.5x longer than documented. from_config now falls back to the dataclass field defaults instead of repeating each one, so the two copies can no longer drift, and the controller's follower scroll-speed default reads VegasModeConfig's. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(display): let run.py -d show display_manager's DEBUG output display_manager pinned its logger to INFO at import, overriding the root level, so debug mode never showed its DEBUG lines. Use get_logger() from src.logging_config like the rest of the core and leave the level to the logging setup. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(display): run each startup validation check once StartupValidator.validate_all() ran twice at boot, before and after the plugin manager was created, so every config, cache, display and systemd-unit warning was logged twice. The second pass now runs only the plugin checks. Drop the commented-out raise_on_errors line. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(vegas): one INFO line per plugin-list refresh StreamManager logged "=" * 60 banners and a line per plugin (INCLUDED, SKIPPED, FETCHING CONTENT, SEGMENT CREATED) at INFO on every refresh and fetch, i.e. at each cycle start and every 30s. Log one INFO summary of the rotation per refresh and move the per-plugin detail, the weighting breakdown and "no content this cycle" to DEBUG (the adapter still warns when every content path fails). Also drop the check/cross marks from the controller's log messages. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(vegas): drop the per-iteration static-mode plugin scan run_iteration() rebuilt _static_mode_plugins on every iteration, asking every plugin for its display mode and logging the set at INFO, but nothing ever read it: static pauses are triggered by _check_static_plugin_trigger() from the next segment. Delete it, the coordinator's get_ordered_plugins() that only it used, and the write-only _static_pause_plugin / _static_pause_start. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(vegas): remove the staging buffer that was never filled StreamManager and RenderPipeline carried a double-buffer design that nothing used: _staging_buffer was only ever cleared or swapped, so swap_buffers() never did anything and should_recompose()'s staging_count > 0 branch was dead, and _active_scroll_image, _staging_scroll_image, _is_rendering, _last_frame_time and _frame_interval were written but never read. Delete the machinery and rewrite the docstrings around what actually carries updates: _pending_updates, consumed by process_updates() in swap mode and invalidate_pending_updates() in continuous mode. should_recompose() no longer builds a buffer-status dict every frame. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(display): tidy the display controller without changing behaviour - Import VegasModeCoordinator locally instead of through module globals (there is no circular import to avoid). - Drop hasattr() checks on attributes PluginManager.__init__ always sets (plugin_executor, plugin_last_update, get_plugin_lock, run_scheduled_updates*, stop_update_worker) and the dead "older manager" fallbacks; keep the health_tracker None checks, now via _health_tracker(). - Extract _display_once() for the per-frame display call both render loops copied, _advance_on_demand() for the two on-demand rotations, _reset_on_demand_fields() for the error and clear paths, and _timezone() / _in_window() for the two schedule checks. - Remove always-true conditions and the unreachable non-plugin else branch in run(), and read _was_display_active / _last_published_mode / vegas_coordinator directly now that __init__ declares them. - Declare the follower render state in __init__, name its tuning constants, add _follower_sign(), and share the 90/s sync send interval with the render pipeline (SYNC_SEND_INTERVAL). - Delete history narration and the "Opt #N" labels, fix the comment that called _scroll_speed constant (hot reload updates it), and drop a startup timing log that measured nothing. - render_pipeline / plugin_adapter: read display_manager.width/height as the properties they are, drop an empty TYPE_CHECKING block, an aliased threading import and a duplicated `if result and self.sync_manager:`. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(display): trim dead code from display_manager - Add _new_canvas() for the image/draw/fontmode="1" setup that was copied six times. - Call resolve_double_sided() and compose_pixel_mapper_config() directly instead of through a module alias and a passthrough method, and replace the comment that said the passthrough read class attributes. - Delete the unused _initialized flag and _ORIENTATION_ROTATE_DEGREES alias (no core or monorepo reader; tests stop resetting the flag), the test pattern's unreachable no-matrix branch (it only runs once the matrix exists), `del old_image # help GC` (a no-op on a local), a duplicated early return in process_deferred_updates, and stale comments. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(vegas): remove unread fields and test-only helpers, fix docstrings - ContentSegment: drop total_width, fetched_at, is_stale, image_count and is_static, none of which is read. - StreamManager: drop _current_index (never advanced) and the test-only get_all_content_for_composition() and has_pending_updates(); VegasModeConfig: drop the test-only is_plugin_included(). - geometry.find_blank_cut() has had no production caller since the crop moved to item boundaries; delete it and its tests. - PluginAdapter: the _finalize docstring described separator_width between every image, and _crop_to_budget's said cuts snap to the nearest blank column; both now describe what the code does. - Coordinator: the static-pause interrupt log no longer blames follower mode for every interrupt, and set_update_callback names the callback the controller actually wires. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(scroll): correct ScrollHelper comments and drop dead branches - Four comments said the strip always starts with display_width of blank; it does only when lead_gap is None (Vegas passes its own). - Delete the "Width calculation mismatch" warning: the image is created at the calculated width, so the two can never differ. - Remove the two scroll_delay <= 0 fallbacks (which disagreed with each other): set_scroll_delay clamps it to at least 0.001 and nothing in core or the plugin monorepo assigns it directly. - Trim the scipy history from the blend docstring. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(run): drop a redundant comment Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(display): log set_scrolling_state only when it changes Vegas and scrolling plugins set the scrolling state every frame, so once display_manager's DEBUG output became visible in debug mode it printed "Scrolling state set to: True" about 120 times a second. Log only when the value differs from the previous one; the state, activity timestamp and frame hold still update on every call. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): display-vegas Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
226 lines
9.4 KiB
Python
226 lines
9.4 KiB
Python
"""
|
|
Regression tests: changed plugin data must reach the strip in continuous mode.
|
|
|
|
Two faults combined to freeze Vegas content indefinitely.
|
|
|
|
PR #291 added a call to ``plugin_adapter.invalidate_plugin_scroll_cache()`` so a
|
|
plugin's *own* cached scroll image would be rebuilt from fresh data. The method
|
|
was never implemented, and ``hot_swap_content()`` wraps the call in a broad
|
|
except, so every hot swap raised AttributeError and was silently swallowed.
|
|
|
|
Continuous scrolling then removed the only path that reached it at all:
|
|
``should_recompose()``/``hot_swap_content()`` are called from the non-continuous
|
|
branch, while ``continuous_scroll`` defaults to True.
|
|
|
|
Together, a plugin composed its scroll image once and handed back the same
|
|
picture forever, because the sports plugins' ``get_vegas_content()`` regenerates
|
|
only when its cache is empty. Symptom: a game that was live last night is still
|
|
drawn as live the following morning.
|
|
"""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import MagicMock
|
|
|
|
import numpy as np
|
|
from PIL import Image
|
|
|
|
from src.vegas_mode.config import VegasModeConfig
|
|
from src.vegas_mode.plugin_adapter import PluginAdapter
|
|
from src.vegas_mode.render_pipeline import RenderPipeline
|
|
from src.vegas_mode.stream_manager import StreamManager
|
|
|
|
|
|
class FakeDisplayManager:
|
|
width = 64
|
|
height = 32
|
|
|
|
|
|
def _helper():
|
|
"""A stand-in ScrollHelper holding both halves of its cache."""
|
|
image = Image.new('RGB', (128, 32), (10, 20, 30))
|
|
return SimpleNamespace(cached_image=image, cached_array=np.array(image))
|
|
|
|
|
|
class TestInvalidatePluginScrollCache:
|
|
"""The method PR #291 called but never defined."""
|
|
|
|
def test_method_exists(self):
|
|
# It was called for months without existing; the broad except in
|
|
# hot_swap_content() meant nothing ever surfaced.
|
|
assert hasattr(PluginAdapter, 'invalidate_plugin_scroll_cache')
|
|
|
|
def test_clears_helper_attached_to_the_plugin(self):
|
|
adapter = PluginAdapter(FakeDisplayManager(), VegasModeConfig())
|
|
helper = _helper()
|
|
plugin = SimpleNamespace(scroll_helper=helper)
|
|
|
|
assert adapter.invalidate_plugin_scroll_cache(plugin, 'stocks') is True
|
|
assert helper.cached_image is None
|
|
assert helper.cached_array is None
|
|
|
|
def test_clears_helper_owned_by_a_scroll_manager(self):
|
|
# The sports scoreboards keep theirs on _scroll_manager, which is the
|
|
# layout that produced the reported stale-scores bug.
|
|
adapter = PluginAdapter(FakeDisplayManager(), VegasModeConfig())
|
|
helper = _helper()
|
|
plugin = SimpleNamespace(_scroll_manager=SimpleNamespace(scroll_helper=helper))
|
|
|
|
assert adapter.invalidate_plugin_scroll_cache(plugin, 'baseball') is True
|
|
assert helper.cached_image is None
|
|
assert helper.cached_array is None
|
|
|
|
def test_clears_both_halves_together(self):
|
|
# cached_array is the image's numpy mirror; leaving one behind lets a
|
|
# reader pick up content the other no longer has.
|
|
adapter = PluginAdapter(FakeDisplayManager(), VegasModeConfig())
|
|
helper = _helper()
|
|
adapter.invalidate_plugin_scroll_cache(
|
|
SimpleNamespace(scroll_helper=helper), 'news')
|
|
assert (helper.cached_image, helper.cached_array) == (None, None)
|
|
|
|
def test_plugin_without_a_helper_is_not_an_error(self):
|
|
adapter = PluginAdapter(FakeDisplayManager(), VegasModeConfig())
|
|
assert adapter.invalidate_plugin_scroll_cache(SimpleNamespace(), 'clock') is False
|
|
|
|
|
|
class TestInvalidatePendingUpdates:
|
|
def _manager(self, plugins):
|
|
stream = StreamManager(
|
|
VegasModeConfig(),
|
|
SimpleNamespace(plugins=plugins),
|
|
MagicMock(),
|
|
)
|
|
stream.plugin_adapter = MagicMock()
|
|
return stream
|
|
|
|
def test_drops_caches_for_updated_plugins(self):
|
|
helper = _helper()
|
|
plugin = SimpleNamespace(scroll_helper=helper)
|
|
stream = self._manager({'baseball': plugin})
|
|
stream.mark_plugin_updated('baseball')
|
|
|
|
assert stream.invalidate_pending_updates() == ['baseball']
|
|
stream.plugin_adapter.invalidate_cache.assert_called_once_with('baseball')
|
|
stream.plugin_adapter.invalidate_plugin_scroll_cache.assert_called_once_with(
|
|
plugin, 'baseball')
|
|
|
|
def test_pending_flags_are_consumed(self):
|
|
# Left unconsumed they accumulate forever and nothing ever refreshes.
|
|
stream = self._manager({'baseball': SimpleNamespace()})
|
|
stream.mark_plugin_updated('baseball')
|
|
assert stream._pending_updates
|
|
|
|
stream.invalidate_pending_updates()
|
|
assert not stream._pending_updates
|
|
assert stream.invalidate_pending_updates() == []
|
|
|
|
def test_no_pending_updates_does_no_work(self):
|
|
stream = self._manager({})
|
|
assert stream.invalidate_pending_updates() == []
|
|
stream.plugin_adapter.invalidate_cache.assert_not_called()
|
|
|
|
def test_a_failing_plugin_does_not_stop_the_others(self):
|
|
stream = self._manager({'a': SimpleNamespace(), 'b': SimpleNamespace()})
|
|
stream.mark_plugin_updated('a')
|
|
stream.mark_plugin_updated('b')
|
|
stream.plugin_adapter.invalidate_cache.side_effect = [
|
|
RuntimeError('boom'), None]
|
|
|
|
assert sorted(stream.invalidate_pending_updates()) == ['a', 'b']
|
|
assert stream.plugin_adapter.invalidate_cache.call_count == 2
|
|
|
|
|
|
class TestContinuousModeReachesTheRefresh:
|
|
def _pipeline(self):
|
|
stream = MagicMock()
|
|
return RenderPipeline(VegasModeConfig(), FakeDisplayManager(), stream), stream
|
|
|
|
def test_refresh_delegates_to_the_stream_manager(self):
|
|
pipeline, stream = self._pipeline()
|
|
stream.invalidate_pending_updates.return_value = ['baseball']
|
|
assert pipeline.refresh_updated_plugins() is True
|
|
|
|
def test_refresh_reports_false_when_nothing_changed(self):
|
|
pipeline, stream = self._pipeline()
|
|
stream.invalidate_pending_updates.return_value = []
|
|
assert pipeline.refresh_updated_plugins() is False
|
|
|
|
def test_refresh_never_raises_into_the_render_loop(self):
|
|
pipeline, stream = self._pipeline()
|
|
stream.invalidate_pending_updates.side_effect = RuntimeError('boom')
|
|
assert pipeline.refresh_updated_plugins() is False
|
|
|
|
def test_refresh_does_not_reposition_the_scroll(self):
|
|
# The whole point of preferring this over hot_swap_content(): that path
|
|
# rebuilds and repositions, which reads as a freeze then a jump.
|
|
pipeline, stream = self._pipeline()
|
|
stream.invalidate_pending_updates.return_value = ['baseball']
|
|
pipeline.scroll_helper.scroll_position = 1234
|
|
|
|
pipeline.refresh_updated_plugins()
|
|
|
|
assert pipeline.scroll_helper.scroll_position == 1234
|
|
stream.process_updates.assert_not_called()
|
|
|
|
|
|
class TestCoordinatorWiring:
|
|
"""
|
|
The regression itself: continuous mode has to *call* the refresh.
|
|
|
|
should_recompose()/hot_swap_content() sit in the non-continuous branch, and
|
|
continuous_scroll defaults to True, so before this fix the refresh was
|
|
simply never reached on a default install.
|
|
"""
|
|
|
|
def _coordinator(self, continuous):
|
|
import threading
|
|
|
|
from src.vegas_mode.coordinator import VegasModeCoordinator
|
|
|
|
config = VegasModeConfig()
|
|
config.continuous_scroll = continuous
|
|
# Built without __init__ so the test exercises run_frame's branching
|
|
# without standing up a display, stream and render stack.
|
|
coordinator = VegasModeCoordinator.__new__(VegasModeCoordinator)
|
|
coordinator.vegas_config = config
|
|
coordinator.render_pipeline = MagicMock()
|
|
coordinator.render_pipeline.has_deferred.return_value = False
|
|
coordinator.render_pipeline.needs_extension.return_value = False
|
|
coordinator.render_pipeline.is_cycle_complete.return_value = False
|
|
coordinator.render_pipeline.should_recompose.return_value = False
|
|
coordinator.stream_manager = MagicMock()
|
|
coordinator.stats = {'cycles_completed': 0}
|
|
coordinator._state_lock = threading.Lock()
|
|
coordinator._is_active = True
|
|
coordinator._is_paused = False
|
|
coordinator._should_stop = False
|
|
coordinator._pending_config_update = False
|
|
coordinator._live_priority_check = None
|
|
coordinator._interrupt_check = None
|
|
coordinator.sync_manager = None
|
|
return coordinator
|
|
|
|
def test_continuous_mode_refreshes_updated_plugins_every_frame(self):
|
|
coordinator = self._coordinator(continuous=True)
|
|
coordinator.run_frame()
|
|
coordinator.render_pipeline.refresh_updated_plugins.assert_called_once()
|
|
|
|
def test_continuous_mode_does_not_use_the_disruptive_swap(self):
|
|
coordinator = self._coordinator(continuous=True)
|
|
coordinator.run_frame()
|
|
coordinator.render_pipeline.hot_swap_content.assert_not_called()
|
|
|
|
def test_swap_mode_still_uses_hot_swap(self):
|
|
# The non-continuous path must keep its original behaviour.
|
|
coordinator = self._coordinator(continuous=False)
|
|
coordinator.render_pipeline.should_recompose.return_value = True
|
|
coordinator.run_frame()
|
|
coordinator.render_pipeline.hot_swap_content.assert_called_once()
|
|
coordinator.render_pipeline.refresh_updated_plugins.assert_not_called()
|
|
|
|
def test_a_frame_is_still_rendered_either_way(self):
|
|
for continuous in (True, False):
|
|
coordinator = self._coordinator(continuous=continuous)
|
|
coordinator.run_frame()
|
|
coordinator.render_pipeline.render_frame.assert_called_once()
|