ed
7bcb5a8c07
Eliminates 22 call sites that bypassed the AppController state owner
and read/wrote config.toml directly. AppController is now the single
source of truth for self.config; gui_2.py, commands.py, etc. go
through controller.save_config() / controller.load_config().
Production changes:
- src/models.py: rename load_config -> _load_config_from_disk,
save_config -> _save_config_to_disk (private I/O primitives)
- src/app_controller.py: add public load_config()/save_config() methods
that own the state. Update 3 internal call sites and 3 ConductorEngine
call sites to pass max_workers from self.config
- src/multi_agent_conductor.py: ConductorEngine.__init__ now takes
max_workers as a parameter (caller responsibility, not I/O primitive)
- src/external_editor.py: get_default_launcher() takes config as a
parameter; gui_2.py:1311,4776 pass app.config
- src/gui_2.py: 17 sites of models.save_config(X.config) replaced with
X.save_config() (delegates via __getattr__ to controller)
- src/commands.py: save_all() uses app.save_config()
Test changes (route through controller, not I/O primitive):
- tests/conftest.py: mock_app and app_instance fixtures now patch
AppController.load_config/save_config instead of models I/O primitives
- 18 other test files: patches renamed from models._save_config_to_disk
to AppController.save_config (and same for load_config)
- tests/test_app_controller_mcp.py: use SLOP_CONFIG env var instead of
patching removed CONFIG_PATH module constant
- tests/test_parallel_execution.py: pass max_workers=2 explicitly to
ConductorEngine (caller no longer reads config)
- tests/test_gui_paths.py: add save_config=MagicMock() to MockApp;
assert on controller method, not I/O primitive
- tests/test_models_no_top_level_tomli_w.py: still calls private
_save_config_to_disk directly (the only allowed exception; tests
the lazy-load behavior of the primitive itself)
New files:
- scripts/audit_no_models_config_io.py: enforces the rule (--strict,
--json modes; AST-based docstring detection to avoid false positives)
- conductor/code_styleguides/config_state_owner.md: documents the rule
Verification:
- 67 targeted tests pass
- scripts/audit_no_models_config_io.py --strict returns 0
This is the architectural cleanup that surfaced during the
audit_architectural_cheats_20260607 review. Closes the smoke-gun
CONFIG_PATH module constant (already done in 0c7ebf22) AND the
free-function models.load_config/save_config smell.
[conductor(checkpoint): config-iO-refactor-20260607]
76 lines
2.0 KiB
Python
76 lines
2.0 KiB
Python
import pytest
|
|
from unittest.mock import patch
|
|
from typing import Any
|
|
from src.gui_2 import App
|
|
|
|
|
|
@pytest.fixture
|
|
def app_instance() -> Any:
|
|
with (
|
|
patch("src.app_controller.AppController.load_config", return_value={"ai": {}, "projects": {}}),
|
|
patch("src.app_controller.AppController.save_config"),
|
|
patch("src.gui_2.project_manager"),
|
|
patch("src.app_controller.project_manager") as mock_pm,
|
|
patch("src.gui_2.session_logger"),
|
|
patch("src.gui_2.immapp.run"),
|
|
patch("src.app_controller.AppController._load_active_project"),
|
|
patch("src.app_controller.AppController._fetch_models"),
|
|
patch.object(App, "_load_fonts"),
|
|
patch.object(App, "_post_init"),
|
|
patch("src.app_controller.AppController._prune_old_logs"),
|
|
patch("src.app_controller.AppController.start_services"),
|
|
patch("src.app_controller.AppController._init_ai_and_hooks"),
|
|
):
|
|
app = App()
|
|
app.project = {}
|
|
app.ui_files_base_dir = "."
|
|
yield app, mock_pm
|
|
|
|
|
|
def test_mma_dashboard_refresh(app_instance: Any) -> None:
|
|
app, mock_pm = app_instance
|
|
mock_tracks = [
|
|
{
|
|
"id": "track_1",
|
|
"title": "Track 1",
|
|
"status": "new",
|
|
"complete": 0,
|
|
"total": 0,
|
|
"progress": 0.0,
|
|
},
|
|
{
|
|
"id": "track_2",
|
|
"title": "Track 2",
|
|
"status": "new",
|
|
"complete": 0,
|
|
"total": 0,
|
|
"progress": 0.0,
|
|
},
|
|
]
|
|
mock_pm.get_all_tracks.return_value = mock_tracks
|
|
app._refresh_from_project()
|
|
assert hasattr(app, "tracks"), "App instance should have a 'tracks' attribute"
|
|
assert app.tracks == mock_tracks
|
|
assert len(app.tracks) == 2
|
|
assert app.tracks[0]["id"] == "track_1"
|
|
assert app.tracks[1]["id"] == "track_2"
|
|
mock_pm.get_all_tracks.assert_called_with(app.active_project_root)
|
|
|
|
|
|
def test_mma_dashboard_initialization_refresh(app_instance: Any) -> None:
|
|
app, mock_pm = app_instance
|
|
mock_tracks = [
|
|
{
|
|
"id": "init_track",
|
|
"title": "Initial Track",
|
|
"status": "new",
|
|
"complete": 0,
|
|
"total": 0,
|
|
"progress": 0.0,
|
|
}
|
|
]
|
|
mock_pm.get_all_tracks.return_value = mock_tracks
|
|
app._refresh_from_project()
|
|
assert app.tracks == mock_tracks
|
|
assert app.tracks[0]["id"] == "init_track"
|