mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
* fix(store): don't read a ZIP-installed plugin's remote from the LEDMatrix repo update_plugin looked up remote.origin.url with `git -C <plugin> config --local` for plugins that are not git checkouts. Under plugin-repos/ git walks up to the enclosing LEDMatrix repository, so the lookup returned LEDMatrix's own URL and a plugin missing from the registry was "reinstalled" from the LEDMatrix repo. Only ask git when the plugin directory has its own .git, the test _get_local_git_info already uses. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(schema): report each missing required field once, by name validate_config_against_schema ran its own required-fields loop after Draft7Validator.iter_errors, which already yields one `required` error per missing field, so every missing top-level field was listed twice. The validator's copy also printed the schema's whole `required` list ("Missing required property '['api_key', 'city']'") instead of the field. Drop the loop and take the field name from the error itself. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(store): stop mangling repository URLs that contain ".git" install_from_url and fetch_registry_from_url cleaned URLs with `rstrip('/').replace('.git', '')`, which removes ".git" anywhere: https://github.com/user/my.github.io became .../myhub.io, so installing or browsing that repository asked GitHub for one that does not exist. Add src/plugin_system/repo_urls.py with one anchored normalize_repo_url(), same_repo() for comparisons, github_owner_repo() and github_api_headers(), and use them for the five copies of the owner/repo parsing and GitHub headers in the store and for saved repositories. GitHub URLs are now recognised by urlparse().hostname everywhere: _get_latest_commit_info used a substring test, and _install_from_monorepo_api parsed any host. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(store): install a repository whose only branch is not main/master _install_via_git returned None both when every clone failed and when the last-resort clone of the repository's default branch succeeded. _install_plugin_impl papered over it with `and not plugin_path.exists()`; install_from_url did not, so a repository whose only branch is e.g. `develop` was cloned, then treated as a failure, then "downloaded" from main/master archives that do not exist. After a default-branch clone, return the branch the clone checked out (read from .git/HEAD), so None means failure and nothing else, and give both callers the same `branch_used is None` fallback. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plugins): judge the memory limit on each call's own growth monitor_call stores `metrics.memory_mb = max(previous, growth)`, and _check_limits compared that high-water mark with max_memory_mb. It never decreases, so once one update() grew the process past the limit every later call raised ResourceLimitExceeded and the circuit breaker kept reopening. Pass the call's own RSS growth to _check_limits; keep the high-water mark for reporting and document what it measures. Remove ResourceMetrics.update_average_execution_time: nothing called it, and it overwrote the running total with the average. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plugins): reload_plugin re-reads the manifest from the discovered directory reload_plugin read `plugins_dir / plugin_id / "manifest.json"`, ignoring the discovery map and the plugin_dirs rules. For a plugin whose directory name differs from its manifest id the path did not exist, the re-read was skipped without a word, and the reload kept the stale manifest. Resolve the directory with find_plugin_directory, as load_plugin does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(plugins): drop the always-null last_display from plugin state info PluginStateManager reported `last_display` from `_last_display`, which nothing ever wrote, so it was null for every plugin. Recording it in PluginExecutor.execute_display would not help: get_state_info's only reader is the web process, whose PluginManager never calls display(). Remove the field, its dict and get_last_display() (no caller in core, the web UI or the plugin monorepo). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(store): share the rollback and requirements helpers, drop dead code - install_plugin and _reinstall_with_rollback set aside, discard and restore the old copy through _set_aside/_discard_backup/_restore_backup instead of two copies of the same blocks. - The loader and the store run the same pre-pip checks through contained_plugin_dir() and requirements_to_install() in plugin_loader. They still invoke pip differently (sys.executable -m pip vs. the sudo wrapper). `except (BrokenPipeError, OSError)` + `isinstance(e, OSError)` becomes `except OSError` checking errno.EPIPE. - load_module never returns None, so load_plugin's check is gone and the docstring says what it raises. - Remove the always-true JSONSCHEMA_AVAILABLE, the inline re-imports of re and permission_utils, the fake status_result object nobody reads, hasattr(git_error, 'cmd'), a redundant "merge conflict" test and `import traceback` (exc_info=True does it). - Correct comments: install_from_url names the directory for the caller's id when given (not always the manifest id), _get_local_git_info saves one git subprocess (not four), _enrich calls two helpers, search_plugins documents all its arguments, _find_plugin_path states its behaviour instead of a TODO, and history narration is gone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): tidy base_plugin, correct plugin_manager/state comments - base_plugin: drop the unused `import logging`; get_display_duration runs the instance value and the config value through one _positive_seconds() helper instead of two copies of the coercion; the 'static'/'none'/fallback branches of get_vegas_display_mode, which all returned FIXED_SEGMENT, are one; fix the mis-indented validate_config example; say that get_supported_vegas_modes/get_vegas_segment_width are not consulted by core (kept, plugins override them). - schema_manager: import expand_style_elements normally rather than swallowing an ImportError of a core module. - plugin_manager: the plugins directory is the configured one (plugin-repos/ by default), not plugins/; get_config() returns the live dict, not a copy, so the interval cache comments say what it saves. - state_manager: config_version and the file version are not used to detect corruption; say what they are. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): stop writing data/plugin_operations.json PluginOperationQueue wrote its finished-operation history to data/plugin_operations.json after every operation, and read it back only into its own in-memory list, which only get_operation_history() exposes -- and nothing calls that. The operation-history endpoint reads OperationHistory (data/operation_history.json). No code in src/, web_interface/, scripts/ or test/ reads the file. Drop the history_file/lazy_load parameters and the load/save code; the bounded in-memory history stays. web_interface/app.py and the integration test stop passing the removed arguments. An existing data/plugin_operations.json is left in place (data/* is gitignored). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): plugin-system Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
137 lines
4.4 KiB
Python
137 lines
4.4 KiB
Python
"""Plugin state transitions are counted, not stored.
|
|
|
|
`PluginStateManager` used to keep every transition in a per-plugin history on
|
|
the hot scheduling path (RUNNING on reserve, ENABLED on finish), but nothing
|
|
ever read the entries -- `get_state_info()` only reported how many there were.
|
|
It now keeps just that lifetime count, which `state_history_count` surfaces
|
|
through the web API.
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
import threading
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
|
|
|
from src.plugin_system.plugin_state import ( # noqa: E402
|
|
PluginState,
|
|
PluginStateManager,
|
|
)
|
|
|
|
|
|
def _cycle_updates(manager, plugin_id, cycles):
|
|
"""Drive the real scheduling path: RUNNING on reserve, ENABLED on finish."""
|
|
for _ in range(cycles):
|
|
manager.set_state(plugin_id, PluginState.RUNNING)
|
|
manager.set_state(plugin_id, PluginState.ENABLED)
|
|
|
|
|
|
def test_state_history_count_reports_lifetime_total():
|
|
"""`get_state_info()['state_history_count']` counts every transition."""
|
|
manager = PluginStateManager()
|
|
manager.set_state("clock", PluginState.ENABLED)
|
|
|
|
cycles = 4000
|
|
_cycle_updates(manager, "clock", cycles)
|
|
|
|
info = manager.get_state_info("clock")
|
|
assert info["state_history_count"] == 1 + cycles * 2
|
|
|
|
|
|
def test_error_transitions_are_counted():
|
|
"""set_state_with_error() is a transition too."""
|
|
manager = PluginStateManager()
|
|
manager.set_state("clock", PluginState.ENABLED)
|
|
manager.set_state_with_error(
|
|
"clock", PluginState.ENABLED, {"reason": "update timeout"}
|
|
)
|
|
|
|
info = manager.get_state_info("clock")
|
|
assert info["state_history_count"] == 2
|
|
assert info["error_info"] == {"reason": "update timeout"}
|
|
|
|
|
|
def test_count_is_isolated_per_plugin():
|
|
manager = PluginStateManager()
|
|
manager.set_state("clock", PluginState.ENABLED)
|
|
_cycle_updates(manager, "clock", 50)
|
|
manager.set_state("weather", PluginState.ENABLED)
|
|
|
|
assert manager.get_state_info("clock")["state_history_count"] == 101
|
|
assert manager.get_state_info("weather")["state_history_count"] == 1
|
|
|
|
|
|
def test_clear_state_drops_the_count():
|
|
"""Unloading a plugin still releases everything it accumulated."""
|
|
manager = PluginStateManager()
|
|
manager.set_state("clock", PluginState.ENABLED)
|
|
_cycle_updates(manager, "clock", 10)
|
|
|
|
manager.clear_state("clock")
|
|
|
|
info = manager.get_state_info("clock")
|
|
assert info["state"] == PluginState.UNLOADED.value
|
|
assert info["state_history_count"] == 0
|
|
|
|
|
|
def test_get_state_info_is_a_consistent_snapshot():
|
|
"""An unload running concurrently must not be observed half-done.
|
|
|
|
Each field used to be read under its own lock, so clear_state() could
|
|
interleave: 'state' read before the removal, 'state_history_count' after,
|
|
handing a caller a plugin that is ENABLED with zero transitions. The whole
|
|
payload is now built in one critical section.
|
|
"""
|
|
m = PluginStateManager()
|
|
_cycle_updates(m, "clock", 50)
|
|
|
|
inconsistent = []
|
|
stop = threading.Event()
|
|
|
|
def reader():
|
|
while not stop.is_set():
|
|
info = m.get_state_info("clock")
|
|
# Either fully present or fully cleared -- never a live state with
|
|
# a wiped count.
|
|
if info["state"] != PluginState.UNLOADED.value and \
|
|
info["state_history_count"] == 0:
|
|
inconsistent.append(info)
|
|
return
|
|
|
|
def clearer():
|
|
for _ in range(200):
|
|
for _ in range(20):
|
|
m.set_state("clock", PluginState.ENABLED)
|
|
m.clear_state("clock")
|
|
|
|
t = threading.Thread(target=reader, daemon=True)
|
|
t.start()
|
|
clearer()
|
|
stop.set()
|
|
t.join(timeout=5)
|
|
|
|
assert not inconsistent, f"observed a torn snapshot: {inconsistent[:1]}"
|
|
|
|
|
|
def test_state_info_reports_only_what_something_records():
|
|
"""No field that is always null.
|
|
|
|
``last_display`` was reported here, but nothing ever recorded a display()
|
|
call, so it was null for every plugin. Its only reader is the web process,
|
|
whose PluginManager never calls display(), so recording it in the display
|
|
process could not have filled it either.
|
|
"""
|
|
manager = PluginStateManager()
|
|
manager.set_state("clock", PluginState.ENABLED)
|
|
manager.record_update("clock")
|
|
|
|
info = manager.get_state_info("clock")
|
|
assert "last_display" not in info
|
|
assert info["last_update"] is not None
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(pytest.main([__file__, "-v"]))
|