mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-18 21:30:11 +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>
247 lines
8.8 KiB
Python
247 lines
8.8 KiB
Python
from __future__ import annotations
|
|
|
|
import uuid
|
|
from datetime import datetime
|
|
from typing import Any
|
|
|
|
from sqlalchemy import (
|
|
JSON,
|
|
BigInteger,
|
|
Boolean,
|
|
CheckConstraint,
|
|
DateTime,
|
|
ForeignKey,
|
|
Index,
|
|
Integer,
|
|
Numeric,
|
|
String,
|
|
Text,
|
|
)
|
|
from sqlalchemy.orm import Mapped, foreign, mapped_column, relationship
|
|
|
|
from app.assets.helpers import get_utc_now
|
|
from app.database.models import Base
|
|
|
|
|
|
class Asset(Base):
|
|
__tablename__ = "assets"
|
|
|
|
id: Mapped[str] = mapped_column(
|
|
String(36), primary_key=True, default=lambda: str(uuid.uuid4())
|
|
)
|
|
hash: Mapped[str | None] = mapped_column(String(256), nullable=True)
|
|
size_bytes: Mapped[int] = mapped_column(BigInteger, nullable=False, default=0)
|
|
mime_type: Mapped[str | None] = mapped_column(String(255))
|
|
created_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=False), nullable=False, default=get_utc_now
|
|
)
|
|
|
|
references: Mapped[list[AssetReference]] = relationship(
|
|
"AssetReference",
|
|
back_populates="asset",
|
|
primaryjoin=lambda: Asset.id == foreign(AssetReference.asset_id),
|
|
foreign_keys=lambda: [AssetReference.asset_id],
|
|
cascade="all,delete-orphan",
|
|
passive_deletes=True,
|
|
)
|
|
|
|
# preview_id on AssetReference is a self-referential FK to asset_references.id
|
|
|
|
__table_args__ = (
|
|
Index("uq_assets_hash", "hash", unique=True),
|
|
Index("ix_assets_mime_type", "mime_type"),
|
|
CheckConstraint("size_bytes >= 0", name="ck_assets_size_nonneg"),
|
|
)
|
|
|
|
def __repr__(self) -> str:
|
|
return f"<Asset id={self.id} hash={(self.hash or '')[:12]}>"
|
|
|
|
|
|
class AssetReference(Base):
|
|
"""Unified model combining file cache state and user-facing metadata.
|
|
|
|
Each row represents either:
|
|
- A filesystem reference (file_path is set) with cache state
|
|
- An API-created reference (file_path is NULL) without cache state
|
|
"""
|
|
|
|
__tablename__ = "asset_references"
|
|
|
|
id: Mapped[str] = mapped_column(
|
|
String(36), primary_key=True, default=lambda: str(uuid.uuid4())
|
|
)
|
|
asset_id: Mapped[str] = mapped_column(
|
|
String(36), ForeignKey("assets.id", ondelete="CASCADE"), nullable=False
|
|
)
|
|
|
|
# Cache state fields (from former AssetCacheState)
|
|
file_path: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
mtime_ns: Mapped[int | None] = mapped_column(BigInteger, nullable=True)
|
|
needs_verify: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
|
is_missing: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
|
enrichment_level: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
|
|
# Info fields (from former AssetInfo)
|
|
owner_id: Mapped[str] = mapped_column(String(128), nullable=False, default="")
|
|
name: Mapped[str] = mapped_column(String(512), nullable=False)
|
|
preview_id: Mapped[str | None] = mapped_column(
|
|
String(36), ForeignKey("asset_references.id", ondelete="SET NULL")
|
|
)
|
|
user_metadata: Mapped[dict[str, Any] | None] = mapped_column(
|
|
JSON(none_as_null=True)
|
|
)
|
|
system_metadata: Mapped[dict[str, Any] | None] = mapped_column(
|
|
JSON(none_as_null=True), nullable=True, default=None
|
|
)
|
|
job_id: Mapped[str | None] = mapped_column(String(36), nullable=True, default=None)
|
|
created_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=False), nullable=False, default=get_utc_now
|
|
)
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=False), nullable=False, default=get_utc_now
|
|
)
|
|
last_access_time: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=False), nullable=False, default=get_utc_now
|
|
)
|
|
deleted_at: Mapped[datetime | None] = mapped_column(
|
|
DateTime(timezone=False), nullable=True, default=None
|
|
)
|
|
|
|
asset: Mapped[Asset] = relationship(
|
|
"Asset",
|
|
back_populates="references",
|
|
foreign_keys=[asset_id],
|
|
lazy="selectin",
|
|
)
|
|
preview_ref: Mapped[AssetReference | None] = relationship(
|
|
"AssetReference",
|
|
foreign_keys=[preview_id],
|
|
remote_side=lambda: [AssetReference.id],
|
|
)
|
|
|
|
metadata_entries: Mapped[list[AssetReferenceMeta]] = relationship(
|
|
back_populates="asset_reference",
|
|
cascade="all,delete-orphan",
|
|
passive_deletes=True,
|
|
)
|
|
|
|
tag_links: Mapped[list[AssetReferenceTag]] = relationship(
|
|
back_populates="asset_reference",
|
|
cascade="all,delete-orphan",
|
|
passive_deletes=True,
|
|
overlaps="tags,asset_references",
|
|
)
|
|
|
|
tags: Mapped[list[Tag]] = relationship(
|
|
secondary="asset_reference_tags",
|
|
back_populates="asset_references",
|
|
lazy="selectin",
|
|
viewonly=True,
|
|
overlaps="tag_links,asset_reference_links,asset_references,tag",
|
|
)
|
|
|
|
__table_args__ = (
|
|
Index("uq_asset_references_file_path", "file_path", unique=True),
|
|
Index("ix_asset_references_asset_id", "asset_id"),
|
|
Index("ix_asset_references_owner_id", "owner_id"),
|
|
Index("ix_asset_references_name", "name"),
|
|
Index("ix_asset_references_is_missing", "is_missing"),
|
|
Index("ix_asset_references_enrichment_level", "enrichment_level"),
|
|
Index("ix_asset_references_created_at", "created_at"),
|
|
Index("ix_asset_references_last_access_time", "last_access_time"),
|
|
Index("ix_asset_references_deleted_at", "deleted_at"),
|
|
Index("ix_asset_references_preview_id", "preview_id"),
|
|
Index("ix_asset_references_owner_name", "owner_id", "name"),
|
|
CheckConstraint(
|
|
"(mtime_ns IS NULL) OR (mtime_ns >= 0)", name="ck_ar_mtime_nonneg"
|
|
),
|
|
CheckConstraint(
|
|
"enrichment_level >= 0 AND enrichment_level <= 2",
|
|
name="ck_ar_enrichment_level_range",
|
|
),
|
|
)
|
|
|
|
def __repr__(self) -> str:
|
|
path_part = f" path={self.file_path!r}" if self.file_path else ""
|
|
return f"<AssetReference id={self.id} name={self.name!r}{path_part}>"
|
|
|
|
|
|
class AssetReferenceMeta(Base):
|
|
__tablename__ = "asset_reference_meta"
|
|
|
|
asset_reference_id: Mapped[str] = mapped_column(
|
|
String(36),
|
|
ForeignKey("asset_references.id", ondelete="CASCADE"),
|
|
primary_key=True,
|
|
)
|
|
key: Mapped[str] = mapped_column(String(256), primary_key=True)
|
|
ordinal: Mapped[int] = mapped_column(Integer, primary_key=True, default=0)
|
|
|
|
val_str: Mapped[str | None] = mapped_column(String(2048), nullable=True)
|
|
val_num: Mapped[float | None] = mapped_column(Numeric(38, 10), nullable=True)
|
|
val_bool: Mapped[bool | None] = mapped_column(Boolean, nullable=True)
|
|
val_json: Mapped[Any | None] = mapped_column(JSON(none_as_null=True), nullable=True)
|
|
|
|
asset_reference: Mapped[AssetReference] = relationship(
|
|
back_populates="metadata_entries"
|
|
)
|
|
|
|
__table_args__ = (
|
|
Index("ix_asset_reference_meta_key", "key"),
|
|
Index("ix_asset_reference_meta_key_val_str", "key", "val_str"),
|
|
Index("ix_asset_reference_meta_key_val_num", "key", "val_num"),
|
|
Index("ix_asset_reference_meta_key_val_bool", "key", "val_bool"),
|
|
CheckConstraint(
|
|
"val_str IS NOT NULL OR val_num IS NOT NULL OR val_bool IS NOT NULL OR val_json IS NOT NULL",
|
|
name="has_value",
|
|
),
|
|
)
|
|
|
|
|
|
class AssetReferenceTag(Base):
|
|
__tablename__ = "asset_reference_tags"
|
|
|
|
asset_reference_id: Mapped[str] = mapped_column(
|
|
String(36),
|
|
ForeignKey("asset_references.id", ondelete="CASCADE"),
|
|
primary_key=True,
|
|
)
|
|
tag_name: Mapped[str] = mapped_column(
|
|
String(512), ForeignKey("tags.name", ondelete="RESTRICT"), primary_key=True
|
|
)
|
|
origin: Mapped[str] = mapped_column(String(32), nullable=False, default="manual")
|
|
added_at: Mapped[datetime] = mapped_column(
|
|
DateTime(timezone=False), nullable=False, default=get_utc_now
|
|
)
|
|
|
|
asset_reference: Mapped[AssetReference] = relationship(back_populates="tag_links")
|
|
tag: Mapped[Tag] = relationship(back_populates="asset_reference_links")
|
|
|
|
__table_args__ = (
|
|
Index("ix_asset_reference_tags_tag_name", "tag_name"),
|
|
Index("ix_asset_reference_tags_asset_reference_id", "asset_reference_id"),
|
|
)
|
|
|
|
|
|
class Tag(Base):
|
|
__tablename__ = "tags"
|
|
|
|
name: Mapped[str] = mapped_column(String(512), primary_key=True)
|
|
tag_type: Mapped[str] = mapped_column(String(32), nullable=False, default="user")
|
|
|
|
asset_reference_links: Mapped[list[AssetReferenceTag]] = relationship(
|
|
back_populates="tag",
|
|
overlaps="asset_references,tags",
|
|
)
|
|
asset_references: Mapped[list[AssetReference]] = relationship(
|
|
secondary="asset_reference_tags",
|
|
back_populates="tags",
|
|
viewonly=True,
|
|
overlaps="asset_reference_links,tag_links,tags,asset_reference",
|
|
)
|
|
|
|
__table_args__ = (Index("ix_tags_tag_type", "tag_type"),)
|
|
|
|
def __repr__(self) -> str:
|
|
return f"<Tag {self.name}>"
|