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]
80 lines
2.8 KiB
Python
80 lines
2.8 KiB
Python
import pytest
|
|
from unittest.mock import MagicMock, patch
|
|
from src.gui_2 import App
|
|
from src.events import UserRequestEvent
|
|
|
|
@pytest.fixture
|
|
def mock_gui() -> App:
|
|
with (
|
|
patch('src.app_controller.AppController.load_config', return_value={
|
|
"ai": {"provider": "gemini", "model": "model-1"},
|
|
"projects": {"paths": [], "active": ""},
|
|
"gui": {"show_windows": {}}
|
|
}),
|
|
patch('src.project_manager.load_project', return_value={}),
|
|
patch('src.project_manager.migrate_from_legacy_config', return_value={}),
|
|
patch('src.project_manager.save_project'),
|
|
patch('src.session_logger.open_session'),
|
|
patch('src.session_logger.reset_session'),
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'),
|
|
patch('src.app_controller.AppController._fetch_models')
|
|
):
|
|
gui = App()
|
|
return gui
|
|
|
|
def test_handle_generate_send_pushes_event(mock_gui: App) -> None:
|
|
mock_gui.controller._do_generate = MagicMock(return_value=(
|
|
"full_md", "path", [], "stable_md", "disc_text"
|
|
))
|
|
mock_gui.controller.ui_ai_input = "test prompt"
|
|
mock_gui.controller.ui_files_base_dir = "."
|
|
# Mock event_queue.put
|
|
mock_gui.controller.event_queue.put = MagicMock()
|
|
|
|
# No need to mock asyncio.run_coroutine_threadsafe now, it's a standard thread
|
|
# Production code: self._io_pool.submit_io(worker) (see
|
|
# src/app_controller.py:_handle_generate_send). Patch submit_io
|
|
# to capture the worker function instead of the io_pool's
|
|
# background thread, so we can run the worker synchronously.
|
|
with patch.object(mock_gui.controller, 'submit_io') as mock_submit:
|
|
# Verify a job was submitted to the io_pool
|
|
mock_gui.controller._handle_generate_send()
|
|
mock_gui.controller._handle_generate_send()
|
|
print(f"[DBG] mock_submit.called: {mock_submit.called}", file=__import__('sys').stderr)
|
|
target_worker = mock_submit.call_args[0][0]
|
|
target_worker()
|
|
|
|
# Verify the call to event_queue.put occurred.
|
|
mock_gui.controller.event_queue.put.assert_called_once()
|
|
args, kwargs = mock_gui.controller.event_queue.put.call_args
|
|
assert args[0] == "user_request"
|
|
event = args[1]
|
|
assert isinstance(event, UserRequestEvent)
|
|
assert event.prompt == "test prompt"
|
|
assert event.stable_md == "stable_md"
|
|
assert event.disc_text == "disc_text"
|
|
assert event.base_dir == "."
|
|
|
|
def test_user_request_event_payload() -> None:
|
|
payload = UserRequestEvent(
|
|
prompt="hello",
|
|
stable_md="md",
|
|
file_items=[],
|
|
disc_text="disc",
|
|
base_dir="."
|
|
)
|
|
d = payload.to_dict()
|
|
assert d["prompt"] == "hello"
|
|
assert d["stable_md"] == "md"
|
|
assert d["file_items"] == []
|
|
assert d["disc_text"] == "disc"
|
|
assert d["base_dir"] == "."
|
|
|
|
def test_sync_event_queue() -> None:
|
|
from src.events import SyncEventQueue
|
|
q = SyncEventQueue()
|
|
q.put("test_event", {"data": 123})
|
|
name, payload = q.get()
|
|
assert name == "test_event"
|
|
assert payload["data"] == 123
|