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]
68 lines
3.0 KiB
Python
68 lines
3.0 KiB
Python
from typing import Generator
|
|
import pytest
|
|
from unittest.mock import patch, Mock
|
|
from src import ai_client
|
|
from src.gui_2 import App
|
|
|
|
@pytest.fixture
|
|
def app_instance() -> Generator[App, None, None]:
|
|
with (
|
|
patch('src.app_controller.AppController.load_config', return_value={'ai': {'provider': 'gemini', 'model': 'gemini-2.5-flash-lite'}, 'projects': {}}),
|
|
patch('src.app_controller.AppController.save_config'),
|
|
patch('src.gui_2.project_manager'),
|
|
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'),
|
|
# Do not patch _init_ai_and_hooks to ensure _settable_fields is initialized
|
|
patch('src.api_hooks.HookServer'),
|
|
patch('src.ai_client.set_provider'),
|
|
patch('src.ai_client.reset_session')
|
|
):
|
|
app = App()
|
|
yield app
|
|
|
|
def test_redundant_calls_in_process_pending_gui_tasks(app_instance: App) -> None:
|
|
app_instance.controller._pending_gui_tasks = [
|
|
{'action': 'set_value', 'item': 'current_provider', 'value': 'anthropic'}
|
|
]
|
|
with patch('src.ai_client.set_provider') as mock_set_provider, \
|
|
patch('src.ai_client.reset_session') as mock_reset_session:
|
|
app_instance.controller._process_pending_gui_tasks()
|
|
assert mock_set_provider.call_count == 1
|
|
assert mock_reset_session.call_count == 1
|
|
|
|
def test_gcli_path_updates_adapter(app_instance: App) -> None:
|
|
app_instance.controller.current_provider = 'gemini_cli'
|
|
app_instance.controller._pending_gui_tasks = [
|
|
{'action': 'set_value', 'item': 'gcli_path', 'value': '/new/path/to/gemini'}
|
|
]
|
|
# Initialize adapter if it doesn't exist (it shouldn't in mock env)
|
|
ai_client._gemini_cli_adapter = None
|
|
app_instance.controller._process_pending_gui_tasks()
|
|
assert ai_client._gemini_cli_adapter is not None
|
|
assert ai_client._gemini_cli_adapter.binary_path == '/new/path/to/gemini'
|
|
|
|
def test_process_pending_gui_tasks_drag(app_instance: App) -> None:
|
|
"""Test that the drag action is correctly processed and dispatches to the registered callback."""
|
|
mock_callback = Mock()
|
|
app_instance.controller._drag_actions["src_id"] = mock_callback
|
|
app_instance.controller._pending_gui_tasks = [
|
|
{"action": "drag", "src_item": "src_id", "dst_item": "dst_id"}
|
|
]
|
|
app_instance.controller._process_pending_gui_tasks()
|
|
mock_callback.assert_called_once_with(dst_item="dst_id")
|
|
|
|
def test_process_pending_gui_tasks_right_click(app_instance: App) -> None:
|
|
"""Test that the right_click action is correctly processed and dispatches to the registered callback."""
|
|
mock_callback = Mock()
|
|
app_instance.controller._right_clickable_actions["item_id"] = mock_callback
|
|
app_instance.controller._pending_gui_tasks = [
|
|
{"action": "right_click", "item": "item_id"}
|
|
]
|
|
app_instance.controller._process_pending_gui_tasks()
|
|
mock_callback.assert_called_once() |