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]
114 lines
5.0 KiB
Python
114 lines
5.0 KiB
Python
import unittest
|
|
from unittest.mock import patch, MagicMock
|
|
import os
|
|
import sys
|
|
from fastapi.testclient import TestClient
|
|
|
|
# Ensure project root is in path
|
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
|
|
|
|
from src.app_controller import AppController
|
|
|
|
class TestHeadlessAPI(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
with patch('src.app_controller.AppController.load_config', return_value={'ai': {'provider': 'gemini', 'model': 'gemini-2.5-flash-lite'}, 'projects': {}, 'gui': {'show_windows': {}}}), \
|
|
patch('src.session_logger.open_session'), \
|
|
patch('src.session_logger.reset_session'), \
|
|
patch('src.ai_client.set_provider'), \
|
|
patch('src.performance_monitor.PerformanceMonitor'), \
|
|
patch('src.session_logger.close_session'), \
|
|
patch('src.app_controller.AppController._init_ai_and_hooks'), \
|
|
patch('src.app_controller.AppController._fetch_models'), \
|
|
patch('src.app_controller.AppController._prune_old_logs'), \
|
|
patch('src.app_controller.AppController.start_services'):
|
|
self.controller = AppController()
|
|
# Set up API key for testing
|
|
self.controller.config["headless"] = {"api_key": "test-key"}
|
|
self.api = self.controller.create_api()
|
|
self.client = TestClient(self.api)
|
|
self.headers = {"X-API-KEY": "test-key"}
|
|
|
|
def tearDown(self) -> None:
|
|
pass
|
|
|
|
def test_health_endpoint(self) -> None:
|
|
response = self.client.get("/health")
|
|
self.assertEqual(response.status_code, 200)
|
|
self.assertEqual(response.json(), {"status": "ok"})
|
|
|
|
def test_status_endpoint_unauthorized(self) -> None:
|
|
response = self.client.get("/status")
|
|
self.assertEqual(response.status_code, 403)
|
|
|
|
def test_status_endpoint_authorized(self) -> None:
|
|
response = self.client.get("/status", headers=self.headers)
|
|
self.assertEqual(response.status_code, 200)
|
|
data = response.json()
|
|
self.assertIn("status", data)
|
|
self.assertIn("provider", data)
|
|
|
|
def test_endpoint_no_api_key_configured(self) -> None:
|
|
# Test error when server has no key set
|
|
self.controller.config["headless"] = {"api_key": ""}
|
|
response = self.client.get("/status", headers=self.headers)
|
|
self.assertEqual(response.status_code, 403)
|
|
self.assertIn("not configured", response.json()["detail"])
|
|
|
|
def test_generate_endpoint(self) -> None:
|
|
with patch('src.ai_client.send', return_value="AI Response"), \
|
|
patch('src.app_controller.AppController._do_generate', return_value=("md", "path", [], "stable", "disc")):
|
|
payload = {"prompt": "test prompt", "auto_add_history": False}
|
|
response = self.client.post("/api/v1/generate", json=payload, headers=self.headers)
|
|
self.assertEqual(response.status_code, 200)
|
|
self.assertEqual(response.json()["text"], "AI Response")
|
|
|
|
def test_pending_actions_endpoint(self) -> None:
|
|
response = self.client.get("/api/v1/pending_actions", headers=self.headers)
|
|
self.assertEqual(response.status_code, 200)
|
|
self.assertEqual(response.json(), [])
|
|
|
|
def test_confirm_action_endpoint(self) -> None:
|
|
# Mock a pending action
|
|
from src.app_controller import ConfirmDialog
|
|
dialog = ConfirmDialog("test script", ".")
|
|
self.controller._pending_actions[dialog._uid] = dialog
|
|
|
|
payload = {"approved": True}
|
|
response = self.client.post(f"/api/v1/confirm/{dialog._uid}", json=payload, headers=self.headers)
|
|
self.assertEqual(response.status_code, 200)
|
|
self.assertEqual(response.json(), {"status": "confirmed"})
|
|
self.assertTrue(dialog._done)
|
|
self.assertTrue(dialog._approved)
|
|
|
|
def test_list_sessions_endpoint(self) -> None:
|
|
with patch('pathlib.Path.glob', return_value=[]):
|
|
response = self.client.get("/api/v1/sessions", headers=self.headers)
|
|
self.assertEqual(response.status_code, 200)
|
|
self.assertIsInstance(response.json(), list)
|
|
|
|
def test_get_context_endpoint(self) -> None:
|
|
with patch('src.app_controller.AppController._do_generate', return_value=("md", "path", [], "stable", "disc")):
|
|
response = self.client.get("/api/v1/context", headers=self.headers)
|
|
self.assertEqual(response.status_code, 200)
|
|
data = response.json()
|
|
self.assertEqual(data["markdown"], "md")
|
|
|
|
class TestHeadlessStartup(unittest.TestCase):
|
|
@patch('src.gui_2.App')
|
|
@patch('uvicorn.run')
|
|
def test_headless_flag_triggers_run(self, mock_uvicorn: MagicMock, mock_app: MagicMock) -> None:
|
|
from src.gui_2 import main
|
|
with patch('sys.argv', ['sloppy.py', '--headless']):
|
|
main()
|
|
mock_app.assert_called_once()
|
|
# In the current implementation, main() calls app.run(), which then switches to headless
|
|
mock_app.return_value.run.assert_called_once()
|
|
|
|
@patch('src.gui_2.App')
|
|
def test_normal_startup_calls_app_run(self, mock_app: MagicMock) -> None:
|
|
from src.gui_2 import main
|
|
with patch('sys.argv', ['sloppy.py']):
|
|
main()
|
|
mock_app.assert_called_once()
|
|
mock_app.return_value.run.assert_called_once()
|