mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-26 01:44:05 +00:00
8ff4d38ad1
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>
131 lines
2.5 KiB
Python
131 lines
2.5 KiB
Python
from dataclasses import dataclass
|
|
from datetime import datetime
|
|
from typing import Any, NamedTuple
|
|
|
|
from app.assets.database.models import Asset, AssetReference
|
|
|
|
UserMetadata = dict[str, Any] | None
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class AssetData:
|
|
hash: str
|
|
size_bytes: int | None
|
|
mime_type: str | None
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class ReferenceData:
|
|
"""Data transfer object for AssetReference."""
|
|
|
|
id: str
|
|
name: str
|
|
file_path: str | None
|
|
user_metadata: UserMetadata
|
|
preview_id: str | None
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
last_access_time: datetime | None
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class AssetDetailResult:
|
|
ref: ReferenceData
|
|
asset: AssetData | None
|
|
tags: list[str]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class RegisterAssetResult:
|
|
ref: ReferenceData
|
|
asset: AssetData
|
|
tags: list[str]
|
|
created: bool
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class IngestResult:
|
|
asset_created: bool
|
|
asset_updated: bool
|
|
ref_created: bool
|
|
ref_updated: bool
|
|
reference_id: str | None
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class AddTagsResult:
|
|
added: list[str]
|
|
already_present: list[str]
|
|
total_tags: list[str]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class RemoveTagsResult:
|
|
removed: list[str]
|
|
not_present: list[str]
|
|
total_tags: list[str]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class SetTagsResult:
|
|
added: list[str]
|
|
removed: list[str]
|
|
total: list[str]
|
|
|
|
|
|
class TagUsage(NamedTuple):
|
|
name: str
|
|
tag_type: str
|
|
count: int
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class AssetSummaryData:
|
|
ref: ReferenceData
|
|
asset: AssetData | None
|
|
tags: list[str]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class ListAssetsResult:
|
|
items: list[AssetSummaryData]
|
|
total: int
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class DownloadResolutionResult:
|
|
abs_path: str
|
|
content_type: str
|
|
download_name: str
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class UploadResult:
|
|
ref: ReferenceData
|
|
asset: AssetData
|
|
tags: list[str]
|
|
created_new: bool
|
|
|
|
|
|
def extract_reference_data(ref: AssetReference) -> ReferenceData:
|
|
return ReferenceData(
|
|
id=ref.id,
|
|
name=ref.name,
|
|
file_path=ref.file_path,
|
|
user_metadata=ref.user_metadata,
|
|
preview_id=ref.preview_id,
|
|
created_at=ref.created_at,
|
|
updated_at=ref.updated_at,
|
|
last_access_time=ref.last_access_time,
|
|
)
|
|
|
|
|
|
def extract_asset_data(asset: Asset | None) -> AssetData | None:
|
|
if asset is None:
|
|
return None
|
|
return AssetData(
|
|
hash=asset.hash,
|
|
size_bytes=asset.size_bytes,
|
|
mime_type=asset.mime_type,
|
|
)
|