mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-06-01 20:07:37 +08:00
54c92d0462
Replaces #13744 with a narrower change. Decision after review: drop the dedicated PUT/DELETE /api/assets/{id}/preview endpoints in favor of extending the existing PUT /api/assets/{id} route with a clear_preview_id flag, matching the codebase's existing pattern for clearing operations elsewhere in the project (`clear: true` on /api/queue and /api/history in the cloud sibling). Changes: - openapi.yaml: add `clear_preview_id: boolean` to the UpdateAsset request body, documented as taking precedence over `preview_id` when both are set. - schemas_in.UpdateAssetBody: add the field, extend at-least-one-field validation (clear=true counts, clear=false is a no-op), reject the zero UUID as `preview_id`. - services/asset_management.update_asset_metadata: add `clear_preview_id` param; when true, call set_reference_preview with None to clear the link. Clear takes precedence over set when both provided. - routes.update_asset_route: wire the flag through. Reject self-referential preview_id (preview_id == path id) at 400 SELF_REFERENCE before service call. - Tests: cover clear-via-flag happy path, clear-takes-precedence, schema validation edge cases (zero UUID rejected, clear-only valid, false-only rejected).
370 lines
12 KiB
Python
370 lines
12 KiB
Python
"""Tests for asset_management services."""
|
|
import pytest
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.assets.database.models import Asset, AssetReference
|
|
from app.assets.database.queries import ensure_tags_exist, add_tags_to_reference
|
|
from app.assets.helpers import get_utc_now
|
|
from app.assets.services import (
|
|
get_asset_detail,
|
|
update_asset_metadata,
|
|
delete_asset_reference,
|
|
set_asset_preview,
|
|
)
|
|
from app.assets.services.asset_management import resolve_hash_to_path
|
|
|
|
|
|
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_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 TestGetAssetDetail:
|
|
def test_returns_none_for_nonexistent(self, mock_create_session):
|
|
result = get_asset_detail(reference_id="nonexistent")
|
|
assert result is None
|
|
|
|
def test_returns_asset_with_tags(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
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()
|
|
|
|
result = get_asset_detail(reference_id=ref.id)
|
|
|
|
assert result is not None
|
|
assert result.ref.id == ref.id
|
|
assert result.asset.hash == asset.hash
|
|
assert set(result.tags) == {"alpha", "beta"}
|
|
|
|
def test_respects_owner_visibility(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
ref = _make_reference(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
# Wrong owner cannot see
|
|
result = get_asset_detail(reference_id=ref.id, owner_id="user2")
|
|
assert result is None
|
|
|
|
# Correct owner can see
|
|
result = get_asset_detail(reference_id=ref.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)
|
|
ref = _make_reference(session, asset, name="old_name.bin")
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
update_asset_metadata(
|
|
reference_id=ref_id,
|
|
name="new_name.bin",
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.name == "new_name.bin"
|
|
|
|
def test_updates_tags(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
ref = _make_reference(session, asset)
|
|
ensure_tags_exist(session, ["old"])
|
|
add_tags_to_reference(session, reference_id=ref.id, tags=["old"])
|
|
session.commit()
|
|
|
|
result = update_asset_metadata(
|
|
reference_id=ref.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)
|
|
ref = _make_reference(session, asset)
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
update_asset_metadata(
|
|
reference_id=ref_id,
|
|
user_metadata={"key": "value", "num": 42},
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.user_metadata["key"] == "value"
|
|
assert updated_ref.user_metadata["num"] == 42
|
|
|
|
def test_sets_preview_via_preview_id(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
preview_asset = _make_asset(session, hash_val="blake3:preview")
|
|
ref = _make_reference(session, asset)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
ref_id = ref.id
|
|
preview_ref_id = preview_ref.id
|
|
session.commit()
|
|
|
|
update_asset_metadata(
|
|
reference_id=ref_id,
|
|
preview_id=preview_ref_id,
|
|
)
|
|
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.preview_id == preview_ref_id
|
|
|
|
def test_clear_preview_id_clears_the_link(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
preview_asset = _make_asset(session, hash_val="blake3:preview")
|
|
ref = _make_reference(session, asset)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
ref.preview_id = preview_ref.id
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
update_asset_metadata(
|
|
reference_id=ref_id,
|
|
clear_preview_id=True,
|
|
)
|
|
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.preview_id is None
|
|
|
|
def test_clear_preview_id_takes_precedence_over_preview_id(
|
|
self, mock_create_session, session: Session
|
|
):
|
|
asset = _make_asset(session)
|
|
preview_asset = _make_asset(session, hash_val="blake3:preview")
|
|
ref = _make_reference(session, asset)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
ref.preview_id = preview_ref.id
|
|
ref_id = ref.id
|
|
preview_ref_id = preview_ref.id
|
|
session.commit()
|
|
|
|
# Both flags set — clear wins. preview_id should not be linked.
|
|
update_asset_metadata(
|
|
reference_id=ref_id,
|
|
preview_id=preview_ref_id,
|
|
clear_preview_id=True,
|
|
)
|
|
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.preview_id is None
|
|
|
|
def test_raises_for_nonexistent(self, mock_create_session):
|
|
with pytest.raises(ValueError, match="not found"):
|
|
update_asset_metadata(reference_id="nonexistent", name="fail")
|
|
|
|
def test_raises_for_wrong_owner(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
ref = _make_reference(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
with pytest.raises(PermissionError, match="not owner"):
|
|
update_asset_metadata(
|
|
reference_id=ref.id,
|
|
name="new",
|
|
owner_id="user2",
|
|
)
|
|
|
|
|
|
class TestDeleteAssetReference:
|
|
def test_soft_deletes_reference(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
ref = _make_reference(session, asset)
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
result = delete_asset_reference(
|
|
reference_id=ref_id,
|
|
owner_id="",
|
|
delete_content_if_orphan=False,
|
|
)
|
|
|
|
assert result is True
|
|
# Row still exists but is marked as soft-deleted
|
|
session.expire_all()
|
|
row = session.get(AssetReference, ref_id)
|
|
assert row is not None
|
|
assert row.deleted_at is not None
|
|
|
|
def test_returns_false_for_nonexistent(self, mock_create_session):
|
|
result = delete_asset_reference(
|
|
reference_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)
|
|
ref = _make_reference(session, asset, owner_id="user1")
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
result = delete_asset_reference(
|
|
reference_id=ref_id,
|
|
owner_id="user2",
|
|
)
|
|
|
|
assert result is False
|
|
assert session.get(AssetReference, ref_id) is not None
|
|
|
|
def test_keeps_asset_if_other_references_exist(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
ref1 = _make_reference(session, asset, name="ref1")
|
|
_make_reference(session, asset, name="ref2") # Second ref keeps asset alive
|
|
asset_id = asset.id
|
|
session.commit()
|
|
|
|
delete_asset_reference(
|
|
reference_id=ref1.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)
|
|
ref = _make_reference(session, asset)
|
|
asset_id = asset.id
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
delete_asset_reference(
|
|
reference_id=ref_id,
|
|
owner_id="",
|
|
delete_content_if_orphan=True,
|
|
)
|
|
|
|
# Both ref and asset should be gone
|
|
assert session.get(AssetReference, ref_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")
|
|
ref = _make_reference(session, asset)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
ref_id = ref.id
|
|
preview_ref_id = preview_ref.id
|
|
session.commit()
|
|
|
|
set_asset_preview(
|
|
reference_id=ref_id,
|
|
preview_reference_id=preview_ref_id,
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.preview_id == preview_ref_id
|
|
|
|
def test_clears_preview(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
preview_asset = _make_asset(session, hash_val="blake3:preview")
|
|
ref = _make_reference(session, asset)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
ref.preview_id = preview_ref.id
|
|
ref_id = ref.id
|
|
session.commit()
|
|
|
|
set_asset_preview(
|
|
reference_id=ref_id,
|
|
preview_reference_id=None,
|
|
)
|
|
|
|
# Verify by re-fetching from DB
|
|
session.expire_all()
|
|
updated_ref = session.get(AssetReference, ref_id)
|
|
assert updated_ref.preview_id is None
|
|
|
|
def test_raises_for_nonexistent_ref(self, mock_create_session):
|
|
with pytest.raises(ValueError, match="not found"):
|
|
set_asset_preview(reference_id="nonexistent")
|
|
|
|
def test_raises_for_wrong_owner(self, mock_create_session, session: Session):
|
|
asset = _make_asset(session)
|
|
ref = _make_reference(session, asset, owner_id="user1")
|
|
session.commit()
|
|
|
|
with pytest.raises(PermissionError, match="not owner"):
|
|
set_asset_preview(
|
|
reference_id=ref.id,
|
|
preview_reference_id=None,
|
|
owner_id="user2",
|
|
)
|
|
|
|
|
|
class TestResolveHashToPath:
|
|
def test_returns_none_for_unknown_hash(self, mock_create_session):
|
|
result = resolve_hash_to_path("blake3:" + "a" * 64)
|
|
assert result is None
|
|
|
|
@pytest.mark.parametrize(
|
|
"ref_owner, query_owner, expect_found",
|
|
[
|
|
("user1", "user1", True),
|
|
("user1", "user2", False),
|
|
("", "anyone", True),
|
|
("", "", True),
|
|
],
|
|
ids=[
|
|
"owner_sees_own_ref",
|
|
"other_owner_blocked",
|
|
"ownerless_visible_to_anyone",
|
|
"ownerless_visible_to_empty",
|
|
],
|
|
)
|
|
def test_owner_visibility(
|
|
self, ref_owner, query_owner, expect_found,
|
|
mock_create_session, session: Session, temp_dir,
|
|
):
|
|
f = temp_dir / "file.bin"
|
|
f.write_bytes(b"data")
|
|
asset = _make_asset(session, hash_val="blake3:" + "b" * 64)
|
|
ref = _make_reference(session, asset, name="file.bin", owner_id=ref_owner)
|
|
ref.file_path = str(f)
|
|
session.commit()
|
|
|
|
result = resolve_hash_to_path(asset.hash, owner_id=query_owner)
|
|
if expect_found:
|
|
assert result is not None
|
|
assert result.abs_path == str(f)
|
|
else:
|
|
assert result is None
|