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]
73 lines
2.3 KiB
Python
73 lines
2.3 KiB
Python
import pytest
|
|
from typing import Any
|
|
import sys
|
|
import os
|
|
|
|
# Ensure project root is in path
|
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
|
|
|
|
from src.gui_2 import App
|
|
|
|
def test_new_hubs_defined_in_show_windows(mock_app: App) -> None:
|
|
"""
|
|
|
|
|
|
Verifies that the new consolidated Hub windows are defined in the App's show_windows.
|
|
This ensures they will be available in the 'Windows' menu.
|
|
"""
|
|
expected_hubs = [
|
|
"Project Settings",
|
|
"AI Settings",
|
|
"Discussion Hub",
|
|
"Operations Hub",
|
|
]
|
|
for hub in expected_hubs:
|
|
assert hub in mock_app.show_windows, f"Expected window {hub} not found in show_windows"
|
|
|
|
def test_old_windows_removed_from_gui2(app_instance_simple: Any) -> None:
|
|
"""
|
|
|
|
|
|
Verifies that the old fragmented windows are removed or renamed.
|
|
"""
|
|
old_tags = [
|
|
"win_projects", "win_files", "win_screenshots",
|
|
"win_provider", "win_system_prompts",
|
|
"win_discussion", "win_message", "win_response",
|
|
"win_comms", "win_tool_log"
|
|
]
|
|
for tag in old_tags:
|
|
# gui_2 doesn't use these tags at all in show_windows
|
|
assert tag not in app_instance_simple.show_windows, f"Old window tag {tag} should not be in show_windows"
|
|
|
|
@pytest.fixture
|
|
def app_instance_simple() -> Any:
|
|
from unittest.mock import patch
|
|
from src.gui_2 import App
|
|
with patch('src.app_controller.AppController.load_config', return_value={'ai': {}, 'projects': {}, 'gui': {'show_windows': {}}}), \
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'), \
|
|
patch('src.app_controller.AppController._fetch_models'), \
|
|
patch('src.app_controller.AppController._prune_old_logs'), \
|
|
patch('src.app_controller.AppController.start_services'):
|
|
app = App()
|
|
return app
|
|
|
|
def test_hub_windows_exist_in_gui2(app_instance_simple: Any) -> None:
|
|
"""
|
|
|
|
|
|
Verifies that the new Hub windows are present in the show_windows dictionary.
|
|
"""
|
|
hubs = ["Project Settings", "AI Settings", "Discussion Hub", "Operations Hub"]
|
|
for hub in hubs:
|
|
assert hub in app_instance_simple.show_windows
|
|
|
|
def test_indicators_logic_exists(app_instance_simple: Any) -> None:
|
|
"""
|
|
|
|
|
|
Verifies that the status indicators logic exists in the App.
|
|
"""
|
|
assert hasattr(app_instance_simple, 'ai_status')
|
|
assert hasattr(app_instance_simple, 'mma_status') |