aszc-dev
5dafd261b7
Phase 3 of the modernization plan: move the framework-free math out of the comfy-coupled modules so Tier-0 tests can run on plain Linux without ComfyUI, coremltools, or python_coreml_stable_diffusion. New pure-core package (no comfy / coreml / mps imports): - coreml_suite.core.latents: chunk_batch, merge_chunks - coreml_suite.core.controlnet: expand_inputs, no_control, extract_residual_kwargs, chunk_control - coreml_suite.core.inputs: CoreMLInputs (chunks + coreml_kwargs) - coreml_suite.core.sdxl: is_sdxl / is_sdxl_base / is_sdxl_refiner, build_sdxl_time_ids (base len 6, refiner len 5), build_sdxl_text_embeds, sdxl_model_function_wrapper - coreml_suite.core.naming: compose_out_name, lora_names_from_params Thin adapters keep the public import paths: - coreml_suite.latents / coreml_suite.controlnet: re-export from core - coreml_suite.models: CoreMLModelWrapper, CoreMLModelWrapperLCM, add_sdxl_model_options (now uses the pure builders from core.sdxl), get_latent_image, get_model_patcher remain framework-coupled - coreml_suite.nodes: CoreMLConverter.convert now delegates the out_name composition to core.naming.compose_out_name Test infra: - tests/unit/* re-pointed at coreml_suite.core.* - test_chunks.py dropped `from comfy.model_management import ...` and the dead `model_config` fixture (Phase 1 left it broken; Phase 3 removes it entirely) - test_characterization_sdxl_options now targets the pure builders directly via inspect.getclosurevars on the wrapper closure - test_characterization_out_name now calls compose_out_name without the heavy CoreMLConverter monkey-patching that Phase 2 needed - tests/unit/test_tier0_purity.py: new gate that fails if comfy / coremltools / etc leak into sys.modules during a pure `-m unit` run (skipped in mixed runs where m2 / integration legitimately import them) - tests/__init__.py + top-level conftest.py + pyproject addopts `--import-mode=importlib --confcutdir=tests` together stop pytest from importing the repo-root `__init__.py` (the ComfyUI custom-node entry pulls in comfy) - tests/conftest.py adds tier-aware collect_ignore so `-m unit` skips tests/m2 + tests/integration at collection time Verification: - `pytest -m unit tests/` → 88 passed in ~2s; deterministic across runs - Tier-0 purity gate confirms no comfy/coreml/etc in sys.modules - m2 golden image (Phase 2 anchor) still hashes identical → refactor produced bit-for-bit unchanged output - `git diff main -- __init__.py coreml_suite/nodes.py` shows zero churn to NODE_CLASS_MAPPINGS keys or INPUT_TYPES field names (public workflow contract intact)
44 lines
1.4 KiB
Python
44 lines
1.4 KiB
Python
"""Phase 3 gate: prove the Tier-0 lane is framework-free.
|
|
|
|
In a pure `pytest -m unit` run, none of the banned runtime modules
|
|
(comfy, coremltools, python_coreml_stable_diffusion, folder_paths,
|
|
nodes, comfy_extras, diffusers, diffusionkit) may be in sys.modules
|
|
after collection. If they are, a tests/unit/ file is transitively
|
|
pulling them in and the Tier-0 promise — "runs on Linux with no Mac
|
|
stack" — is broken.
|
|
|
|
When other tiers (m2 / integration) are also collected, comfy is
|
|
expected in sys.modules (integration imports it deliberately), so the
|
|
check is skipped in mixed runs — Tier-0 purity is only meaningful when
|
|
nothing else is loaded.
|
|
"""
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
BANNED_ROOTS = {
|
|
"comfy",
|
|
"comfy_extras",
|
|
"coremltools",
|
|
"python_coreml_stable_diffusion",
|
|
"folder_paths",
|
|
"nodes",
|
|
"diffusers",
|
|
"diffusionkit",
|
|
}
|
|
|
|
|
|
def test_no_framework_modules_loaded_by_unit_tier(request):
|
|
markexpr = request.config.option.markexpr
|
|
if markexpr != "unit":
|
|
pytest.skip(
|
|
"purity gate only meaningful in a pure `-m unit` run "
|
|
f"(got markexpr={markexpr!r}); other tiers are expected to "
|
|
"import comfy/coremltools."
|
|
)
|
|
loaded = {name for name in sys.modules if name.split(".")[0] in BANNED_ROOTS}
|
|
assert not loaded, (
|
|
f"Tier-0 leakage: these framework modules are in sys.modules after "
|
|
f"collecting tests/unit/: {sorted(loaded)}. Pure-core promise broken."
|
|
)
|