mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-18 23:55:08 +08:00
* feat(assets): align local API with cloud spec Unify response models, add missing fields, and align input schemas with the cloud OpenAPI spec at cloud.comfy.org/openapi. - Replace AssetSummary/AssetDetail/AssetUpdated with single Asset model - Add is_immutable, metadata (system_metadata), prompt_id fields - Support mime_type and preview_id in update endpoint - Make CreateFromHashBody.name optional, add mime_type, require >=1 tag - Add id/mime_type/preview_id to upload, relax tags to optional - Rename total_tags → tags in tag add/remove responses - Add GET /api/assets/tags/refine histogram endpoint - Add DB migration for system_metadata and prompt_id columns Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Fix review issues: tags validation, size nullability, type annotation, hash mismatch check, and add tag histogram tests - Remove contradictory min_length=1 from CreateFromHashBody.tags default - Restore size field to int|None=None for proper null semantics - Add Union type annotation to _build_asset_response result param - Add hash mismatch validation on idempotent upload path (409 HASH_MISMATCH) - Add unit tests for list_tag_histogram service function Amp-Thread-ID: https://ampcode.com/threads/T-019cd993-f43c-704e-b3d7-6cfc3d4d4a80 Co-authored-by: Amp <amp@ampcode.com> * Add preview_url to /assets API response using /api/view endpoint For input and output assets, generate a preview_url pointing to the existing /api/view endpoint using the asset's filename and tag-derived type (input/output). Handles subdirectories via subfolder param and URL-encodes filenames with spaces, unicode, and special characters. This aligns the OSS backend response with the frontend AssetCard expectation for thumbnail rendering. Amp-Thread-ID: https://ampcode.com/threads/T-019cda3f-5c2c-751a-a906-ac6c9153ac5c Co-authored-by: Amp <amp@ampcode.com> * chore: remove unused imports from asset_reference queries Amp-Thread-ID: https://ampcode.com/threads/T-019cda7d-cb21-77b4-a51b-b965af60208c Co-authored-by: Amp <amp@ampcode.com> * feat: resolve blake3 hashes in /view endpoint via asset database Amp-Thread-ID: https://ampcode.com/threads/T-019cda7d-cb21-77b4-a51b-b965af60208c Co-authored-by: Amp <amp@ampcode.com> * Register uploaded images in asset database when --enable-assets is set Add register_file_in_place() service function to ingest module for registering already-saved files without moving them. Call it from the /upload/image endpoint to return asset metadata in the response. Amp-Thread-ID: https://ampcode.com/threads/T-019ce023-3384-7560-bacf-de40b0de0dd2 Co-authored-by: Amp <amp@ampcode.com> * Exclude None fields from asset API JSON responses Add exclude_none=True to model_dump() calls across asset routes to keep response payloads clean by omitting unset optional fields. Amp-Thread-ID: https://ampcode.com/threads/T-019ce023-3384-7560-bacf-de40b0de0dd2 Co-authored-by: Amp <amp@ampcode.com> * Add comment explaining why /view resolves blake3 hashes Amp-Thread-ID: https://ampcode.com/threads/T-019ce023-3384-7560-bacf-de40b0de0dd2 Co-authored-by: Amp <amp@ampcode.com> * Move blake3 hash resolution to asset_management service Extract resolve_hash_to_path() into asset_management.py and remove _resolve_blake3_to_path from server.py. Also revert loopback origin check to original logic. Amp-Thread-ID: https://ampcode.com/threads/T-019ce023-3384-7560-bacf-de40b0de0dd2 Co-authored-by: Amp <amp@ampcode.com> * Require at least one tag in UploadAssetSpec Enforce non-empty tags at the Pydantic validation layer so uploads with no tags are rejected with a 400 before reaching ingest. Adds test_upload_empty_tags_rejected to cover this case. Amp-Thread-ID: https://ampcode.com/threads/T-019ce377-8bde-7048-bc28-a9df063409f9 Co-authored-by: Amp <amp@ampcode.com> * Add owner_id check to resolve_hash_to_path Filter asset references by owner visibility so the /view endpoint only resolves hashes for assets the requesting user can access. Adds table-driven tests for owner visibility cases. Amp-Thread-ID: https://ampcode.com/threads/T-019ce377-8bde-7048-bc28-a9df063409f9 Co-authored-by: Amp <amp@ampcode.com> * Make ReferenceData.created_at and updated_at required Remove None defaults and type: ignore comments. Move fields before optional fields to satisfy dataclass ordering. Amp-Thread-ID: https://ampcode.com/threads/T-019ce377-8bde-7048-bc28-a9df063409f9 Co-authored-by: Amp <amp@ampcode.com> * Fix double commit in create_from_hash Move mime_type update into _register_existing_asset so it shares a single transaction with reference creation. Log a warning when the hash is not found instead of silently returning None. Amp-Thread-ID: https://ampcode.com/threads/T-019ce377-8bde-7048-bc28-a9df063409f9 Co-authored-by: Amp <amp@ampcode.com> * Add exclude_none=True to create/upload responses Align with get/update/list endpoints for consistent JSON output. Amp-Thread-ID: https://ampcode.com/threads/T-019ce377-8bde-7048-bc28-a9df063409f9 Co-authored-by: Amp <amp@ampcode.com> * Change preview_id to reference asset by reference ID, not content ID Clients receive preview_id in API responses but could not dereference it through public routes (which use reference IDs). Now preview_id is a self-referential FK to asset_references.id so the value is directly usable in the public API. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Filter soft-deleted and missing refs from visibility queries list_references_by_asset_id and list_tags_with_usage were not filtering out deleted_at/is_missing refs, allowing /view?filename=blake3:... to serve files through hidden references and inflating tag usage counts. Add list_all_file_paths_by_asset_id for orphan cleanup which intentionally needs unfiltered access. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Pass preview_id and mime_type through all asset creation fast paths The duplicate-content upload path and hash-based creation paths were silently dropping preview_id and mime_type. This wires both fields through _register_existing_asset, create_from_hash, and all route call sites so behavior is consistent regardless of whether the asset content already exists. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Remove unimplemented client-provided ID from upload API The `id` field on UploadAssetSpec was advertised for idempotent creation but never actually honored when creating new references. Remove it rather than implementing the feature. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Make asset mime_type immutable after first ingest Prevents cross-tenant metadata mutation when multiple references share the same content-addressed Asset row. mime_type can now only be set when NULL (first ingest); subsequent attempts to change it are silently ignored. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Use resolved content_type from asset lookup in /view endpoint The /view endpoint was discarding the content_type computed by resolve_hash_to_path() and re-guessing from the filename, which produced wrong results for extensionless files or mismatched extensions. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Merge system+user metadata into filter projection Extract rebuild_metadata_projection() to build AssetReferenceMeta rows from {**system_metadata, **user_metadata}, so system-generated metadata is queryable via metadata_filter and user keys override system keys. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Standardize tag ordering to alphabetical across all endpoints Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Derive subfolder tags from path in register_file_in_place Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Reject client-provided id, fix preview URLs, rename tags→total_tags - Reject 'id' field in multipart upload with 400 UNSUPPORTED_FIELD instead of silently ignoring it - Build preview URL from the preview asset's own metadata rather than the parent asset's - Rename 'tags' to 'total_tags' in TagsAdd/TagsRemove response schemas for clarity Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: SQLite migration 0003 FK drop fails on file-backed DBs (MB-2) Add naming_convention to Base.metadata so Alembic batch-mode reflection can match unnamed FK constraints created by migration 0002. Pass naming_convention and render_as_batch=True through env.py online config. Add migration roundtrip tests (upgrade/downgrade/cycle from baseline). Amp-Thread-ID: https://ampcode.com/threads/T-019ce466-1683-7471-b6e1-bb078223cda0 Co-authored-by: Amp <amp@ampcode.com> * Fix missing tag count for is_missing references and update test for total_tags field - Allow is_missing=True references to be counted in list_tags_with_usage when the tag is 'missing', so the missing tag count reflects all references that have been tagged as missing - Add update_is_missing_by_asset_id query helper for bulk updates by asset - Update test_add_and_remove_tags to use 'total_tags' matching the API schema Amp-Thread-ID: https://ampcode.com/threads/T-019ce482-05e7-7324-a1b0-a56a929cc7ef Co-authored-by: Amp <amp@ampcode.com> * Remove unused imports in scanner.py Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Rename prompt_id to job_id on asset_references Rename the column in the DB model, migration, and service schemas. The API response emits both job_id and prompt_id (deprecated alias) for backward compatibility with the cloud API. Amp-Thread-ID: https://ampcode.com/threads/T-019cef41-60b0-752a-aa3c-ed7f20fda2f7 Co-authored-by: Amp <amp@ampcode.com> * Add index on asset_references.preview_id for FK cascade performance Amp-Thread-ID: https://ampcode.com/threads/T-019cef45-a4d2-7548-86d2-d46bcd3db419 Co-authored-by: Amp <amp@ampcode.com> * Add clarifying comments for Asset/AssetReference naming and preview_id Amp-Thread-ID: https://ampcode.com/threads/T-019cef49-f94e-7348-bf23-9a19ebf65e0d Co-authored-by: Amp <amp@ampcode.com> * Disallow all-null meta rows: add CHECK constraint, skip null values on write - convert_metadata_to_rows returns [] for None values instead of an all-null row - Remove dead None branch from _scalar_to_row - Simplify null filter in common.py to just check for row absence - Add CHECK constraint ck_asset_reference_meta_has_value to model and migration 0003 Amp-Thread-ID: https://ampcode.com/threads/T-019cef4e-5240-7749-bb25-1f17fcf9c09c Co-authored-by: Amp <amp@ampcode.com> * Remove dead None guards on result.asset in upload handler register_file_in_place guarantees a non-None asset, so the 'if result.asset else None' checks were unreachable. Amp-Thread-ID: https://ampcode.com/threads/T-019cef5b-4cf8-723c-8a98-8fb8f333c133 Co-authored-by: Amp <amp@ampcode.com> * Remove mime_type from asset update API Clients can no longer modify mime_type after asset creation via the PUT /api/assets/{id} endpoint. This reduces the risk of mime_type spoofing. The internal update_asset_hash_and_mime function remains available for server-side use (e.g., enrichment). Amp-Thread-ID: https://ampcode.com/threads/T-019cef5d-8d61-75cc-a1c6-2841ac395648 Co-authored-by: Amp <amp@ampcode.com> * Fix migration constraint naming double-prefix and NULL in mixed metadata lists - Use fully-rendered constraint names in migration 0003 to avoid the naming convention doubling the ck_ prefix on batch operations. - Add table_args to downgrade so SQLite batch mode can find the CHECK constraint (not exposed by SQLite reflection). - Fix model CheckConstraint name to use bare 'has_value' (convention auto-prefixes). - Skip None items when converting metadata lists to rows, preventing all-NULL rows that violate the has_value check constraint. Amp-Thread-ID: https://ampcode.com/threads/T-019cef87-94f9-7172-a6af-c6282290ce4f Co-authored-by: Amp <amp@ampcode.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Amp <amp@ampcode.com>
521 lines
18 KiB
Python
521 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)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
session.commit()
|
|
|
|
set_reference_preview(session, reference_id=ref.id, preview_reference_id=preview_ref.id)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.preview_id == preview_ref.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)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
ref.preview_id = preview_ref.id
|
|
session.commit()
|
|
|
|
set_reference_preview(session, reference_id=ref.id, preview_reference_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_reference_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 AssetReference"):
|
|
set_reference_preview(session, reference_id=ref.id, preview_reference_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)
|
|
preview_ref = _make_reference(session, preview_asset, name="preview.png")
|
|
session.commit()
|
|
|
|
update_reference_timestamps(session, ref, preview_id=preview_ref.id)
|
|
session.commit()
|
|
|
|
session.refresh(ref)
|
|
assert ref.preview_id == preview_ref.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()
|