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]
109 lines
4.5 KiB
Python
109 lines
4.5 KiB
Python
import pytest
|
|
from unittest.mock import MagicMock, patch, call
|
|
from src import gui_2
|
|
from src.gui_2 import App
|
|
|
|
@pytest.fixture
|
|
def app_instance():
|
|
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'),
|
|
patch('src.api_hooks.HookServer'),
|
|
patch('src.ai_client.set_provider'),
|
|
patch('src.ai_client.reset_session')
|
|
):
|
|
app = App()
|
|
app.project = {
|
|
"discussion": {
|
|
"active": "main",
|
|
"discussions": {
|
|
"main": {"history": []},
|
|
"main_take_1": {"history": []},
|
|
"main_take_2": {"history": []}
|
|
}
|
|
}
|
|
}
|
|
app.active_discussion = "main"
|
|
app.is_viewing_prior_session = False
|
|
app.ui_disc_new_name_input = ""
|
|
app.ui_disc_truncate_pairs = 1
|
|
yield app
|
|
|
|
def test_render_discussion_tabs(app_instance):
|
|
"""Verify that _render_discussion_panel uses tabs for discussions."""
|
|
with patch('src.gui_2.imgui') as mock_imgui, \
|
|
patch('src.gui_2.imscope') as mock_imscope:
|
|
mock_imgui.collapsing_header.return_value = True
|
|
mock_imgui.begin_combo.return_value = False
|
|
mock_imgui.input_text.return_value = (False, "")
|
|
mock_imgui.input_int.return_value = (False, 0)
|
|
mock_imgui.drag_int.return_value = (False, 0)
|
|
mock_imgui.input_text_multiline.return_value = (False, "")
|
|
mock_imgui.button.return_value = False
|
|
mock_imgui.checkbox.return_value = (False, False)
|
|
mock_imgui.begin_child.return_value = True
|
|
mock_imgui.selectable.return_value = (False, False)
|
|
mock_imgui.ListClipper.return_value.step.return_value = False
|
|
mock_imgui.begin_tab_bar.return_value = True
|
|
|
|
mock_imscope.window.return_value.__enter__.return_value = (True, True)
|
|
mock_imscope.child.return_value.__enter__.return_value = True
|
|
mock_imscope.table.return_value.__enter__.return_value = True
|
|
mock_imscope.tree_node_ex.return_value.__enter__.return_value = True
|
|
mock_imscope.tab_item.return_value.__enter__.return_value = (True, True)
|
|
mock_imscope.style_color.return_value.__enter__.return_value = None
|
|
mock_imscope.style_var.return_value.__enter__.return_value = None
|
|
|
|
mock_imgui.begin_tab_item.return_value = (True, True)
|
|
|
|
gui_2.render_discussion_panel(app_instance)
|
|
|
|
mock_imgui.begin_tab_bar.assert_called_with("discussion_takes_tabs")
|
|
assert mock_imscope.tab_item.call_count >= 3, f"Expected at least 3 tab items via imscope.tab_item, got {mock_imscope.tab_item.call_count}"
|
|
|
|
def test_switching_discussion_via_tabs(app_instance):
|
|
"""Verify that clicking a tab switches the discussion."""
|
|
with patch('src.gui_2.imgui') as mock_imgui, \
|
|
patch('src.gui_2.imscope') as mock_imscope, \
|
|
patch('src.app_controller.AppController._switch_discussion') as mock_switch:
|
|
mock_imgui.collapsing_header.return_value = True
|
|
mock_imgui.begin_combo.return_value = False
|
|
mock_imgui.input_text.return_value = (False, "")
|
|
mock_imgui.input_int.return_value = (False, 0)
|
|
mock_imgui.drag_int.return_value = (False, 0)
|
|
mock_imgui.input_text_multiline.return_value = (False, "")
|
|
mock_imgui.button.return_value = False
|
|
mock_imgui.checkbox.return_value = (False, False)
|
|
mock_imgui.begin_child.return_value = True
|
|
mock_imgui.selectable.return_value = (False, False)
|
|
mock_imgui.ListClipper.return_value.step.return_value = False
|
|
mock_imgui.begin_tab_bar.return_value = True
|
|
|
|
mock_imscope.window.return_value.__enter__.return_value = (True, True)
|
|
mock_imscope.child.return_value.__enter__.return_value = True
|
|
mock_imscope.table.return_value.__enter__.return_value = True
|
|
mock_imscope.tree_node_ex.return_value.__enter__.return_value = True
|
|
mock_imscope.tab_item.return_value.__enter__.return_value = (True, True)
|
|
mock_imscope.style_color.return_value.__enter__.return_value = None
|
|
mock_imscope.style_var.return_value.__enter__.return_value = None
|
|
|
|
def begin_tab_item_side_effect(label, p_open=None, flags=None):
|
|
if "main_take_1" in label:
|
|
return (True, True)
|
|
return (False, True)
|
|
|
|
mock_imgui.begin_tab_item.side_effect = begin_tab_item_side_effect
|
|
|
|
gui_2.render_discussion_panel(app_instance)
|
|
|
|
assert mock_switch.called, f"Expected _switch_discussion to be called"
|