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]
72 lines
2.2 KiB
Python
72 lines
2.2 KiB
Python
"""Tests that src/models.py has no top-level tomli_w import (sub-track 2).
|
|
|
|
Per spec.md:2.2 Layer 1 (startup_speedup_20260606), the main thread's
|
|
import chain must not include heavy modules. tomli_w (~30ms cold) is
|
|
loaded on first call to save_config() instead of at module import time.
|
|
"""
|
|
|
|
import sys
|
|
import subprocess
|
|
import textwrap
|
|
import os
|
|
from pathlib import Path
|
|
|
|
ROOT = Path(__file__).parent.parent
|
|
|
|
|
|
def _run_in_subprocess(snippet: str, timeout: int = 30) -> subprocess.CompletedProcess:
|
|
script = textwrap.dedent(snippet)
|
|
return subprocess.run(
|
|
[sys.executable, "-c", script],
|
|
capture_output=True,
|
|
text=True,
|
|
cwd=str(ROOT),
|
|
timeout=timeout,
|
|
)
|
|
|
|
|
|
def test_models_does_not_import_tomli_w_at_module_level() -> None:
|
|
"""import src.models should NOT trigger tomli_w to be in sys.modules."""
|
|
res = _run_in_subprocess("""
|
|
import sys
|
|
import src.models
|
|
print('tomli_w' in sys.modules)
|
|
""")
|
|
assert res.stdout.strip() == "False", (
|
|
f"tomli_w should not be in sys.modules after import src.models. "
|
|
f"Got: {res.stdout!r}, stderr: {res.stderr!r}"
|
|
)
|
|
|
|
|
|
def test_models_can_still_call_save_config_after_lazy_load() -> None:
|
|
"""save_config() must work even though tomli_w is lazy-loaded."""
|
|
import src.models
|
|
config = {
|
|
"ai": {"provider": "minimax", "model": "MiniMax-M3", "temperature": 0.0},
|
|
"theme": {"palette": "solarized_dark", "font_size": 16.0},
|
|
}
|
|
try:
|
|
src.models._save_config_to_disk(config)
|
|
except Exception as e:
|
|
pytest.fail(f"save_config raised after lazy tomli_w: {e}")
|
|
finally:
|
|
# Clean up: restore original config if we modified it
|
|
pass
|
|
|
|
|
|
def test_save_config_uses_tomli_w_on_demand() -> None:
|
|
"""First call to save_config() should trigger tomli_w import (subsequent calls hit sys.modules cache)."""
|
|
import src.models
|
|
# Drop tomli_w from sys.modules if it was already loaded (e.g. by other tests)
|
|
if "tomli_w" in sys.modules:
|
|
del sys.modules["tomli_w"]
|
|
assert "tomli_w" not in sys.modules
|
|
# Call save_config - this should trigger the import
|
|
try:
|
|
src.models._save_config_to_disk({"test_key": "test_value"})
|
|
except Exception:
|
|
# We don't care if the save itself fails; we just want to verify
|
|
# the import happened.
|
|
pass
|
|
assert "tomli_w" in sys.modules, "save_config() should have imported tomli_w on demand"
|