mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-06 19:42:34 +08:00
- Fix unused imports in routes.py, asset.py, manager.py, asset_management.py, ingest.py - Fix whitespace issues in upload.py, asset_info.py, ingest.py - Fix typo in manager.py (stray character after result["asset"]) - Fix broken import in test_metadata.py (project_kv moved to asset_info.py) - Add fixture override in queries/conftest.py for unit test isolation Add 48 new tests covering all previously untested query functions: - asset.py: upsert_asset, bulk_insert_assets - cache_state.py: upsert_cache_state, delete_cache_states_outside_prefixes, get_orphaned_seed_asset_ids, delete_assets_by_ids, get_cache_states_for_prefixes, bulk_set_needs_verify, delete_cache_states_by_ids, delete_orphaned_seed_asset, bulk_insert_cache_states_ignore_conflicts, get_cache_states_by_paths_and_asset_ids - asset_info.py: insert_asset_info, get_or_create_asset_info, update_asset_info_timestamps, replace_asset_info_metadata_projection, bulk_insert_asset_infos_ignore_conflicts, get_asset_info_ids_by_ids - tags.py: bulk_insert_tags_and_meta Total: 119 tests pass (up from 71) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
180 lines
6.5 KiB
Python
180 lines
6.5 KiB
Python
"""Tests for metadata filtering logic in asset_info queries."""
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.assets.database.models import Asset, AssetInfo, AssetInfoMeta
|
|
from app.assets.database.queries import list_asset_infos_page
|
|
from app.assets.database.queries.asset_info import project_kv
|
|
from app.assets.helpers import utcnow
|
|
|
|
|
|
def _make_asset(session: Session, hash_val: str) -> Asset:
|
|
asset = Asset(hash=hash_val, size_bytes=1024)
|
|
session.add(asset)
|
|
session.flush()
|
|
return asset
|
|
|
|
|
|
def _make_asset_info(
|
|
session: Session,
|
|
asset: Asset,
|
|
name: str,
|
|
metadata: dict | None = None,
|
|
) -> AssetInfo:
|
|
now = utcnow()
|
|
info = AssetInfo(
|
|
owner_id="",
|
|
name=name,
|
|
asset_id=asset.id,
|
|
user_metadata=metadata,
|
|
created_at=now,
|
|
updated_at=now,
|
|
last_access_time=now,
|
|
)
|
|
session.add(info)
|
|
session.flush()
|
|
|
|
if metadata:
|
|
for key, val in metadata.items():
|
|
for row in project_kv(key, val):
|
|
meta_row = AssetInfoMeta(
|
|
asset_info_id=info.id,
|
|
key=row["key"],
|
|
ordinal=row.get("ordinal", 0),
|
|
val_str=row.get("val_str"),
|
|
val_num=row.get("val_num"),
|
|
val_bool=row.get("val_bool"),
|
|
val_json=row.get("val_json"),
|
|
)
|
|
session.add(meta_row)
|
|
session.flush()
|
|
|
|
return info
|
|
|
|
|
|
class TestMetadataFilterString:
|
|
def test_filter_by_string_value(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "match", {"category": "models"})
|
|
_make_asset_info(session, asset, "nomatch", {"category": "images"})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"category": "models"})
|
|
assert total == 1
|
|
assert infos[0].name == "match"
|
|
|
|
def test_filter_by_string_no_match(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "item", {"category": "models"})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"category": "other"})
|
|
assert total == 0
|
|
|
|
|
|
class TestMetadataFilterNumeric:
|
|
def test_filter_by_int_value(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "epoch5", {"epoch": 5})
|
|
_make_asset_info(session, asset, "epoch10", {"epoch": 10})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"epoch": 5})
|
|
assert total == 1
|
|
assert infos[0].name == "epoch5"
|
|
|
|
def test_filter_by_float_value(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "high", {"score": 0.95})
|
|
_make_asset_info(session, asset, "low", {"score": 0.5})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"score": 0.95})
|
|
assert total == 1
|
|
assert infos[0].name == "high"
|
|
|
|
|
|
class TestMetadataFilterBoolean:
|
|
def test_filter_by_true(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "active", {"enabled": True})
|
|
_make_asset_info(session, asset, "inactive", {"enabled": False})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"enabled": True})
|
|
assert total == 1
|
|
assert infos[0].name == "active"
|
|
|
|
def test_filter_by_false(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "active", {"enabled": True})
|
|
_make_asset_info(session, asset, "inactive", {"enabled": False})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"enabled": False})
|
|
assert total == 1
|
|
assert infos[0].name == "inactive"
|
|
|
|
|
|
class TestMetadataFilterNull:
|
|
def test_filter_by_null_matches_missing_key(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "has_key", {"optional": "value"})
|
|
_make_asset_info(session, asset, "missing_key", {})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"optional": None})
|
|
assert total == 1
|
|
assert infos[0].name == "missing_key"
|
|
|
|
def test_filter_by_null_matches_explicit_null(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "explicit_null", {"nullable": None})
|
|
_make_asset_info(session, asset, "has_value", {"nullable": "present"})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"nullable": None})
|
|
assert total == 1
|
|
assert infos[0].name == "explicit_null"
|
|
|
|
|
|
class TestMetadataFilterList:
|
|
def test_filter_by_list_or(self, session: Session):
|
|
"""List values should match ANY of the values (OR)."""
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "cat_a", {"category": "a"})
|
|
_make_asset_info(session, asset, "cat_b", {"category": "b"})
|
|
_make_asset_info(session, asset, "cat_c", {"category": "c"})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={"category": ["a", "b"]})
|
|
assert total == 2
|
|
names = {i.name for i in infos}
|
|
assert names == {"cat_a", "cat_b"}
|
|
|
|
|
|
class TestMetadataFilterMultipleKeys:
|
|
def test_multiple_keys_and(self, session: Session):
|
|
"""Multiple keys should ALL match (AND)."""
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "match", {"type": "model", "version": 2})
|
|
_make_asset_info(session, asset, "wrong_type", {"type": "config", "version": 2})
|
|
_make_asset_info(session, asset, "wrong_version", {"type": "model", "version": 1})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(
|
|
session, metadata_filter={"type": "model", "version": 2}
|
|
)
|
|
assert total == 1
|
|
assert infos[0].name == "match"
|
|
|
|
|
|
class TestMetadataFilterEmptyDict:
|
|
def test_empty_filter_returns_all(self, session: Session):
|
|
asset = _make_asset(session, "hash1")
|
|
_make_asset_info(session, asset, "a", {"key": "val"})
|
|
_make_asset_info(session, asset, "b", {})
|
|
session.commit()
|
|
|
|
infos, _, total = list_asset_infos_page(session, metadata_filter={})
|
|
assert total == 2
|