mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
ChuckandClaude Opus 5.5
7ab6fb1aff
The web process built its own PluginManager and loaded plugins into itself: store installs and updates loaded or reloaded a web-side copy, and config saves and enable/disable called on_config_change, on_enable and on_disable on it. None of that reached the panel, and /plugins/installed reported runtime state from those copies. - Add PluginCatalog (src/plugin_system/plugin_catalog.py): manifests, directories, display modes, installed version, schema and config reads, with no way to run a plugin. app.py and both blueprints use it; the plugin_manager blueprint attribute is gone. - Remove every lifecycle call from the web routes. Config changes already reach the display through ConfigService (on_config_change) and the enabled-set reconcile. - Health and metrics readers move to api_v3.health_tracker / resource_monitor. /plugins/installed reports loaded/state/error_info as null (the display does not publish them) and enabled by the display's rule. - Store install, update and uninstall answer restart_required when the running display will not pick the change up by itself (display_restart_required). The restart banner follows the flag via window.noteRestartRequired instead of the /config/main URL heuristic; /config/main now sends restart_required: true. - The one remaining in-process import of plugin code (Starlark helper modules, oauth_flow action scripts) goes through _import_plugin_code_in_web_process() until a web-entry contract. - /plugins/installed reports vegas_participation (from #682) from the user's setting or the manifest, with vegas_participation_source; when only the plugin's code decides it, null with source 'runtime', since the web process no longer has plugin instances to ask. - Check & Update All keeps its restart flags when the final list refresh fails, and asks for a restart when an enabled plugin's first request got no answer and the re-sent one found it up to date. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
82 lines
2.8 KiB
Python
82 lines
2.8 KiB
Python
"""Resource limits are validated before the monitor uses them.
|
|
|
|
POST /plugins/limits/<id> built ResourceLimits straight from the request
|
|
JSON, and get_limits() did ``ResourceLimits(**cached)``. A dataclass does not
|
|
check its annotations, so ``{"max_execution_time": "5"}`` was stored as a
|
|
string and every later monitored update() of that plugin raised TypeError
|
|
comparing a float with it -- and an unknown key in the cached record raised
|
|
TypeError on load.
|
|
"""
|
|
|
|
import sys
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, str(Path(__file__).parent.parent))
|
|
|
|
from src.plugin_system.resource_monitor import ( # noqa: E402
|
|
PluginResourceMonitor,
|
|
)
|
|
from test._api_v3_test_helpers import api_v3_client, api_v3_module # noqa: F401,E402
|
|
|
|
|
|
class SharedCache:
|
|
def __init__(self):
|
|
self.entries = {}
|
|
|
|
def get(self, key, max_age=None, memory_ttl=None):
|
|
return self.entries.get(key)
|
|
|
|
def set(self, key, value, *args, **kwargs):
|
|
self.entries[key] = value
|
|
|
|
def delete(self, key):
|
|
self.entries.pop(key, None)
|
|
|
|
|
|
@pytest.fixture
|
|
def shared_cache(api_v3_module):
|
|
cache = SharedCache()
|
|
api_v3_module.api_v3.resource_monitor = PluginResourceMonitor(
|
|
cache, enable_monitoring=False)
|
|
return cache
|
|
|
|
|
|
@pytest.mark.parametrize("body", [
|
|
{"max_execution_time": "5"},
|
|
{"max_memory_mb": -1},
|
|
{"max_cpu_percent": True},
|
|
{"warning_threshold": "high"},
|
|
{"max_execution_time": [1]},
|
|
])
|
|
def test_post_rejects_bad_limits_with_400(api_v3_client, shared_cache, body):
|
|
resp = api_v3_client.post("/api/v3/plugins/limits/weather", json=body)
|
|
assert resp.status_code == 400
|
|
assert resp.get_json()["status"] == "error"
|
|
assert "plugin_limits:weather" not in shared_cache.entries
|
|
|
|
|
|
def test_post_accepts_numbers_and_nulls(api_v3_client, shared_cache):
|
|
resp = api_v3_client.post("/api/v3/plugins/limits/weather", json={
|
|
"max_memory_mb": 50, "max_cpu_percent": None, "max_execution_time": 5.0})
|
|
assert resp.status_code == 200
|
|
data = api_v3_client.get("/api/v3/plugins/limits/weather").get_json()["data"]
|
|
assert data == {"max_memory_mb": 50, "max_cpu_percent": None,
|
|
"max_execution_time": 5.0, "warning_threshold": 0.8}
|
|
|
|
|
|
@pytest.mark.parametrize("cached", [
|
|
{"max_execution_time": "5"},
|
|
{"max_execution_time": 5.0, "consecutive_failures": 3},
|
|
])
|
|
def test_bad_cached_limits_do_not_break_monitored_calls(cached):
|
|
cache = MagicMock()
|
|
cache.get.side_effect = lambda key, **kw: cached if key == "plugin_limits:p" else None
|
|
mon = PluginResourceMonitor(cache, enable_monitoring=False)
|
|
|
|
# Unknown keys are dropped; a malformed value means "no limits".
|
|
assert mon.monitor_call("p", lambda: "ok") == "ok"
|
|
assert mon.monitor_call("p", lambda: "ok") == "ok"
|