Private
Public Access
ed
9e07fac1db
Per post_module_taxonomy_de_cruft_20260627 Phase 2 (FR7 continued).
The previous migration commit (8f11340b) handled the
'from src.models import X' pattern (85 sites). This commit handles
the 'models.<moved_class>' attribute access pattern (44 sites in 20
files), which the __getattr__ shim previously supported.
The migration was performed by the one-time script
scripts/tier2/artifacts/post_module_taxonomy_de_cruft_20260627/migrate_models_attr.py
which:
1. For each 'models.<moved_class>' reference, replaces it with the
bare class name (e.g., 'models.MCPConfiguration' -> 'MCPConfiguration')
2. Adds the import 'from src.<destination> import <moved_class>' at
the top of the file (deduplicated if the import already exists)
3. Skips moved classes that the file already imports directly
The migration script inserts the import after the 'from __future__
import annotations' line if present; otherwise it adds the import
to the destination module's existing import block. Two files
required manual fixes because the script's regex didn't handle them:
- src/rag_engine.py: uses 'from src import models' (not 'from
src.models import X'); the class is accessed
via 'models.RAGConfig'. Replaced with a
direct 'from src.mcp_client import RAGConfig'
import and removed the 'from src import models'.
- tests/test_project_context_20260627.py: uses the parens-style
multi-line 'from src.models import (X, Y, Z)'.
Replaced with the parens-style direct import.
After this commit:
- 'models.MCPConfiguration', 'models.FileItem', 'models.Ticket', etc.
no longer work in src/ and tests/ (the AttributeError raises
because models.py no longer has the __getattr__ entries for
moved classes)
- All consumer files have direct imports of the moved classes
Total: 44 'models.<moved_class>' references rewritten across 20 files.
30 lines
1.6 KiB
Python
30 lines
1.6 KiB
Python
from unittest.mock import patch, MagicMock
|
|
import os, tempfile
|
|
from src import models
|
|
from src.gui_2 import render_files_and_media
|
|
|
|
def test_files_rendered_under_directory_grouping(app_instance):
|
|
with tempfile.TemporaryDirectory() as tmp:
|
|
sub = os.path.join(tmp, "sub")
|
|
os.makedirs(sub, exist_ok=True)
|
|
for p in [os.path.join(tmp, "a.py"), os.path.join(tmp, "b.py"), os.path.join(sub, "c.py")]:
|
|
open(p, "w").close()
|
|
app_instance.files = [FileItem(path=os.path.join(tmp, "a.py")), FileItem(path=os.path.join(tmp, "b.py")), FileItem(path=os.path.join(sub, "c.py"))]
|
|
with patch("src.gui_2.imgui") as mock_imgui, patch("src.gui_2.imscope") as mock_imscope, patch("src.gui_2.filedialog") as mock_filedialog, patch("src.gui_2.hide_tk_root", return_value=MagicMock()):
|
|
mock_imgui.collapsing_header.return_value = True
|
|
mock_imgui.TableFlags_ = type("T", (), {"resizable": 1, "borders": 2, "row_bg": 4})()
|
|
mock_imgui.TableColumnFlags_ = type("C", (), {"width_fixed": 1, "width_stretch": 2})()
|
|
mock_imgui.begin_table.return_value = True
|
|
mock_imgui.button.return_value = False
|
|
mock_imscope.group.return_value.__enter__.return_value = None
|
|
mock_imscope.tree_node_ex.return_value.__enter__.return_value = True
|
|
mock_filedialog.askopenfilenames.return_value = ()
|
|
mock_filedialog.askdirectory.return_value = ""
|
|
try:
|
|
render_files_and_media(app_instance)
|
|
except Exception as e:
|
|
import pytest
|
|
pytest.fail(f"render_files_and_media raised: {e}")
|
|
assert len(app_instance.files) == 3
|
|
assert mock_imscope.tree_node_ex.called, "render_files_and_media should group files under tree_node_ex by directory"
|