mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-04 08:47:35 +08:00
6b48144751
This change solves the basename collision bug by using UNIQUE(file_path) on the unified asset_references table. Key changes: Database: - Migration 0005 merges asset_cache_states and asset_infos into asset_references - AssetReference now contains: cache state fields (file_path, mtime_ns, needs_verify, is_missing, enrichment_level) plus info fields (name, owner_id, preview_id, etc.) - AssetReferenceMeta replaces AssetInfoMeta - AssetReferenceTag replaces AssetInfoTag - UNIQUE constraint on file_path prevents duplicate entries for same file Code: - New unified query module: asset_reference.py (replaces asset_info.py, cache_state.py) - Updated scanner, seeder, and services to use AssetReference - Updated API routes to use reference_id instead of asset_info_id Tests: - All 175 unit tests updated and passing - Integration tests require server environment (not run here) Amp-Thread-ID: https://ampcode.com/threads/T-019c4fe8-9dcb-75ce-bea8-ea786343a581 Co-authored-by: Amp <amp@ampcode.com>
518 lines
18 KiB
Python
518 lines
18 KiB
Python
import time
|
|
import uuid
|
|
import pytest
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.assets.database.models import Asset, AssetReference, AssetReferenceMeta
|
|
from app.assets.database.queries import (
|
|
reference_exists_for_asset_id,
|
|
get_reference_by_id,
|
|
insert_reference,
|
|
get_or_create_reference,
|
|
update_reference_timestamps,
|
|
list_references_page,
|
|
fetch_reference_asset_and_tags,
|
|
fetch_reference_and_asset,
|
|
update_reference_access_time,
|
|
set_reference_metadata,
|
|
delete_reference_by_id,
|
|
set_reference_preview,
|
|
bulk_insert_references_ignore_conflicts,
|
|
get_reference_ids_by_ids,
|
|
ensure_tags_exist,
|
|
add_tags_to_reference,
|
|
)
|
|
from app.assets.helpers import get_utc_now
|
|
|
|
|
|
def _make_asset(session: Session, hash_val: str | None = None, size: int = 1024) -> Asset:
|
|
asset = Asset(hash=hash_val, size_bytes=size, mime_type="application/octet-stream")
|
|
session.add(asset)
|
|
session.flush()
|
|
return asset
|
|
|
|
|
|
def _make_reference(
|
|
session: Session,
|
|
asset: Asset,
|
|
name: str = "test",
|
|
owner_id: str = "",
|
|
) -> AssetReference:
|
|
now = get_utc_now()
|
|
ref = AssetReference(
|
|
owner_id=owner_id,
|
|
name=name,
|
|
asset_id=asset.id,
|
|
created_at=now,
|
|
updated_at=now,
|
|
last_access_time=now,
|
|
)
|
|
session.add(ref)
|
|
session.flush()
|
|
return ref
|
|
|
|
|
|
class TestReferenceExistsForAssetId:
|
|
def test_returns_false_when_no_reference(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
assert reference_exists_for_asset_id(session, asset_id=asset.id) is False
|
|
|
|
def test_returns_true_when_reference_exists(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_reference(session, asset)
|
|
assert reference_exists_for_asset_id(session, asset_id=asset.id) is True
|
|
|
|
|
|
class TestGetReferenceById:
|
|
def test_returns_none_for_nonexistent(self, session: Session):
|
|
assert get_reference_by_id(session, reference_id="nonexistent") is None
|
|
|
|
def test_returns_reference(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset, name="myfile.txt")
|
|
|
|
result = get_reference_by_id(session, reference_id=ref.id)
|
|
assert result is not None
|
|
assert result.name == "myfile.txt"
|
|
|
|
|
|
class TestListReferencesPage:
|
|
def test_empty_db(self, session: Session):
|
|
refs, tag_map, total = list_references_page(session)
|
|
assert refs == []
|
|
assert tag_map == {}
|
|
assert total == 0
|
|
|
|
def test_returns_references_with_tags(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset, name="test.bin")
|
|
ensure_tags_exist(session, ["alpha", "beta"])
|
|
add_tags_to_reference(session, reference_id=ref.id, tags=["alpha", "beta"])
|
|
session.commit()
|
|
|
|
refs, tag_map, total = list_references_page(session)
|
|
assert len(refs) == 1
|
|
assert refs[0].id == ref.id
|
|
assert set(tag_map[ref.id]) == {"alpha", "beta"}
|
|
assert total == 1
|
|
|
|
def test_name_contains_filter(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_reference(session, asset, name="model_v1.safetensors")
|
|
_make_reference(session, asset, name="config.json")
|
|
session.commit()
|
|
|
|
refs, _, total = list_references_page(session, name_contains="model")
|
|
assert total == 1
|
|
assert refs[0].name == "model_v1.safetensors"
|
|
|
|
def test_owner_visibility(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_reference(session, asset, name="public", owner_id="")
|
|
_make_reference(session, asset, name="private", owner_id="user1")
|
|
session.commit()
|
|
|
|
# Empty owner sees only public
|
|
refs, _, total = list_references_page(session, owner_id="")
|
|
assert total == 1
|
|
assert refs[0].name == "public"
|
|
|
|
# Owner sees both
|
|
refs, _, total = list_references_page(session, owner_id="user1")
|
|
assert total == 2
|
|
|
|
def test_include_tags_filter(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref1 = _make_reference(session, asset, name="tagged")
|
|
_make_reference(session, asset, name="untagged")
|
|
ensure_tags_exist(session, ["wanted"])
|
|
add_tags_to_reference(session, reference_id=ref1.id, tags=["wanted"])
|
|
session.commit()
|
|
|
|
refs, _, total = list_references_page(session, include_tags=["wanted"])
|
|
assert total == 1
|
|
assert refs[0].name == "tagged"
|
|
|
|
def test_exclude_tags_filter(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_reference(session, asset, name="keep")
|
|
ref_exclude = _make_reference(session, asset, name="exclude")
|
|
ensure_tags_exist(session, ["bad"])
|
|
add_tags_to_reference(session, reference_id=ref_exclude.id, tags=["bad"])
|
|
session.commit()
|
|
|
|
refs, _, total = list_references_page(session, exclude_tags=["bad"])
|
|
assert total == 1
|
|
assert refs[0].name == "keep"
|
|
|
|
def test_sorting(self, session: Session):
|
|
asset = _make_asset(session, "hash1", size=100)
|
|
asset2 = _make_asset(session, "hash2", size=500)
|
|
_make_reference(session, asset, name="small")
|
|
_make_reference(session, asset2, name="large")
|
|
session.commit()
|
|
|
|
refs, _, _ = list_references_page(session, sort="size", order="desc")
|
|
assert refs[0].name == "large"
|
|
|
|
refs, _, _ = list_references_page(session, sort="name", order="asc")
|
|
assert refs[0].name == "large"
|
|
|
|
|
|
class TestFetchReferenceAssetAndTags:
|
|
def test_returns_none_for_nonexistent(self, session: Session):
|
|
result = fetch_reference_asset_and_tags(session, "nonexistent")
|
|
assert result is None
|
|
|
|
def test_returns_tuple(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset, name="test.bin")
|
|
ensure_tags_exist(session, ["tag1"])
|
|
add_tags_to_reference(session, reference_id=ref.id, tags=["tag1"])
|
|
session.commit()
|
|
|
|
result = fetch_reference_asset_and_tags(session, ref.id)
|
|
assert result is not None
|
|
ret_ref, ret_asset, ret_tags = result
|
|
assert ret_ref.id == ref.id
|
|
assert ret_asset.id == asset.id
|
|
assert ret_tags == ["tag1"]
|
|
|
|
|
|
class TestFetchReferenceAndAsset:
|
|
def test_returns_none_for_nonexistent(self, session: Session):
|
|
result = fetch_reference_and_asset(session, reference_id="nonexistent")
|
|
assert result is None
|
|
|
|
def test_returns_tuple(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
result = fetch_reference_and_asset(session, reference_id=ref.id)
|
|
assert result is not None
|
|
ret_ref, ret_asset = result
|
|
assert ret_ref.id == ref.id
|
|
assert ret_asset.id == asset.id
|
|
|
|
|
|
class TestUpdateReferenceAccessTime:
|
|
def test_updates_last_access_time(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
original_time = ref.last_access_time
|
|
session.commit()
|
|
|
|
import time
|
|
time.sleep(0.01)
|
|
|
|
update_reference_access_time(session, reference_id=ref.id)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.last_access_time > original_time
|
|
|
|
|
|
class TestDeleteReferenceById:
|
|
def test_deletes_existing(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
result = delete_reference_by_id(session, reference_id=ref.id, owner_id="")
|
|
assert result is True
|
|
assert get_reference_by_id(session, reference_id=ref.id) is None
|
|
|
|
def test_returns_false_for_nonexistent(self, session: Session):
|
|
result = delete_reference_by_id(session, reference_id="nonexistent", owner_id="")
|
|
assert result is False
|
|
|
|
def test_respects_owner_visibility(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
result = delete_reference_by_id(session, reference_id=ref.id, owner_id="user2")
|
|
assert result is False
|
|
assert get_reference_by_id(session, reference_id=ref.id) is not None
|
|
|
|
|
|
class TestSetReferencePreview:
|
|
def test_sets_preview(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
preview_asset = _make_asset(session, "preview_hash")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
set_reference_preview(session, reference_id=ref.id, preview_asset_id=preview_asset.id)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.preview_id == preview_asset.id
|
|
|
|
def test_clears_preview(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
preview_asset = _make_asset(session, "preview_hash")
|
|
ref = _make_reference(session, asset)
|
|
ref.preview_id = preview_asset.id
|
|
session.commit()
|
|
|
|
set_reference_preview(session, reference_id=ref.id, preview_asset_id=None)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.preview_id is None
|
|
|
|
def test_raises_for_nonexistent_reference(self, session: Session):
|
|
with pytest.raises(ValueError, match="not found"):
|
|
set_reference_preview(session, reference_id="nonexistent", preview_asset_id=None)
|
|
|
|
def test_raises_for_nonexistent_preview(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
with pytest.raises(ValueError, match="Preview Asset"):
|
|
set_reference_preview(session, reference_id=ref.id, preview_asset_id="nonexistent")
|
|
|
|
|
|
class TestInsertReference:
|
|
def test_creates_new_reference(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = insert_reference(
|
|
session, asset_id=asset.id, owner_id="user1", name="test.bin"
|
|
)
|
|
session.commit()
|
|
|
|
assert ref is not None
|
|
assert ref.name == "test.bin"
|
|
assert ref.owner_id == "user1"
|
|
|
|
def test_allows_duplicate_names(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref1 = insert_reference(session, asset_id=asset.id, owner_id="user1", name="dup.bin")
|
|
session.commit()
|
|
|
|
# Duplicate names are now allowed
|
|
ref2 = insert_reference(
|
|
session, asset_id=asset.id, owner_id="user1", name="dup.bin"
|
|
)
|
|
session.commit()
|
|
|
|
assert ref1 is not None
|
|
assert ref2 is not None
|
|
assert ref1.id != ref2.id
|
|
|
|
|
|
class TestGetOrCreateReference:
|
|
def test_creates_new_reference(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref, created = get_or_create_reference(
|
|
session, asset_id=asset.id, owner_id="user1", name="new.bin"
|
|
)
|
|
session.commit()
|
|
|
|
assert created is True
|
|
assert ref.name == "new.bin"
|
|
|
|
def test_always_creates_new_reference(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref1, created1 = get_or_create_reference(
|
|
session, asset_id=asset.id, owner_id="user1", name="existing.bin"
|
|
)
|
|
session.commit()
|
|
|
|
# Duplicate names are allowed, so always creates new
|
|
ref2, created2 = get_or_create_reference(
|
|
session, asset_id=asset.id, owner_id="user1", name="existing.bin"
|
|
)
|
|
session.commit()
|
|
|
|
assert created1 is True
|
|
assert created2 is True
|
|
assert ref1.id != ref2.id
|
|
|
|
|
|
class TestUpdateReferenceTimestamps:
|
|
def test_updates_timestamps(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
original_updated_at = ref.updated_at
|
|
session.commit()
|
|
|
|
time.sleep(0.01)
|
|
update_reference_timestamps(session, ref)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.updated_at > original_updated_at
|
|
|
|
def test_updates_preview_id(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
preview_asset = _make_asset(session, "preview_hash")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
update_reference_timestamps(session, ref, preview_id=preview_asset.id)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.preview_id == preview_asset.id
|
|
|
|
|
|
class TestSetReferenceMetadata:
|
|
def test_sets_metadata(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
set_reference_metadata(
|
|
session, reference_id=ref.id, user_metadata={"key": "value"}
|
|
)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.user_metadata == {"key": "value"}
|
|
# Check metadata table
|
|
meta = session.query(AssetReferenceMeta).filter_by(asset_reference_id=ref.id).all()
|
|
assert len(meta) == 1
|
|
assert meta[0].key == "key"
|
|
assert meta[0].val_str == "value"
|
|
|
|
def test_replaces_existing_metadata(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
set_reference_metadata(
|
|
session, reference_id=ref.id, user_metadata={"old": "data"}
|
|
)
|
|
session.commit()
|
|
|
|
set_reference_metadata(
|
|
session, reference_id=ref.id, user_metadata={"new": "data"}
|
|
)
|
|
session.commit()
|
|
|
|
meta = session.query(AssetReferenceMeta).filter_by(asset_reference_id=ref.id).all()
|
|
assert len(meta) == 1
|
|
assert meta[0].key == "new"
|
|
|
|
def test_clears_metadata_with_empty_dict(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref = _make_reference(session, asset)
|
|
session.commit()
|
|
|
|
set_reference_metadata(
|
|
session, reference_id=ref.id, user_metadata={"key": "value"}
|
|
)
|
|
session.commit()
|
|
|
|
set_reference_metadata(
|
|
session, reference_id=ref.id, user_metadata={}
|
|
)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.user_metadata == {}
|
|
meta = session.query(AssetReferenceMeta).filter_by(asset_reference_id=ref.id).all()
|
|
assert len(meta) == 0
|
|
|
|
def test_raises_for_nonexistent(self, session: Session):
|
|
with pytest.raises(ValueError, match="not found"):
|
|
set_reference_metadata(
|
|
session, reference_id="nonexistent", user_metadata={"key": "value"}
|
|
)
|
|
|
|
|
|
class TestBulkInsertReferencesIgnoreConflicts:
|
|
def test_inserts_multiple_references(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
now = get_utc_now()
|
|
rows = [
|
|
{
|
|
"id": str(uuid.uuid4()),
|
|
"owner_id": "",
|
|
"name": "bulk1.bin",
|
|
"asset_id": asset.id,
|
|
"preview_id": None,
|
|
"user_metadata": {},
|
|
"created_at": now,
|
|
"updated_at": now,
|
|
"last_access_time": now,
|
|
},
|
|
{
|
|
"id": str(uuid.uuid4()),
|
|
"owner_id": "",
|
|
"name": "bulk2.bin",
|
|
"asset_id": asset.id,
|
|
"preview_id": None,
|
|
"user_metadata": {},
|
|
"created_at": now,
|
|
"updated_at": now,
|
|
"last_access_time": now,
|
|
},
|
|
]
|
|
bulk_insert_references_ignore_conflicts(session, rows)
|
|
session.commit()
|
|
|
|
refs = session.query(AssetReference).all()
|
|
assert len(refs) == 2
|
|
|
|
def test_allows_duplicate_names(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_reference(session, asset, name="existing.bin", owner_id="")
|
|
session.commit()
|
|
|
|
now = get_utc_now()
|
|
rows = [
|
|
{
|
|
"id": str(uuid.uuid4()),
|
|
"owner_id": "",
|
|
"name": "existing.bin",
|
|
"asset_id": asset.id,
|
|
"preview_id": None,
|
|
"user_metadata": {},
|
|
"created_at": now,
|
|
"updated_at": now,
|
|
"last_access_time": now,
|
|
},
|
|
{
|
|
"id": str(uuid.uuid4()),
|
|
"owner_id": "",
|
|
"name": "new.bin",
|
|
"asset_id": asset.id,
|
|
"preview_id": None,
|
|
"user_metadata": {},
|
|
"created_at": now,
|
|
"updated_at": now,
|
|
"last_access_time": now,
|
|
},
|
|
]
|
|
bulk_insert_references_ignore_conflicts(session, rows)
|
|
session.commit()
|
|
|
|
# Duplicate names allowed, so all 3 rows exist
|
|
refs = session.query(AssetReference).all()
|
|
assert len(refs) == 3
|
|
|
|
def test_empty_list_is_noop(self, session: Session):
|
|
bulk_insert_references_ignore_conflicts(session, [])
|
|
assert session.query(AssetReference).count() == 0
|
|
|
|
|
|
class TestGetReferenceIdsByIds:
|
|
def test_returns_existing_ids(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
ref1 = _make_reference(session, asset, name="a.bin")
|
|
ref2 = _make_reference(session, asset, name="b.bin")
|
|
session.commit()
|
|
|
|
found = get_reference_ids_by_ids(session, [ref1.id, ref2.id, "nonexistent"])
|
|
|
|
assert found == {ref1.id, ref2.id}
|
|
|
|
def test_empty_list_returns_empty(self, session: Session):
|
|
found = get_reference_ids_by_ids(session, [])
|
|
assert found == set()
|