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]
84 lines
2.6 KiB
Python
84 lines
2.6 KiB
Python
import pytest
|
|
from unittest.mock import MagicMock, patch
|
|
from pathlib import Path
|
|
from src.app_controller import AppController
|
|
from src.events import UserRequestEvent
|
|
from src import events
|
|
|
|
@pytest.fixture
|
|
def controller():
|
|
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')
|
|
):
|
|
c = AppController()
|
|
# Mock necessary state
|
|
c.ui_files_base_dir = "."
|
|
c.event_queue = MagicMock()
|
|
return c
|
|
|
|
def test_handle_request_event_appends_definitions(controller):
|
|
# Setup
|
|
file_items = [{"path": "src/models.py", "entry": "src/models.py"}]
|
|
event = UserRequestEvent(
|
|
prompt="Explain @Track object",
|
|
stable_md="stable_md",
|
|
file_items=file_items,
|
|
disc_text="disc_text",
|
|
base_dir="."
|
|
)
|
|
|
|
# Mock symbol helpers
|
|
with (
|
|
patch('src.app_controller.parse_symbols', return_value=["Track"]) as mock_parse,
|
|
patch('src.app_controller.get_symbol_definition', return_value=("src/models.py", "class Track: pass", 42)) as mock_get_def,
|
|
patch('src.ai_client.send') as mock_send
|
|
):
|
|
# Execute
|
|
controller._handle_request_event(event)
|
|
|
|
# Verify
|
|
mock_parse.assert_called_once_with("Explain @Track object")
|
|
mock_get_def.assert_called_once()
|
|
|
|
# Check if enriched prompt was sent to AI
|
|
expected_suffix = "\n\n[Definition: Track from src/models.py (line 42)]\n```python\nclass Track: pass\n```"
|
|
mock_send.assert_called_once()
|
|
args, kwargs = mock_send.call_args
|
|
sent_prompt = args[1]
|
|
assert sent_prompt == "Explain @Track object" + expected_suffix
|
|
|
|
def test_handle_request_event_no_symbols(controller):
|
|
# Setup
|
|
file_items = [{"path": "src/models.py", "entry": "src/models.py"}]
|
|
event = UserRequestEvent(
|
|
prompt="Just a normal prompt",
|
|
stable_md="stable_md",
|
|
file_items=file_items,
|
|
disc_text="disc_text",
|
|
base_dir="."
|
|
)
|
|
|
|
with (
|
|
patch('src.app_controller.parse_symbols', return_value=[]) as mock_parse,
|
|
patch('src.ai_client.send') as mock_send
|
|
):
|
|
# Execute
|
|
controller._handle_request_event(event)
|
|
|
|
# Verify
|
|
mock_send.assert_called_once()
|
|
args, kwargs = mock_send.call_args
|
|
sent_prompt = args[1]
|
|
assert sent_prompt == "Just a normal prompt"
|