mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-07-10 16:37:36 +08:00
* feat(assets): add namespaced model type tags * fix(assets): mark path-derived upload tags automatic * fix(assets): merge duplicate scan specs * test(assets): make duplicate path normalization portable * feat(assets): add loader_path as the authoritative loader locator (#14796) * fix(assets): filter model_type tags by bucket extension sets Buckets sharing a base directory (e.g. diffusion_models and a custom unet_gguf) tagged every file in the directory regardless of whether the bucket could load it, so .safetensors files were tagged model_type:unet_gguf and vice versa. Carry each bucket's registered extension set through get_comfy_models_folders and only emit a model_type tag when the file extension matches, keeping the empty-set match-all convention from folder_paths.filter_files_extensions. Files under a model base matching no bucket now keep only the models tag instead of every directory-matching model_type tag. * feat(assets): replace response file_path with persisted loader_path The old file_path response field was a namespaced storage locator (models/checkpoints/foo.safetensors): not an absolute path, not unique identity, and not the value a loader consumes. Nothing needs that shape on the wire (hash/ID-based locating is the long-term direction), so it is dropped rather than renamed; the storage-root matching stays internal, powering display_name. What loaders DO need is the in-root loader path (category dropped: models/checkpoints/foo/bar.safetensors -> foo/bar.safetensors). Serve it as a first-class loader_path field, persisted on asset_references (migration 0006) and written by every ingest pipeline at insert, so responses read the column verbatim. Like the model_type tags, loader_path is a seed-time derivative of the model folder registry, maintained by the same scan lifecycle (new files seed fresh values, pruning retires rows whose bucket disappeared). Rows predating the column serve a null loader_path; databases from before this stack already need recreating for the base branch's tag changes. loader_path resolves every registered base including extra_model_paths entries; display_name only the canonical storage roots. A file can therefore be loadable with no display name (extra-path models) or the reverse (unregistered files under the models root), and loader_path is null exactly when no loader can resolve the file. * test(assets): lock loader_path matrix (asymmetry, null, persist/read) Cover the behaviour that has no production change but is easy to regress: the extra-path asymmetry (loadable but no storage namespace), null loader_path persistence for orphan files, and the response reading the stored column with a compute fallback for un-backfilled rows. * fix(assets): persist subfolder-qualified loader_path for ingested outputs ingest_existing_file built its seed spec with the file's basename, so outputs saved into a subfolder persisted loader_path (and the user_metadata filename that preview URLs split for their subfolder param) as just the basename: the served locator pointed at a file that does not exist at that path. Scanner and seeder specs already derive fname via compute_loader_path; use the same derivation here. * fix(assets): only extension-matching buckets contribute a loader_path The model-base match in get_asset_category_and_relative_path ignored each bucket's extension set, so a file inside a registered base whose extension the bucket cannot load (e.g. a .txt uploaded into model_type:checkpoints) advertised a loader_path that no loader list would ever resolve, while the tag side of the same stack already excluded it. Apply the extension check used for backend tags (empty set accepts any extension), keeping loader_path null exactly when no loader can resolve the file. * fix(assets): refresh loader_path when re-ingesting an existing reference upsert_reference only wrote loader_path on the INSERT branch, so re-ingesting an existing reference (an output overwritten in place, or a file re-registered after its loader_path derivation changed) kept the stale or NULL value forever. Write it on the UPDATE branch too, with a null-safe change guard so a loader_path difference alone is enough to trigger the update, and identical values stay a no-op. * fix(assets): repair semantic merge breakage from #14796 and master Two textually-clean but semantically-broken merges: - routes.py lost its folder_paths import when #14796's import block superseded the base's, while the content-type hardening added via the base's master merge still calls folder_paths.is_dangerous_content_type. - master's SVG download-hardening test uploads with the pre-namespacing bare checkpoints tag, which this branch's destination validation rejects; use model_type:checkpoints. --------- Co-authored-by: guill <jacob.e.segal@gmail.com>
351 lines
13 KiB
Python
351 lines
13 KiB
Python
import os
|
|
import uuid
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
import requests
|
|
from helpers import get_asset_filename, trigger_sync_seed_assets
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize("root", ["input", "output"])
|
|
def test_seed_asset_removed_when_file_is_deleted(
|
|
root: str,
|
|
http: requests.Session,
|
|
api_base: str,
|
|
comfy_tmp_base_dir: Path,
|
|
):
|
|
"""Asset without hash (seed) whose file disappears:
|
|
after triggering sync_seed_assets, Asset + AssetInfo disappear.
|
|
"""
|
|
# Create a file directly under input/unit-tests/<case>. Backend tags only
|
|
# classify the root; nested path components are not exposed as tags.
|
|
case_dir = comfy_tmp_base_dir / root / "unit-tests" / "syncseed"
|
|
case_dir.mkdir(parents=True, exist_ok=True)
|
|
name = f"seed_{uuid.uuid4().hex[:8]}.bin"
|
|
fp = case_dir / name
|
|
fp.write_bytes(b"Z" * 2048)
|
|
|
|
# Trigger a seed sync so DB sees this path (seed asset => hash is NULL)
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
# Verify it is visible via API and carries no hash (seed)
|
|
r1 = http.get(
|
|
api_base + "/api/assets",
|
|
params={"include_tags": root, "name_contains": name},
|
|
timeout=120,
|
|
)
|
|
body1 = r1.json()
|
|
assert r1.status_code == 200
|
|
# there should be exactly one with that name
|
|
matches = [a for a in body1.get("assets", []) if a.get("name") == name]
|
|
assert matches
|
|
# Seed assets have no hash; exclude_none drops both keys from the response
|
|
assert "asset_hash" not in matches[0]
|
|
assert "hash" not in matches[0]
|
|
asset_info_id = matches[0]["id"]
|
|
|
|
# Remove the underlying file and sync again
|
|
if fp.exists():
|
|
fp.unlink()
|
|
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
# It should disappear (AssetInfo and seed Asset gone)
|
|
r2 = http.get(
|
|
api_base + "/api/assets",
|
|
params={"include_tags": root, "name_contains": name},
|
|
timeout=120,
|
|
)
|
|
body2 = r2.json()
|
|
assert r2.status_code == 200
|
|
matches2 = [a for a in body2.get("assets", []) if a.get("name") == name]
|
|
assert not matches2, f"Seed asset {asset_info_id} should be gone after sync"
|
|
|
|
|
|
@pytest.mark.skip(reason="Requires computing hashes of files in directories to verify and clear missing tags")
|
|
def test_hashed_asset_missing_tag_added_then_removed_after_scan(
|
|
http: requests.Session,
|
|
api_base: str,
|
|
comfy_tmp_base_dir: Path,
|
|
asset_factory,
|
|
make_asset_bytes,
|
|
):
|
|
"""Hashed asset with a single cache_state:
|
|
1. delete its file -> sync adds 'missing'
|
|
2. restore file -> sync removes 'missing'
|
|
"""
|
|
name = "missing_tag_test.png"
|
|
tags = ["input", "unit-tests", "msync2"]
|
|
data = make_asset_bytes(name, 4096)
|
|
a = asset_factory(name, tags, {}, data)
|
|
|
|
# Compute its on-disk path and remove it
|
|
dest = comfy_tmp_base_dir / "input" / "unit-tests" / "msync2" / get_asset_filename(a["asset_hash"], ".png")
|
|
assert dest.exists(), f"Expected asset file at {dest}"
|
|
dest.unlink()
|
|
|
|
# Fast sync should add 'missing' to the AssetInfo
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
g1 = http.get(f"{api_base}/api/assets/{a['id']}", timeout=120)
|
|
d1 = g1.json()
|
|
assert g1.status_code == 200, d1
|
|
assert "missing" in set(d1.get("tags", [])), "Expected 'missing' tag after deletion"
|
|
|
|
# Restore the file with the exact same content and sync again
|
|
dest.parent.mkdir(parents=True, exist_ok=True)
|
|
dest.write_bytes(data)
|
|
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
g2 = http.get(f"{api_base}/api/assets/{a['id']}", timeout=120)
|
|
d2 = g2.json()
|
|
assert g2.status_code == 200, d2
|
|
assert "missing" not in set(d2.get("tags", [])), "Missing tag should be cleared after verify"
|
|
|
|
|
|
def test_hashed_asset_two_asset_infos_both_get_missing(
|
|
http: requests.Session,
|
|
api_base: str,
|
|
comfy_tmp_base_dir: Path,
|
|
asset_factory,
|
|
):
|
|
"""Hashed asset with a single cache_state, but two AssetInfo rows:
|
|
deleting the single file then syncing should add 'missing' to both infos.
|
|
"""
|
|
# Upload one hashed asset
|
|
name = "two_infos_one_path.png"
|
|
base_tags = ["input", "unit-tests", "multiinfo"]
|
|
created = asset_factory(name, base_tags, {}, b"A" * 2048)
|
|
|
|
# Create second AssetInfo for the same Asset via from-hash
|
|
payload = {
|
|
"hash": created["asset_hash"],
|
|
"name": "two_infos_one_path_copy.png",
|
|
"tags": base_tags, # keep it in our unit-tests scope for cleanup
|
|
"user_metadata": {"k": "v"},
|
|
}
|
|
r2 = http.post(api_base + "/api/assets/from-hash", json=payload, timeout=120)
|
|
b2 = r2.json()
|
|
assert r2.status_code == 201, b2
|
|
second_id = b2["id"]
|
|
|
|
# Remove the single underlying file
|
|
p = comfy_tmp_base_dir / "input" / get_asset_filename(created["asset_hash"], ".png")
|
|
assert p.exists()
|
|
p.unlink()
|
|
|
|
r0 = http.get(api_base + "/api/tags", params={"limit": "1000", "include_zero": "false"}, timeout=120)
|
|
tags0 = r0.json()
|
|
assert r0.status_code == 200, tags0
|
|
byname0 = {t["name"]: t for t in tags0.get("tags", [])}
|
|
old_missing = int(byname0.get("missing", {}).get("count", 0))
|
|
|
|
# Sync -> both AssetInfos for this asset must receive 'missing'
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
ga = http.get(f"{api_base}/api/assets/{created['id']}", timeout=120)
|
|
da = ga.json()
|
|
assert ga.status_code == 200, da
|
|
assert "missing" in set(da.get("tags", []))
|
|
|
|
gb = http.get(f"{api_base}/api/assets/{second_id}", timeout=120)
|
|
db = gb.json()
|
|
assert gb.status_code == 200, db
|
|
assert "missing" in set(db.get("tags", []))
|
|
|
|
# Tag usage for 'missing' increased by exactly 2 (two AssetInfos)
|
|
r1 = http.get(api_base + "/api/tags", params={"limit": "1000", "include_zero": "false"}, timeout=120)
|
|
tags1 = r1.json()
|
|
assert r1.status_code == 200, tags1
|
|
byname1 = {t["name"]: t for t in tags1.get("tags", [])}
|
|
new_missing = int(byname1.get("missing", {}).get("count", 0))
|
|
assert new_missing == old_missing + 2
|
|
|
|
|
|
@pytest.mark.skip(reason="Requires computing hashes of files in directories to deduplicate into multiple cache states")
|
|
def test_hashed_asset_two_cache_states_partial_delete_then_full_delete(
|
|
http: requests.Session,
|
|
api_base: str,
|
|
comfy_tmp_base_dir: Path,
|
|
asset_factory,
|
|
make_asset_bytes,
|
|
run_scan_and_wait,
|
|
):
|
|
"""Hashed asset with two cache_state rows:
|
|
1. delete one file -> sync should NOT add 'missing'
|
|
2. delete second file -> sync should add 'missing'
|
|
"""
|
|
name = "two_cache_states_partial_delete.png"
|
|
tags = ["input", "unit-tests", "dual"]
|
|
data = make_asset_bytes(name, 3072)
|
|
|
|
created = asset_factory(name, tags, {}, data)
|
|
path1 = comfy_tmp_base_dir / "input" / "unit-tests" / "dual" / get_asset_filename(created["asset_hash"], ".png")
|
|
assert path1.exists()
|
|
|
|
# Create a second on-disk copy under the same root but different subfolder
|
|
path2 = comfy_tmp_base_dir / "input" / "unit-tests" / "dual_copy" / name
|
|
path2.parent.mkdir(parents=True, exist_ok=True)
|
|
path2.write_bytes(data)
|
|
|
|
# Fast seed so the second path appears (as a seed initially)
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
# Deduplication of AssetInfo-s will not happen as first AssetInfo has owner='default' and second has empty owner.
|
|
run_scan_and_wait("input")
|
|
|
|
# Remove only one file and sync -> asset should still be healthy (no 'missing')
|
|
path1.unlink()
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
g1 = http.get(f"{api_base}/api/assets/{created['id']}", timeout=120)
|
|
d1 = g1.json()
|
|
assert g1.status_code == 200, d1
|
|
assert "missing" not in set(d1.get("tags", [])), "Should not be missing while one valid path remains"
|
|
|
|
# Baseline 'missing' usage count just before last file removal
|
|
r0 = http.get(api_base + "/api/tags", params={"limit": "1000", "include_zero": "false"}, timeout=120)
|
|
tags0 = r0.json()
|
|
assert r0.status_code == 200, tags0
|
|
old_missing = int({t["name"]: t for t in tags0.get("tags", [])}.get("missing", {}).get("count", 0))
|
|
|
|
# Remove the second (last) file and sync -> now we expect 'missing' on this AssetInfo
|
|
path2.unlink()
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
g2 = http.get(f"{api_base}/api/assets/{created['id']}", timeout=120)
|
|
d2 = g2.json()
|
|
assert g2.status_code == 200, d2
|
|
assert "missing" in set(d2.get("tags", [])), "Missing must be set once no valid paths remain"
|
|
|
|
# Tag usage for 'missing' increased by exactly 2 (two AssetInfo for one Asset)
|
|
r1 = http.get(api_base + "/api/tags", params={"limit": "1000", "include_zero": "false"}, timeout=120)
|
|
tags1 = r1.json()
|
|
assert r1.status_code == 200, tags1
|
|
new_missing = int({t["name"]: t for t in tags1.get("tags", [])}.get("missing", {}).get("count", 0))
|
|
assert new_missing == old_missing + 2
|
|
|
|
|
|
@pytest.mark.parametrize("root", ["input", "output"])
|
|
def test_missing_tag_clears_on_fastpass_when_mtime_and_size_match(
|
|
root: str,
|
|
http: requests.Session,
|
|
api_base: str,
|
|
comfy_tmp_base_dir: Path,
|
|
asset_factory,
|
|
make_asset_bytes,
|
|
):
|
|
"""
|
|
Fast pass alone clears 'missing' when size and mtime match exactly:
|
|
1) upload (hashed), record original mtime_ns
|
|
2) delete -> fast pass adds 'missing'
|
|
3) restore same bytes and set mtime back to the original value
|
|
4) run fast pass again -> 'missing' is removed (no slow scan)
|
|
"""
|
|
scope = f"fastclear-{uuid.uuid4().hex[:6]}"
|
|
name = "fastpass_clear.bin"
|
|
data = make_asset_bytes(name, 3072)
|
|
|
|
a = asset_factory(name, [root, "unit-tests", scope], {}, data)
|
|
aid = a["id"]
|
|
p = comfy_tmp_base_dir / root / get_asset_filename(a["asset_hash"], ".bin")
|
|
st0 = p.stat()
|
|
orig_mtime_ns = getattr(st0, "st_mtime_ns", int(st0.st_mtime * 1_000_000_000))
|
|
|
|
# Delete -> fast pass adds 'missing'
|
|
p.unlink()
|
|
trigger_sync_seed_assets(http, api_base)
|
|
g1 = http.get(f"{api_base}/api/assets/{aid}", timeout=120)
|
|
d1 = g1.json()
|
|
assert g1.status_code == 200, d1
|
|
assert "missing" in set(d1.get("tags", []))
|
|
|
|
# Restore same bytes and revert mtime to the original value
|
|
p.parent.mkdir(parents=True, exist_ok=True)
|
|
p.write_bytes(data)
|
|
# set both atime and mtime in ns to ensure exact match
|
|
os.utime(p, ns=(orig_mtime_ns, orig_mtime_ns))
|
|
|
|
# Fast pass should clear 'missing' without a scan
|
|
trigger_sync_seed_assets(http, api_base)
|
|
g2 = http.get(f"{api_base}/api/assets/{aid}", timeout=120)
|
|
d2 = g2.json()
|
|
assert g2.status_code == 200, d2
|
|
assert "missing" not in set(d2.get("tags", [])), "Fast pass should clear 'missing' when size+mtime match"
|
|
|
|
|
|
@pytest.mark.skip(reason="Requires computing hashes of files in directories to deduplicate into multiple cache states")
|
|
@pytest.mark.parametrize("root", ["input", "output"])
|
|
def test_fastpass_removes_stale_state_row_no_missing(
|
|
root: str,
|
|
http: requests.Session,
|
|
api_base: str,
|
|
comfy_tmp_base_dir: Path,
|
|
asset_factory,
|
|
make_asset_bytes,
|
|
run_scan_and_wait,
|
|
):
|
|
"""
|
|
Hashed asset with two states:
|
|
- delete one file
|
|
- run fast pass only
|
|
Expect:
|
|
- asset stays healthy (no 'missing')
|
|
- stale AssetCacheState row for the deleted path is removed.
|
|
We verify this behaviorally by recreating the deleted path and running fast pass again:
|
|
a new *seed* AssetInfo is created, which proves the old state row was not reused.
|
|
"""
|
|
scope = f"stale-{uuid.uuid4().hex[:6]}"
|
|
name = "two_states.bin"
|
|
data = make_asset_bytes(name, 2048)
|
|
|
|
# Upload hashed asset at path1
|
|
a = asset_factory(name, [root, "unit-tests", scope], {}, data)
|
|
base = comfy_tmp_base_dir / root / "unit-tests" / scope
|
|
a1_filename = get_asset_filename(a["asset_hash"], ".bin")
|
|
p1 = base / a1_filename
|
|
assert p1.exists()
|
|
|
|
aid = a["id"]
|
|
h = a["asset_hash"]
|
|
|
|
# Create second state path2, seed+scan to dedupe into the same Asset
|
|
p2 = base / "copy" / name
|
|
p2.parent.mkdir(parents=True, exist_ok=True)
|
|
p2.write_bytes(data)
|
|
trigger_sync_seed_assets(http, api_base)
|
|
run_scan_and_wait(root)
|
|
|
|
# Delete path1 and run fast pass -> no 'missing' and stale state row should be removed
|
|
p1.unlink()
|
|
trigger_sync_seed_assets(http, api_base)
|
|
g1 = http.get(f"{api_base}/api/assets/{aid}", timeout=120)
|
|
d1 = g1.json()
|
|
assert g1.status_code == 200, d1
|
|
assert "missing" not in set(d1.get("tags", []))
|
|
|
|
# Recreate path1 and run fast pass again.
|
|
# If the stale state row was removed, a NEW seed AssetInfo will appear for this path.
|
|
p1.write_bytes(data)
|
|
trigger_sync_seed_assets(http, api_base)
|
|
|
|
rl = http.get(
|
|
api_base + "/api/assets",
|
|
params={"include_tags": f"unit-tests,{scope}"},
|
|
timeout=120,
|
|
)
|
|
bl = rl.json()
|
|
assert rl.status_code == 200, bl
|
|
items = bl.get("assets", [])
|
|
# one hashed AssetInfo (asset_hash == h) + one seed AssetInfo (asset_hash == null)
|
|
hashes = [it.get("asset_hash") for it in items if it.get("name") in (name, a1_filename)]
|
|
assert h in hashes
|
|
assert any(x is None for x in hashes), "Expected a new seed AssetInfo for the recreated path"
|
|
|
|
# Asset identity still healthy
|
|
rh = http.head(f"{api_base}/api/assets/hash/{h}", timeout=120)
|
|
assert rh.status_code == 200
|