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]
116 lines
4.2 KiB
Python
116 lines
4.2 KiB
Python
import unittest
|
|
from unittest.mock import MagicMock, patch
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
# Add src to sys.path if needed
|
|
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
|
|
|
|
from src import ai_client
|
|
from src.app_controller import AppController
|
|
from src import models
|
|
|
|
class TestSystemPromptExposure(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
# Reset ai_client globals
|
|
ai_client.set_use_default_base_prompt(True)
|
|
ai_client.set_base_system_prompt("")
|
|
ai_client.set_custom_system_prompt("")
|
|
|
|
def test_ai_client_get_combined_respects_use_default(self):
|
|
# 1. Verify ai_client._get_combined_system_prompt() respects set_use_default_base_prompt()
|
|
|
|
# Default is True, should return _SYSTEM_PROMPT
|
|
default_prompt = ai_client._get_combined_system_prompt()
|
|
self.assertIn("You are a helpful coding assistant", default_prompt)
|
|
|
|
# Set to False, should return override (empty by default)
|
|
ai_client.set_use_default_base_prompt(False)
|
|
override_prompt = ai_client._get_combined_system_prompt()
|
|
self.assertEqual(override_prompt, "")
|
|
|
|
# Set override and verify
|
|
ai_client.set_base_system_prompt("Custom Base")
|
|
override_prompt = ai_client._get_combined_system_prompt()
|
|
self.assertEqual(override_prompt, "Custom Base")
|
|
|
|
def test_ai_client_set_base_overrides_when_default_false(self):
|
|
# 2. Verify ai_client.set_base_system_prompt() correctly overrides the base when use_default is False.
|
|
ai_client.set_use_default_base_prompt(False)
|
|
ai_client.set_base_system_prompt("Overridden Prompt")
|
|
combined = ai_client._get_combined_system_prompt()
|
|
self.assertEqual(combined, "Overridden Prompt")
|
|
|
|
# If we switch back to default, it should ignore the override
|
|
ai_client.set_use_default_base_prompt(True)
|
|
combined = ai_client._get_combined_system_prompt()
|
|
self.assertIn("You are a helpful coding assistant", combined)
|
|
self.assertNotIn("Overridden Prompt", combined)
|
|
|
|
@patch('src.app_controller.AppController.load_config')
|
|
@patch('src.paths.get_full_path_info')
|
|
@patch('src.project_manager.load_project')
|
|
@patch('src.ai_client.set_tool_preset')
|
|
@patch('src.ai_client.set_bias_profile')
|
|
@patch('src.session_logger.reset_session')
|
|
def test_app_controller_init_state_loads_prompts(self, mock_reset, mock_bias, mock_preset, mock_load_project, mock_path_info, mock_load_config):
|
|
# 3. Verify AppController.init_state() correctly loads base_system_prompt and use_default_base_prompt from a mock config.
|
|
|
|
mock_config = {
|
|
"ai": {
|
|
"base_system_prompt": "Config Base Prompt",
|
|
"use_default_base_prompt": False,
|
|
"provider": "gemini",
|
|
"model": "gemini-2.5-flash-lite"
|
|
},
|
|
"projects": {"paths": [], "active": ""},
|
|
"gui": {"show_windows": {}}
|
|
}
|
|
mock_load_config.return_value = mock_config
|
|
mock_path_info.return_value = {
|
|
'logs_dir': {'path': Path('logs')},
|
|
'scripts_dir': {'path': Path('scripts')}
|
|
}
|
|
mock_load_project.return_value = {}
|
|
|
|
app = AppController()
|
|
# Mock the event queue to avoid thread errors
|
|
app.event_queue = MagicMock()
|
|
|
|
app.init_state()
|
|
|
|
self.assertEqual(app.ui_base_system_prompt, "Config Base Prompt")
|
|
self.assertEqual(app.ui_use_default_base_prompt, False)
|
|
|
|
def test_app_controller_flush_saves_prompts(self):
|
|
# 4. Verify AppController._flush_to_config() correctly saves these fields.
|
|
app = AppController()
|
|
app.config = {"ai": {}, "projects": {}, "gui": {}}
|
|
app.ui_base_system_prompt = "Flushed Prompt"
|
|
app.ui_use_default_base_prompt = True
|
|
app.ui_global_system_prompt = "Global Sys"
|
|
app.ui_global_preset_name = "Default"
|
|
app.project_paths = []
|
|
app.active_project_path = ""
|
|
|
|
# Initialize missing attributes expected by _flush_to_config
|
|
app.ui_separate_task_dag = False
|
|
app.ui_separate_usage_analytics = False
|
|
app.ui_separate_tier1 = False
|
|
app.ui_separate_tier2 = False
|
|
app.ui_separate_tier3 = False
|
|
app.ui_separate_tier4 = False
|
|
|
|
# Mock current_provider/model properties
|
|
with patch.object(AppController, 'current_provider', 'gemini'), \
|
|
patch.object(AppController, 'current_model', 'gemini-model'):
|
|
app._flush_to_config()
|
|
|
|
self.assertEqual(app.config["ai"]["base_system_prompt"], "Flushed Prompt")
|
|
self.assertEqual(app.config["ai"]["use_default_base_prompt"], True)
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|