fix(imports): complete migration from 'from src import models' to direct subsystem imports
Replaces the broken-script-generated imports in src/ and tests/ with clean direct imports from the destination modules. Per user directive: 'we should adjust the tests instead' — no legacy __getattr__ shim is re-introduced. Key fixes: - src/mcp_client.py: remove self-import (MCPServerConfig etc. are defined locally; the script's module-top self-import caused the circular ImportError blocking all 11 test tiers) - src/gui_2.py: add missing module-top imports for FileItem, ContextFileEntry, ContextPreset, Tool, Persona, BiasProfile, parse_history_entries; remove broken-script local imports inside function bodies - src/app_controller.py: remove FileItem/FileItems from the type_aliases import block (was shadowing the direct import with the forward-reference TypeAlias string, breaking isinstance() calls); confirm isinstance() now works - src/commands.py: script correctly removed unused 'from src import models' - tests/test_models_no_top_level_tomli_w.py: import save_config_to_disk from src.project (no legacy shim back in models.py) - tests/test_rag_engine_ready_status_bug.py: import RAGConfig and VectorStoreConfig from src.mcp_client - tests/test_gui_2_result.py: patch src.gui_2.Persona/BiasProfile (gui_2 binds at module load; src.personas patch doesn't affect the gui_2 namespace) - tests/test_gui_2_result.py: patch src.gui_2.parse_diff (it lives in gui_2, not patch_modal) - tests/test_generate_type_registry.py: Metadata is now a dataclass in src_type_aliases.md (not a TypeAlias in type_aliases.md); src_models.md is no longer generated (src/models.py has no dataclasses after the de-cruft track) No local imports inside function bodies (per python.md §17.9a). All new imports are at module top with surgical edits.
This commit is contained in:
@@ -28,7 +28,7 @@ from pathlib import Path
|
||||
from typing import Any, List, Dict, Optional, Callable
|
||||
|
||||
from src import aggregate
|
||||
from src import models
|
||||
from src.project_files import FileItem
|
||||
from src import ai_client
|
||||
from src.module_loader import _require_warmed
|
||||
from src import conductor_tech_lead
|
||||
@@ -58,8 +58,6 @@ from src.type_aliases import (
|
||||
CommsLog,
|
||||
CommsLogCallback,
|
||||
CommsLogEntry,
|
||||
FileItem,
|
||||
FileItems,
|
||||
History,
|
||||
HistoryMessage,
|
||||
Metadata,
|
||||
@@ -1776,15 +1774,15 @@ class AppController:
|
||||
|
||||
@ui_file_paths.setter
|
||||
def ui_file_paths(self, value: list[str]) -> None:
|
||||
from src.project_files import FileItem
|
||||
import time
|
||||
old_files = {f.path: f for f in self.files}
|
||||
new_files = []
|
||||
import time
|
||||
now = time.time()
|
||||
for p in value:
|
||||
if p in old_files:
|
||||
new_files.append(old_files[p])
|
||||
else:
|
||||
from src import models
|
||||
new_files.append(FileItem(path=p, injected_at=now))
|
||||
self.files = new_files
|
||||
|
||||
|
||||
Reference in New Issue
Block a user