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]
57 lines
2.1 KiB
Python
57 lines
2.1 KiB
Python
import pytest
|
|
import sys
|
|
import os
|
|
|
|
# Ensure project root is in path
|
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
|
|
|
from src.api_hook_client import ApiHookClient
|
|
|
|
def test_hooks_enabled_via_cli(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
from src.gui_2 import App
|
|
from unittest.mock import patch
|
|
monkeypatch.setattr("sys.argv", ["sloppy.py", "--enable-test-hooks"])
|
|
with patch('src.app_controller.AppController.load_config', return_value={}), \
|
|
patch('src.performance_monitor.PerformanceMonitor'), \
|
|
patch('src.session_logger.open_session'), \
|
|
patch('src.session_logger.reset_session'), \
|
|
patch('src.app_controller.AppController._prune_old_logs'), \
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'):
|
|
app = App()
|
|
assert app.controller.test_hooks_enabled is True
|
|
|
|
def test_hooks_disabled_by_default() -> None:
|
|
from src.gui_2 import App
|
|
from unittest.mock import patch
|
|
with patch('src.app_controller.AppController.load_config', return_value={}), \
|
|
patch('src.performance_monitor.PerformanceMonitor'), \
|
|
patch('src.session_logger.open_session'), \
|
|
patch('src.session_logger.reset_session'), \
|
|
patch('src.app_controller.AppController._prune_old_logs'), \
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'):
|
|
app = App()
|
|
assert app.controller.test_hooks_enabled is False
|
|
|
|
def test_live_hook_server_responses(live_gui) -> None:
|
|
"""Verifies the live hook server (started via fixture) responds correctly to all major endpoints."""
|
|
client = ApiHookClient()
|
|
assert client.wait_for_server(timeout=10)
|
|
|
|
# 1. Status
|
|
status = client.get_status()
|
|
assert "status" in status
|
|
# Initial state can be idle or done depending on previous runs in same process tree
|
|
assert status["status"] in ("idle", "done", "ok")
|
|
|
|
# 2. Project
|
|
proj = client.get_project()
|
|
assert "project" in proj
|
|
|
|
# 3. GUI State
|
|
state = client.get_gui_state()
|
|
assert "current_provider" in state
|
|
|
|
# 4. Performance
|
|
# diagnostics are available via get_gui_diagnostics or get_gui_state
|
|
perf = client.get_gui_diagnostics() if hasattr(client, 'get_gui_diagnostics') else client.get_gui_state()
|
|
assert "fps" in perf or "thinking" in perf |