mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-07 12:02:37 +08:00
15ee03f65c
Architecture changes: - API Routes -> manager.py (thin adapter) -> services/ (business logic) -> queries/ (atomic DB ops) - Services own session lifecycle via create_session() - Queries accept Session as parameter, do single-table atomic operations New app/assets/services/ layer: - __init__.py - exports all service functions - ingest.py - ingest_file_from_path(), register_existing_asset() - asset_management.py - get_asset_detail(), update_asset_metadata(), delete_asset_reference(), set_asset_preview() - tagging.py - apply_tags(), remove_tags(), list_tags() Removed from queries/asset_info.py: - ingest_fs_asset (moved to services/ingest.py as ingest_file_from_path) - update_asset_info_full (moved to services/asset_management.py as update_asset_metadata) - create_asset_info_for_existing_asset (moved to services/ingest.py as register_existing_asset) Updated manager.py: - Now a thin adapter that transforms API schemas to/from service calls - Delegates all business logic to services layer - No longer imports sqlalchemy.orm.Session or models directly Test updates: - Fixed test_cache_state.py import of pick_best_live_path (moved to helpers.py) - Added comprehensive service layer tests (41 new tests) - All 112 query + service tests pass Amp-Thread-ID: https://ampcode.com/threads/T-019c24e2-7ae4-707f-ad19-c775ed8b82b5 Co-authored-by: Amp <amp@ampcode.com>
265 lines
8.5 KiB
Python
265 lines
8.5 KiB
Python
"""Tests for asset_management services."""
|
|
import pytest
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.assets.database.models import Asset, AssetInfo, Tag
|
|
from app.assets.database.queries import ensure_tags_exist, add_tags_to_asset_info
|
|
from app.assets.helpers import utcnow
|
|
from app.assets.services import (
|
|
get_asset_detail,
|
|
update_asset_metadata,
|
|
delete_asset_reference,
|
|
set_asset_preview,
|
|
)
|
|
|
|
|
|
def _make_asset(session: Session, hash_val: str = "blake3:test", 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_asset_info(
|
|
session: Session,
|
|
asset: Asset,
|
|
name: str = "test",
|
|
owner_id: str = "",
|
|
) -> AssetInfo:
|
|
now = utcnow()
|
|
info = AssetInfo(
|
|
owner_id=owner_id,
|
|
name=name,
|
|
asset_id=asset.id,
|
|
created_at=now,
|
|
updated_at=now,
|
|
last_access_time=now,
|
|
)
|
|
session.add(info)
|
|
session.flush()
|
|
return info
|
|
|
|
|
|
class TestGetAssetDetail:
|
|
def test_returns_none_for_nonexistent(self, mock_create_session):
|
|
result = get_asset_detail(asset_info_id="nonexistent")
|
|
assert result is None
|
|
|
|
def test_returns_asset_with_tags(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset, name="test.bin")
|
|
ensure_tags_exist(session, ["alpha", "beta"])
|
|
add_tags_to_asset_info(session, asset_info_id=info.id, tags=["alpha", "beta"])
|
|
session.commit()
|
|
|
|
result = get_asset_detail(asset_info_id=info.id)
|
|
|
|
assert result is not None
|
|
assert result["info"].id == info.id
|
|
assert result["asset"].id == asset.id
|
|
assert set(result["tags"]) == {"alpha", "beta"}
|
|
|
|
def test_respects_owner_visibility(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
# Wrong owner cannot see
|
|
result = get_asset_detail(asset_info_id=info.id, owner_id="user2")
|
|
assert result is None
|
|
|
|
# Correct owner can see
|
|
result = get_asset_detail(asset_info_id=info.id, owner_id="user1")
|
|
assert result is not None
|
|
|
|
|
|
class TestUpdateAssetMetadata:
|
|
def test_updates_name(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset, name="old_name.bin")
|
|
info_id = info.id
|
|
session.commit()
|
|
|
|
update_asset_metadata(
|
|
asset_info_id=info_id,
|
|
name="new_name.bin",
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_info = session.get(AssetInfo, info_id)
|
|
assert updated_info.name == "new_name.bin"
|
|
|
|
def test_updates_tags(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset)
|
|
ensure_tags_exist(session, ["old"])
|
|
add_tags_to_asset_info(session, asset_info_id=info.id, tags=["old"])
|
|
session.commit()
|
|
|
|
result = update_asset_metadata(
|
|
asset_info_id=info.id,
|
|
tags=["new1", "new2"],
|
|
)
|
|
|
|
assert set(result["tags"]) == {"new1", "new2"}
|
|
assert "old" not in result["tags"]
|
|
|
|
def test_updates_user_metadata(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset)
|
|
info_id = info.id
|
|
session.commit()
|
|
|
|
update_asset_metadata(
|
|
asset_info_id=info_id,
|
|
user_metadata={"key": "value", "num": 42},
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_info = session.get(AssetInfo, info_id)
|
|
assert updated_info.user_metadata["key"] == "value"
|
|
assert updated_info.user_metadata["num"] == 42
|
|
|
|
def test_raises_for_nonexistent(self, mock_create_session):
|
|
with pytest.raises(ValueError, match="not found"):
|
|
update_asset_metadata(asset_info_id="nonexistent", name="fail")
|
|
|
|
def test_raises_for_wrong_owner(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
with pytest.raises(PermissionError, match="not owner"):
|
|
update_asset_metadata(
|
|
asset_info_id=info.id,
|
|
name="new",
|
|
owner_id="user2",
|
|
)
|
|
|
|
|
|
class TestDeleteAssetReference:
|
|
def test_deletes_asset_info(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset)
|
|
info_id = info.id
|
|
session.commit()
|
|
|
|
result = delete_asset_reference(
|
|
asset_info_id=info_id,
|
|
owner_id="",
|
|
delete_content_if_orphan=False,
|
|
)
|
|
|
|
assert result is True
|
|
assert session.get(AssetInfo, info_id) is None
|
|
|
|
def test_returns_false_for_nonexistent(self, mock_create_session):
|
|
result = delete_asset_reference(
|
|
asset_info_id="nonexistent",
|
|
owner_id="",
|
|
)
|
|
assert result is False
|
|
|
|
def test_returns_false_for_wrong_owner(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset, owner_id="user1")
|
|
info_id = info.id
|
|
session.commit()
|
|
|
|
result = delete_asset_reference(
|
|
asset_info_id=info_id,
|
|
owner_id="user2",
|
|
)
|
|
|
|
assert result is False
|
|
assert session.get(AssetInfo, info_id) is not None
|
|
|
|
def test_keeps_asset_if_other_infos_exist(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info1 = _make_asset_info(session, asset, name="info1")
|
|
info2 = _make_asset_info(session, asset, name="info2")
|
|
asset_id = asset.id
|
|
session.commit()
|
|
|
|
delete_asset_reference(
|
|
asset_info_id=info1.id,
|
|
owner_id="",
|
|
delete_content_if_orphan=True,
|
|
)
|
|
|
|
# Asset should still exist
|
|
assert session.get(Asset, asset_id) is not None
|
|
|
|
def test_deletes_orphaned_asset(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset)
|
|
asset_id = asset.id
|
|
info_id = info.id
|
|
session.commit()
|
|
|
|
delete_asset_reference(
|
|
asset_info_id=info_id,
|
|
owner_id="",
|
|
delete_content_if_orphan=True,
|
|
)
|
|
|
|
# Both info and asset should be gone
|
|
assert session.get(AssetInfo, info_id) is None
|
|
assert session.get(Asset, asset_id) is None
|
|
|
|
|
|
class TestSetAssetPreview:
|
|
def test_sets_preview(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session, hash_val="blake3:main")
|
|
preview_asset = _make_asset(session, hash_val="blake3:preview")
|
|
info = _make_asset_info(session, asset)
|
|
info_id = info.id
|
|
preview_id = preview_asset.id
|
|
session.commit()
|
|
|
|
set_asset_preview(
|
|
asset_info_id=info_id,
|
|
preview_asset_id=preview_id,
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_info = session.get(AssetInfo, info_id)
|
|
assert updated_info.preview_id == preview_id
|
|
|
|
def test_clears_preview(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
preview_asset = _make_asset(session, hash_val="blake3:preview")
|
|
info = _make_asset_info(session, asset)
|
|
info.preview_id = preview_asset.id
|
|
info_id = info.id
|
|
session.commit()
|
|
|
|
set_asset_preview(
|
|
asset_info_id=info_id,
|
|
preview_asset_id=None,
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_info = session.get(AssetInfo, info_id)
|
|
assert updated_info.preview_id is None
|
|
|
|
def test_raises_for_nonexistent_info(self, mock_create_session):
|
|
with pytest.raises(ValueError, match="not found"):
|
|
set_asset_preview(asset_info_id="nonexistent")
|
|
|
|
def test_raises_for_wrong_owner(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
info = _make_asset_info(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
with pytest.raises(PermissionError, match="not owner"):
|
|
set_asset_preview(
|
|
asset_info_id=info.id,
|
|
preview_asset_id=None,
|
|
owner_id="user2",
|
|
)
|