mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-05 06:45:09 +00:00
refactor: delete dead Python code in the core (and stop storing Wi-Fi passwords) (#608)
* refactor(plugins): remove the no-op PluginHealthMonitor Its monitor loop did nothing (`if callbacks: pass`), register_health_check had no callers and api_v3.health_monitor was never read by any route. The live health data comes from PluginHealthTracker, which is untouched. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(store): drop the never-set uninstall tombstones Nothing in production called mark_recently_uninstalled, so the reconciler's was_recently_uninstalled check was always False. The persistent uninstall registry is what actually stops resurrection; the reconciler test now exercises that gate instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(common): delete unused config/display/game helpers, utils and error_handler Nothing in core, the web UI, scripts or the plugin monorepo imports config_helper, display_helper, game_helper, utils or error_handler; only their own tests did. The error_handler re-exports leave src.common's __all__; APIHelper, TextHelper, ScrollHelper, LogoHelper and the adaptive layout exports are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(config): drop ConfigService's unused versioning and save API ConfigVersion, get_version/get_version_history/get_version_config, rollback, save_config, reload, get_plugin_config and the backward-compat load_config/get_config_path/get_secrets_path had no callers. The display controller only uses get_config, subscribe, unsubscribe and shutdown, plus the file watcher. Change detection now compares against the current checksum instead of the last history entry. The subscriber tests asserted `callback.called or True`; they now reload the way the watcher does and assert the notification. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): drop unread plugin state history and callbacks plugin_state.PluginStateManager kept a bounded per-plugin transition history that only get_state_history (tests only) read; get_state_info reports a separate lifetime count, which stays. set_error_info and record_display had no callers, and set_state_with_error's `error` argument only fed the history. The web-side state_manager.PluginStateManager loses subscribe_to_state_changes, _notify_callbacks, set_plugin_error and get_state_version, none of which had callers; with no subscribers the old-state copy in update_plugin_state went with them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): remove unused PluginManager methods and attribute guards update_all_plugins was only called by a test (the display loop uses run_scheduled_updates); get_plugin_health_metrics, get_plugin_resource_metrics and get_plugin_state had no callers; and plugin_modules was written but never read. plugin_directories is now initialised in __init__, so the hasattr() guards around it go. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): remove unused executor, loader, store and package helpers - PluginExecutor.execute_safe: no callers. - PluginLoader._parse_semver: only its own tests; compatibility.parse_semver is the live copy and test_compatibility.py already covers it. - PluginStoreManager.get_installed_plugin_info: no callers. - PluginResourceMonitor._local: never read. - src.plugin_system.get_store_manager and __api_version__: no importers in core, scripts or the plugin monorepo. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): stop storing Wi-Fi passwords in wifi_config.json WiFiManager appended every joined network's SSID and password, in plaintext, to saved_networks in config/wifi_config.json, and nothing (web UI, backup restore, scripts) ever read them back: NetworkManager keeps its own credentials. The writes are gone, and loading the config now drops any saved_networks key and rewrites the file, so passwords already on disk are scrubbed. Also removes _check_dnsmasq_conflict (never called) and _detect_trixie, whose result only reached one log line, along with the NM_CONNECTIONS_PATHS constant only it used. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(display): remove unreachable and unused DisplayController code - _follower_rebuild_scroll_image: never called. - mode_duration (never read) and last_mode_change (write-only). - The `chosen_cap <= 0` branch: chosen_cap is either the minimum of caps already filtered to > 0 or DEFAULT_DYNAMIC_DURATION_CAP (180). - The `max_duration < min_duration` branch directly after `max_duration = max(min_duration, max_duration)`. - The circuit-breaker branch's `display_result = False` and `manager_to_display = None`: the first is overwritten a few lines later, the second is already None there. - The bool-to-bool conversion of execute_display's result, which is always a bool. - The `loaded_plugins` lookup in _update_modules: PluginManager has no such attribute, so it always fell through to `plugins`. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(vegas): remove unused config update, boundary finder and refresh VegasModeConfig.update had no callers outside its own tests (the coordinator rebuilds the config with from_config on a change); geometry.find_item_boundary and StreamManager._refresh_plugin_content had no callers at all. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(run): drop the debug block that pretended to import the plugin system In debug mode run.py put src/plugin_system itself on sys.path and printed "Plugin system import successful" without importing anything. Nothing imports plugin_system modules by bare name, so the path entry did nothing either. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: delete tests that test nothing - test/plugins/test_{basketball_scoreboard,calendar,clock_simple, odds_ticker,soccer_scoreboard,text_display}.py skip everywhere the named plugins are not installed, including CI (LEDMATRIX_PLUGINS_DIR holds only the fixture plugin); test_plugin_matrix.py already covers every discovered plugin. Their PluginTestBase and the fixtures only it used (plugins_dir, mock_display_manager, mock_cache_manager, mock_plugin_manager, base_plugin_config in test/plugins/conftest.py) go with them. - test_plugin_system.py: test_discover_plugins (body was `pass`) and test_dependency_check (a comment), plus the test_plugin_manager fixture only the former requested. - test_display_manager.py: test_draw_image asserted that an image it had just assigned was not None. - test_display_controller.py: the rotation and schedule-override tests re-implemented the run-loop arithmetic inline and asserted on their own result without calling the controller. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: expect one plugin_last_update success stamp after update_all_plugins EveryStampRecordsACompletion required at least two success-path stamps; the second was update_all_plugins, removed as test-only. The worker and synchronous paths share the remaining stamp in _execute_update_now, and the check that every stamp calls _note_update_completed is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+10
-187
@@ -1,12 +1,11 @@
|
||||
"""
|
||||
Configuration Service
|
||||
|
||||
Provides centralized configuration management with hot-reload support,
|
||||
versioning, and change notifications.
|
||||
Provides centralized configuration management with hot-reload support
|
||||
and change notifications.
|
||||
|
||||
This service wraps ConfigManager and adds:
|
||||
- File watching for automatic reload
|
||||
- Configuration versioning
|
||||
- Change notifications to subscribers
|
||||
- Thread-safe configuration access
|
||||
"""
|
||||
@@ -16,7 +15,6 @@ import time
|
||||
import threading
|
||||
from pathlib import Path
|
||||
from typing import Dict, Any, Optional, List, Callable
|
||||
from datetime import datetime
|
||||
from collections import defaultdict
|
||||
import logging
|
||||
import hashlib
|
||||
@@ -26,51 +24,20 @@ from src.logging_config import get_logger
|
||||
from src.config_manager import ConfigManager
|
||||
|
||||
|
||||
class ConfigVersion:
|
||||
"""Represents a configuration version snapshot."""
|
||||
|
||||
def __init__(self, config: Dict[str, Any], version: int, timestamp: datetime, checksum: str):
|
||||
"""
|
||||
Initialize a configuration version.
|
||||
|
||||
Args:
|
||||
config: Configuration dictionary
|
||||
version: Version number
|
||||
timestamp: When this version was created
|
||||
checksum: SHA-256 hex digest of the config (for change detection)
|
||||
"""
|
||||
self.config: Dict[str, Any] = config
|
||||
self.version: int = version
|
||||
self.timestamp: datetime = timestamp
|
||||
self.checksum: str = checksum
|
||||
|
||||
def to_dict(self) -> Dict[str, Any]:
|
||||
"""Convert version to dictionary."""
|
||||
return {
|
||||
'version': self.version,
|
||||
'timestamp': self.timestamp.isoformat(),
|
||||
'checksum': self.checksum,
|
||||
'config_size': len(json.dumps(self.config))
|
||||
}
|
||||
|
||||
|
||||
class ConfigService:
|
||||
"""
|
||||
Centralized configuration service with hot-reload and versioning.
|
||||
Centralized configuration service with hot-reload.
|
||||
|
||||
Features:
|
||||
- Automatic file watching and reload
|
||||
- Configuration versioning with history
|
||||
- Change notifications to subscribers
|
||||
- Thread-safe access
|
||||
- Backward compatible with ConfigManager
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
config_manager: Optional[ConfigManager] = None,
|
||||
enable_hot_reload: bool = True,
|
||||
max_versions: int = 10
|
||||
enable_hot_reload: bool = True
|
||||
) -> None:
|
||||
"""
|
||||
Initialize the configuration service.
|
||||
@@ -78,24 +45,19 @@ class ConfigService:
|
||||
Args:
|
||||
config_manager: Optional ConfigManager instance (creates new if None)
|
||||
enable_hot_reload: Whether to enable automatic file watching
|
||||
max_versions: Maximum number of versions to keep in history
|
||||
"""
|
||||
self.logger: logging.Logger = get_logger(__name__)
|
||||
self.config_manager: ConfigManager = config_manager or ConfigManager()
|
||||
self.enable_hot_reload: bool = enable_hot_reload
|
||||
self.max_versions: int = max_versions
|
||||
|
||||
# Thread safety
|
||||
self._lock: threading.RLock = threading.RLock()
|
||||
|
||||
# Current configuration
|
||||
self._current_config: Dict[str, Any] = {}
|
||||
self._current_version: int = 0
|
||||
self._current_checksum: Optional[str] = None
|
||||
self._last_modified: Dict[str, float] = {}
|
||||
|
||||
# Version history
|
||||
self._versions: List[ConfigVersion] = []
|
||||
|
||||
# Subscribers for change notifications
|
||||
# Format: {plugin_id or component_name: [callbacks]}
|
||||
self._subscribers: Dict[str, List[Callable[[Dict[str, Any], Dict[str, Any]], None]]] = defaultdict(list)
|
||||
@@ -130,40 +92,22 @@ class ConfigService:
|
||||
|
||||
with self._lock:
|
||||
# Check if config actually changed
|
||||
if self._current_version > 0:
|
||||
old_checksum = self._versions[-1].checksum if self._versions else ""
|
||||
if new_checksum == old_checksum:
|
||||
self.logger.debug("Configuration unchanged, skipping reload")
|
||||
return False
|
||||
if new_checksum == self._current_checksum:
|
||||
self.logger.debug("Configuration unchanged, skipping reload")
|
||||
return False
|
||||
|
||||
# Store old config for change detection
|
||||
old_config = self._current_config.copy()
|
||||
|
||||
# Create new version
|
||||
self._current_version += 1
|
||||
version = ConfigVersion(
|
||||
config=new_config.copy(),
|
||||
version=self._current_version,
|
||||
timestamp=datetime.now(),
|
||||
checksum=new_checksum
|
||||
)
|
||||
|
||||
# Add to history
|
||||
self._versions.append(version)
|
||||
|
||||
# Trim history if needed
|
||||
if len(self._versions) > self.max_versions:
|
||||
self._versions.pop(0)
|
||||
|
||||
# Update current config
|
||||
self._current_config = new_config
|
||||
self._current_checksum = new_checksum
|
||||
|
||||
# Notify subscribers
|
||||
self._notify_subscribers(old_config, new_config)
|
||||
|
||||
self.logger.info(
|
||||
"Configuration reloaded (version %d, checksum: %s)",
|
||||
self._current_version,
|
||||
"Configuration reloaded (checksum: %s)",
|
||||
new_checksum[:8]
|
||||
)
|
||||
|
||||
@@ -303,19 +247,6 @@ class ConfigService:
|
||||
with self._lock:
|
||||
return self._current_config.copy()
|
||||
|
||||
def get_plugin_config(self, plugin_id: str) -> Dict[str, Any]:
|
||||
"""
|
||||
Get configuration for a specific plugin.
|
||||
|
||||
Args:
|
||||
plugin_id: Plugin identifier
|
||||
|
||||
Returns:
|
||||
Plugin configuration dictionary
|
||||
"""
|
||||
config = self.get_config()
|
||||
return config.get(plugin_id, {})
|
||||
|
||||
def subscribe(
|
||||
self,
|
||||
callback: Callable[[Dict[str, Any], Dict[str, Any]], None],
|
||||
@@ -354,95 +285,6 @@ class ConfigService:
|
||||
self._subscribers[key].remove(callback)
|
||||
self.logger.debug("Unsubscribed from config changes for %s", key)
|
||||
|
||||
def reload(self) -> bool:
|
||||
"""
|
||||
Manually reload configuration.
|
||||
|
||||
Returns:
|
||||
True if reloaded successfully, False otherwise
|
||||
"""
|
||||
self.logger.info("Manual configuration reload requested")
|
||||
return self._load_config()
|
||||
|
||||
def get_version(self) -> int:
|
||||
"""
|
||||
Get current configuration version.
|
||||
|
||||
Returns:
|
||||
Current version number
|
||||
"""
|
||||
with self._lock:
|
||||
return self._current_version
|
||||
|
||||
def get_version_history(self) -> List[Dict[str, Any]]:
|
||||
"""
|
||||
Get configuration version history.
|
||||
|
||||
Returns:
|
||||
List of version dictionaries
|
||||
"""
|
||||
with self._lock:
|
||||
return [v.to_dict() for v in self._versions]
|
||||
|
||||
def get_version_config(self, version: int) -> Optional[Dict[str, Any]]:
|
||||
"""
|
||||
Get configuration for a specific version.
|
||||
|
||||
Args:
|
||||
version: Version number
|
||||
|
||||
Returns:
|
||||
Configuration dictionary or None if version not found
|
||||
"""
|
||||
with self._lock:
|
||||
for v in self._versions:
|
||||
if v.version == version:
|
||||
return v.config.copy()
|
||||
return None
|
||||
|
||||
def rollback(self, version: int) -> bool:
|
||||
"""
|
||||
Rollback to a previous configuration version.
|
||||
|
||||
Args:
|
||||
version: Version number to rollback to
|
||||
|
||||
Returns:
|
||||
True if rollback successful, False otherwise
|
||||
"""
|
||||
config = self.get_version_config(version)
|
||||
if config is None:
|
||||
self.logger.error("Version %d not found in history", version)
|
||||
return False
|
||||
|
||||
try:
|
||||
# Save the rolled-back config
|
||||
self.config_manager.save_config(config)
|
||||
|
||||
# Reload
|
||||
return self._load_config()
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error("Error rolling back to version %d: %s", version, e, exc_info=True)
|
||||
return False
|
||||
|
||||
def save_config(self, new_config: Dict[str, Any]) -> bool:
|
||||
"""
|
||||
Save new configuration.
|
||||
|
||||
Args:
|
||||
new_config: New configuration dictionary
|
||||
|
||||
Returns:
|
||||
True if saved successfully, False otherwise
|
||||
"""
|
||||
try:
|
||||
self.config_manager.save_config(new_config)
|
||||
return self._load_config()
|
||||
except Exception as e:
|
||||
self.logger.error("Error saving configuration: %s", e, exc_info=True)
|
||||
return False
|
||||
|
||||
def shutdown(self) -> None:
|
||||
"""Shutdown the configuration service."""
|
||||
self.logger.info("Shutting down configuration service")
|
||||
@@ -450,22 +292,3 @@ class ConfigService:
|
||||
|
||||
with self._lock:
|
||||
self._subscribers.clear()
|
||||
|
||||
# Backward compatibility methods
|
||||
def load_config(self) -> Dict[str, Any]:
|
||||
"""
|
||||
Load configuration (backward compatibility with ConfigManager).
|
||||
|
||||
Returns:
|
||||
Current configuration dictionary
|
||||
"""
|
||||
return self.get_config()
|
||||
|
||||
def get_config_path(self) -> str:
|
||||
"""Get config file path (backward compatibility)."""
|
||||
return self.config_manager.get_config_path()
|
||||
|
||||
def get_secrets_path(self) -> str:
|
||||
"""Get secrets file path (backward compatibility)."""
|
||||
return self.config_manager.get_secrets_path()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user