mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-05-27 17:37:39 +08:00
The /api/assets response previously emitted one tag per parent directory between the root category and the filename. For nested categories like diffusers, this produced ["models", "diffusers", "Kolors", "text_encoder"] where consumers that look up a category via tags[1] would only see the top-level bucket name and miss the model-specific sub-path that uniquely identifies the component. This collapses the parent subpath into a single slash-joined tag so the result is ["models", "diffusers/Kolors/text_encoder"]. Consumers can now read tags[1] as a stable category identifier regardless of how deep the file lives in the bucket. Case is preserved on the subpath so providers keyed on the original-case path (e.g. "diffusers/Kolors/text_encoder") resolve correctly. Same shape applies uniformly: - input/foo.png -> ["input"] - output/00001.png -> ["output"] - models/checkpoints/flux.safetensors -> ["models", "checkpoints"] - models/diffusers/Kolors/text_encoder/m.sft -> ["models", "diffusers/Kolors/text_encoder"] - models/loras/my/custom/path/v1.safetensors -> ["models", "loras/my/custom/path"] Integration tests that filtered by individual subdirectory tags (`include_tags=unit-tests,scope`) updated to use the new slash-joined shape (`include_tags=unit-tests/scope`). Unit tests cover flat input, flat output, flat models, diffusers-style nested, and deep user-subpath cases.
190 lines
6.9 KiB
Python
190 lines
6.9 KiB
Python
"""Tests for path_utils – asset category resolution."""
|
||
import os
|
||
import tempfile
|
||
from pathlib import Path
|
||
from unittest.mock import patch
|
||
|
||
import pytest
|
||
|
||
from app.assets.services.path_utils import (
|
||
get_asset_category_and_relative_path,
|
||
get_name_and_tags_from_asset_path,
|
||
)
|
||
|
||
|
||
@pytest.fixture
|
||
def fake_dirs():
|
||
"""Create temporary input, output, and temp directories."""
|
||
with tempfile.TemporaryDirectory() as root:
|
||
root_path = Path(root)
|
||
input_dir = root_path / "input"
|
||
output_dir = root_path / "output"
|
||
temp_dir = root_path / "temp"
|
||
models_dir = root_path / "models" / "checkpoints"
|
||
for d in (input_dir, output_dir, temp_dir, models_dir):
|
||
d.mkdir(parents=True)
|
||
|
||
with patch("app.assets.services.path_utils.folder_paths") as mock_fp:
|
||
mock_fp.get_input_directory.return_value = str(input_dir)
|
||
mock_fp.get_output_directory.return_value = str(output_dir)
|
||
mock_fp.get_temp_directory.return_value = str(temp_dir)
|
||
|
||
with patch(
|
||
"app.assets.services.path_utils.get_comfy_models_folders",
|
||
return_value=[("checkpoints", [str(models_dir)])],
|
||
):
|
||
yield {
|
||
"input": input_dir,
|
||
"output": output_dir,
|
||
"temp": temp_dir,
|
||
"models": models_dir,
|
||
}
|
||
|
||
|
||
@pytest.fixture
|
||
def fake_dirs_multi_bucket():
|
||
"""Variant fixture with multiple model buckets (checkpoints + diffusers + loras)."""
|
||
with tempfile.TemporaryDirectory() as root:
|
||
root_path = Path(root)
|
||
input_dir = root_path / "input"
|
||
output_dir = root_path / "output"
|
||
temp_dir = root_path / "temp"
|
||
checkpoints_dir = root_path / "models" / "checkpoints"
|
||
diffusers_dir = root_path / "models" / "diffusers"
|
||
loras_dir = root_path / "models" / "loras"
|
||
for d in (
|
||
input_dir,
|
||
output_dir,
|
||
temp_dir,
|
||
checkpoints_dir,
|
||
diffusers_dir,
|
||
loras_dir,
|
||
):
|
||
d.mkdir(parents=True)
|
||
|
||
with patch("app.assets.services.path_utils.folder_paths") as mock_fp:
|
||
mock_fp.get_input_directory.return_value = str(input_dir)
|
||
mock_fp.get_output_directory.return_value = str(output_dir)
|
||
mock_fp.get_temp_directory.return_value = str(temp_dir)
|
||
|
||
with patch(
|
||
"app.assets.services.path_utils.get_comfy_models_folders",
|
||
return_value=[
|
||
("checkpoints", [str(checkpoints_dir)]),
|
||
("diffusers", [str(diffusers_dir)]),
|
||
("loras", [str(loras_dir)]),
|
||
],
|
||
):
|
||
yield {
|
||
"input": input_dir,
|
||
"output": output_dir,
|
||
"temp": temp_dir,
|
||
"checkpoints": checkpoints_dir,
|
||
"diffusers": diffusers_dir,
|
||
"loras": loras_dir,
|
||
}
|
||
|
||
|
||
class TestGetAssetCategoryAndRelativePath:
|
||
def test_input_file(self, fake_dirs):
|
||
f = fake_dirs["input"] / "photo.png"
|
||
f.touch()
|
||
cat, rel = get_asset_category_and_relative_path(str(f))
|
||
assert cat == "input"
|
||
assert rel == "photo.png"
|
||
|
||
def test_output_file(self, fake_dirs):
|
||
f = fake_dirs["output"] / "result.png"
|
||
f.touch()
|
||
cat, rel = get_asset_category_and_relative_path(str(f))
|
||
assert cat == "output"
|
||
assert rel == "result.png"
|
||
|
||
def test_temp_file(self, fake_dirs):
|
||
"""Regression: temp files must be categorised, not raise ValueError."""
|
||
f = fake_dirs["temp"] / "GLSLShader_output_00004_.png"
|
||
f.touch()
|
||
cat, rel = get_asset_category_and_relative_path(str(f))
|
||
assert cat == "temp"
|
||
assert rel == "GLSLShader_output_00004_.png"
|
||
|
||
def test_temp_file_in_subfolder(self, fake_dirs):
|
||
sub = fake_dirs["temp"] / "sub"
|
||
sub.mkdir()
|
||
f = sub / "ComfyUI_temp_tczip_00004_.png"
|
||
f.touch()
|
||
cat, rel = get_asset_category_and_relative_path(str(f))
|
||
assert cat == "temp"
|
||
assert os.path.normpath(rel) == os.path.normpath("sub/ComfyUI_temp_tczip_00004_.png")
|
||
|
||
def test_model_file(self, fake_dirs):
|
||
f = fake_dirs["models"] / "model.safetensors"
|
||
f.touch()
|
||
cat, rel = get_asset_category_and_relative_path(str(f))
|
||
assert cat == "models"
|
||
|
||
def test_unknown_path_raises(self, fake_dirs):
|
||
with pytest.raises(ValueError, match="not within"):
|
||
get_asset_category_and_relative_path("/some/random/path.png")
|
||
|
||
|
||
class TestGetNameAndTagsFromAssetPath:
|
||
"""tags collapse the parent subpath into a single slash-joined tag.
|
||
|
||
Consumers should be able to read ``tags[1]`` as a stable category
|
||
identifier regardless of how deep the file lives in the bucket.
|
||
"""
|
||
|
||
def test_flat_input(self, fake_dirs_multi_bucket):
|
||
f = fake_dirs_multi_bucket["input"] / "photo.png"
|
||
f.touch()
|
||
name, tags = get_name_and_tags_from_asset_path(str(f))
|
||
assert name == "photo.png"
|
||
assert tags == ["input"]
|
||
|
||
def test_flat_output(self, fake_dirs_multi_bucket):
|
||
f = fake_dirs_multi_bucket["output"] / "result_00001.png"
|
||
f.touch()
|
||
name, tags = get_name_and_tags_from_asset_path(str(f))
|
||
assert name == "result_00001.png"
|
||
assert tags == ["output"]
|
||
|
||
def test_flat_models_checkpoint(self, fake_dirs_multi_bucket):
|
||
f = fake_dirs_multi_bucket["checkpoints"] / "flux.safetensors"
|
||
f.touch()
|
||
name, tags = get_name_and_tags_from_asset_path(str(f))
|
||
assert name == "flux.safetensors"
|
||
assert tags == ["models", "checkpoints"]
|
||
|
||
def test_diffusers_nested_subpath_slash_joined(self, fake_dirs_multi_bucket):
|
||
"""Diffusers components live in nested directories — the full subpath
|
||
must collapse into one tag so consumers can look up the model category
|
||
via tags[1] regardless of nesting depth."""
|
||
nested = (
|
||
fake_dirs_multi_bucket["diffusers"]
|
||
/ "Kolors"
|
||
/ "text_encoder"
|
||
)
|
||
nested.mkdir(parents=True)
|
||
f = nested / "model.safetensors"
|
||
f.touch()
|
||
name, tags = get_name_and_tags_from_asset_path(str(f))
|
||
assert name == "model.safetensors"
|
||
assert tags == ["models", "diffusers/Kolors/text_encoder"]
|
||
|
||
def test_deep_lora_user_subpath_slash_joined(self, fake_dirs_multi_bucket):
|
||
"""User-created subdirectories under a model bucket also collapse to a
|
||
single tag rather than one tag per directory."""
|
||
nested = (
|
||
fake_dirs_multi_bucket["loras"]
|
||
/ "my"
|
||
/ "custom"
|
||
/ "path"
|
||
)
|
||
nested.mkdir(parents=True)
|
||
f = nested / "v0001.safetensors"
|
||
f.touch()
|
||
name, tags = get_name_and_tags_from_asset_path(str(f))
|
||
assert name == "v0001.safetensors"
|
||
assert tags == ["models", "loras/my/custom/path"]
|