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]
86 lines
3.3 KiB
Python
86 lines
3.3 KiB
Python
from unittest.mock import MagicMock, patch
|
|
from src.multi_agent_conductor import ConductorEngine, run_worker_lifecycle
|
|
from src.models import Ticket, Track, WorkerContext
|
|
from src import ai_client
|
|
|
|
def test_worker_streaming_intermediate():
|
|
ticket = Ticket(id="T-001", description="Test", status="todo", assigned_to="worker")
|
|
context = WorkerContext(ticket_id="T-001", model_name="test-model", messages=[])
|
|
event_queue = MagicMock()
|
|
|
|
with (
|
|
patch("src.ai_client.send") as mock_send,
|
|
patch("src.multi_agent_conductor._queue_put") as mock_q_put,
|
|
patch("src.multi_agent_conductor.confirm_spawn", return_value=(True, "p", "c")),
|
|
patch("src.ai_client.reset_session"),
|
|
patch("src.ai_client.set_provider"),
|
|
patch("src.ai_client.get_provider"),
|
|
patch("src.ai_client.get_comms_log", return_value=[])
|
|
):
|
|
|
|
def side_effect(*args, **kwargs):
|
|
cb = ai_client.comms_log_callback
|
|
if cb:
|
|
cb({"kind": "tool_call", "payload": {"name": "test_tool", "script": "echo hello"}})
|
|
cb({"kind": "tool_result", "payload": {"name": "test_tool", "output": "hello"}})
|
|
return "DONE"
|
|
|
|
mock_send.side_effect = side_effect
|
|
run_worker_lifecycle(ticket, context, event_queue=event_queue)
|
|
|
|
# _queue_put(event_queue, event_name, payload)
|
|
responses = [call.args[2] for call in mock_q_put.call_args_list if call.args[1] == "response"]
|
|
assert any("[TOOL CALL]" in r.get("text", "") for r in responses)
|
|
assert any("[TOOL RESULT]" in r.get("text", "") for r in responses)
|
|
|
|
def test_per_tier_model_persistence():
|
|
# Mock UI frameworks before importing gui_2
|
|
mock_imgui = MagicMock()
|
|
with patch.dict("sys.modules", {
|
|
"imgui_bundle": MagicMock(),
|
|
"imgui_bundle.imgui": mock_imgui,
|
|
"imgui_bundle.hello_imgui": MagicMock(),
|
|
"imgui_bundle.immapp": MagicMock(),
|
|
}):
|
|
from src.gui_2 import App
|
|
with (
|
|
patch("src.gui_2.project_manager.load_project", return_value={}),
|
|
patch("src.gui_2.project_manager.migrate_from_legacy_config", return_value={}),
|
|
patch("src.gui_2.project_manager.save_project"),
|
|
patch("src.app_controller.AppController.save_config"),
|
|
patch("src.gui_2.theme.load_from_config"),
|
|
patch("src.gui_2.ai_client.set_provider"),
|
|
patch("src.gui_2.ai_client.list_models", return_value=["gpt-4", "claude-3"]),
|
|
patch("src.performance_monitor.PerformanceMonitor"),
|
|
patch("src.gui_2.api_hooks.HookServer"),
|
|
patch("src.gui_2.session_logger.open_session"),
|
|
patch("src.gui_2.session_logger.reset_session")
|
|
):
|
|
|
|
app = App()
|
|
app.controller.available_models = ["gpt-4", "claude-3"]
|
|
|
|
tier = "Tier 3"
|
|
model = "claude-3"
|
|
|
|
# Simulate 'Tier Model Config' UI logic
|
|
app.controller.mma_tier_usage[tier]["model"] = model
|
|
app.controller.project.setdefault("mma", {}).setdefault("tier_models", {})[tier] = model
|
|
|
|
assert app.controller.project["mma"]["tier_models"][tier] == model
|
|
|
|
def test_retry_escalation():
|
|
# This test verifies the retry escalation logic works
|
|
# We test the core concept: when a ticket is blocked, retry_count should increment
|
|
ticket = Ticket(id="T-001", description="Test", status="todo", assigned_to="worker")
|
|
|
|
# Simulate what happens when a ticket gets blocked
|
|
ticket.status = "blocked"
|
|
ticket.retry_count += 1
|
|
|
|
assert ticket.status == "blocked"
|
|
assert ticket.retry_count == 1
|
|
|
|
# Verify escalation can happen
|
|
assert ticket.retry_count < 2 # Should be eligible for retry
|