feat: add Load3DAdvanced node

.ci/windows_amd_base_files/README_VERY_IMPORTANT.txt

@@ -1,27 +1,27 @@
-As of the time of writing this you need a recent driver. Updating to the latest driver is recommended.
-
-HOW TO RUN:
-
-If you have a AMD gpu:
-
-run_amd_gpu.bat
-
-If you have memory issues you can try enabling the new dynamic memory management by running comfyui with:
-
-run_amd_gpu_enable_dynamic_vram.bat
-
-IF YOU GET A RED ERROR IN THE UI MAKE SURE YOU HAVE A MODEL/CHECKPOINT IN: ComfyUI\models\checkpoints
-
-You can download the stable diffusion XL one from: https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/blob/main/sd_xl_base_1.0_0.9vae.safetensors
-
-
-RECOMMENDED WAY TO UPDATE:
-To update the ComfyUI code: update\update_comfyui.bat
-
-
-TO SHARE MODELS BETWEEN COMFYUI AND ANOTHER UI:
-In the ComfyUI directory you will find a file: extra_model_paths.yaml.example
-Rename this file to: extra_model_paths.yaml and edit it with your favorite text editor.
-
-
-
+As of the time of writing this you need a recent driver. Updating to the latest driver is recommended.
+
+HOW TO RUN:
+
+If you have a AMD gpu:
+
+run_amd_gpu.bat
+
+If you have memory issues you can try enabling the new dynamic memory management by running comfyui with:
+
+run_amd_gpu_enable_dynamic_vram.bat
+
+IF YOU GET A RED ERROR IN THE UI MAKE SURE YOU HAVE A MODEL/CHECKPOINT IN: ComfyUI\models\checkpoints
+
+You can download the stable diffusion XL one from: https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/blob/main/sd_xl_base_1.0_0.9vae.safetensors
+
+
+RECOMMENDED WAY TO UPDATE:
+To update the ComfyUI code: update\update_comfyui.bat
+
+
+TO SHARE MODELS BETWEEN COMFYUI AND ANOTHER UI:
+In the ComfyUI directory you will find a file: extra_model_paths.yaml.example
+Rename this file to: extra_model_paths.yaml and edit it with your favorite text editor.
+
+
+

.github/workflows/check-line-endings.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Check for Windows line endings (CRLF)
         run: |
           # Get the list of changed files in the PR
-          CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} -- ':!.ci')
+          CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }})
 
           # Flag to track if CRLF is found
           CRLF_FOUND=false

app/assets/scanner.py

@@ -33,7 +33,6 @@ from app.assets.services.file_utils import (
     verify_file_unchanged,
 )
 from app.assets.services.hashing import HashCheckpoint, compute_blake3_hash
-from app.assets.services.image_dimensions import extract_image_dimensions
 from app.assets.services.metadata_extract import extract_file_metadata
 from app.assets.services.path_utils import (
     compute_relative_filename,
@@ -507,10 +506,6 @@ def enrich_asset(
 
     if extract_metadata and metadata:
         system_metadata = metadata.to_user_metadata()
-        if mime_type and mime_type.startswith("image/"):
-            dims = extract_image_dimensions(file_path, mime_type=mime_type)
-            if dims:
-                system_metadata.update(dims)
         set_reference_system_metadata(session, reference_id, system_metadata)
 
     if full_hash:

app/assets/services/image_dimensions.py

@@ -1,63 +0,0 @@
-"""Image dimension extraction for asset ingest.
-
-Reads only the image header via Pillow to capture width/height cheaply,
-without a full pixel decode. Returns a metadata dict suitable for merging
-into ``AssetReference.system_metadata``.
-"""
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-logger = logging.getLogger(__name__)
-
-
-def extract_image_dimensions(
-    file_path: str, mime_type: str | None = None
-) -> dict[str, Any] | None:
-    """Extract image dimensions for the file at ``file_path``.
-
-    Args:
-        file_path: Absolute path to a file on disk.
-        mime_type: Optional MIME type hint. When provided and not prefixed
-            with ``image/``, extraction is skipped without touching the file.
-
-    Returns:
-        ``{"kind": "image", "width": W, "height": H}`` when the file is a
-        recognizable image with positive dimensions, otherwise ``None``.
-
-    The dict shape is intended to be merged into ``system_metadata`` so the
-    asset response surfaces ``metadata.kind`` plus dimension fields for image
-    assets. Forward-compatible: future media kinds (e.g. ``"video"`` with
-    duration/fps) can extend this shape without schema changes.
-    """
-    if mime_type is not None and not mime_type.startswith("image/"):
-        return None
-
-    try:
-        from PIL import Image, UnidentifiedImageError
-    except ImportError:
-        logger.debug(
-            "Pillow not available; skipping image dimension extraction for %s",
-            file_path,
-        )
-        return None
-
-    try:
-        with Image.open(file_path) as img:
-            width, height = img.size
-    except (OSError, UnidentifiedImageError, ValueError) as exc:
-        logger.debug(
-            "Failed to read image dimensions from %s: %s", file_path, exc
-        )
-        return None
-
-    if (
-        not isinstance(width, int)
-        or not isinstance(height, int)
-        or width <= 0
-        or height <= 0
-    ):
-        return None
-
-    return {"kind": "image", "width": width, "height": height}

app/assets/services/ingest.py

@@ -17,11 +17,9 @@ from app.assets.database.queries import (
     get_reference_by_file_path,
     get_reference_tags,
     get_or_create_reference,
-    list_references_by_asset_id,
     reference_exists,
     remove_missing_tag_for_asset_id,
     set_reference_metadata,
-    set_reference_system_metadata,
     set_reference_tags,
     update_asset_hash_and_mime,
     upsert_asset,
@@ -31,7 +29,6 @@ from app.assets.database.queries import (
 from app.assets.helpers import get_utc_now, normalize_tags
 from app.assets.services.bulk_ingest import batch_insert_seed_assets
 from app.assets.services.file_utils import get_size_and_mtime_ns
-from app.assets.services.image_dimensions import extract_image_dimensions
 from app.assets.services.path_utils import (
     compute_relative_filename,
     get_name_and_tags_from_asset_path,
@@ -121,14 +118,6 @@ def _ingest_file_from_path(
                 user_metadata=user_metadata,
             )
 
-            _maybe_store_image_dimensions(
-                session,
-                reference_id=reference_id,
-                file_path=locator,
-                mime_type=mime_type,
-                current_system_metadata=ref.system_metadata,
-            )
-
         try:
             remove_missing_tag_for_asset_id(session, asset_id=asset.id)
         except Exception:
@@ -299,13 +288,6 @@ def _register_existing_asset(
                 user_metadata=new_meta,
             )
 
-        _backfill_image_dimensions_from_siblings(
-            session,
-            asset_id=asset.id,
-            new_reference_id=ref.id,
-            current_system_metadata=ref.system_metadata,
-        )
-
         if tags is not None:
             set_reference_tags(
                 session,
@@ -352,87 +334,6 @@ def _update_metadata_with_filename(
         )
 
 
-_IMAGE_DIMENSION_KEYS = ("kind", "width", "height")
-
-
-def _maybe_store_image_dimensions(
-    session: Session,
-    reference_id: str,
-    file_path: str,
-    mime_type: str | None,
-    current_system_metadata: dict | None,
-) -> None:
-    """Populate ``kind``/``width``/``height`` on system_metadata for image refs.
-
-    Non-image MIME types are a no-op. Pre-existing keys (e.g. enricher-written
-    safetensors metadata, download provenance) are preserved by merge.
-    """
-    if not mime_type or not mime_type.startswith("image/"):
-        return
-
-    dims = extract_image_dimensions(file_path, mime_type=mime_type)
-    if not dims:
-        return
-
-    current = current_system_metadata or {}
-    merged = dict(current)
-    merged.update(dims)
-    if merged != current:
-        set_reference_system_metadata(
-            session,
-            reference_id=reference_id,
-            system_metadata=merged,
-        )
-
-
-def _backfill_image_dimensions_from_siblings(
-    session: Session,
-    asset_id: str,
-    new_reference_id: str,
-    current_system_metadata: dict | None,
-) -> None:
-    """Copy image dimension keys from any sibling reference of the same asset.
-
-    The from-hash path doesn't read the file bytes, so dimensions can't be
-    extracted there directly. When another reference of the same asset already
-    carries image dimensions, copy them onto the new reference so consumers
-    see consistent metadata regardless of how the asset was registered.
-
-    Best-effort: missing siblings, non-image siblings, or absent dimension
-    keys leave the target reference unchanged.
-    """
-    current = current_system_metadata or {}
-    if current.get("kind") == "image" and "width" in current and "height" in current:
-        return
-
-    for sibling in list_references_by_asset_id(session, asset_id):
-        if sibling.id == new_reference_id:
-            continue
-        meta = sibling.system_metadata or {}
-        if meta.get("kind") != "image":
-            continue
-        width = meta.get("width")
-        height = meta.get("height")
-        if (
-            type(width) is not int
-            or type(height) is not int
-            or width <= 0
-            or height <= 0
-        ):
-            continue
-        merged = dict(current)
-        merged["kind"] = "image"
-        merged["width"] = width
-        merged["height"] = height
-        if merged != current:
-            set_reference_system_metadata(
-                session,
-                reference_id=new_reference_id,
-                system_metadata=merged,
-            )
-        return
-
-
 def _sanitize_filename(name: str | None, fallback: str) -> str:
     n = os.path.basename((name or "").strip() or fallback)
     return n if n else fallback

comfy/ldm/qwen_image/model.py

@@ -51,18 +51,6 @@ class FeedForward(nn.Module):
         return hidden_states
 
 
-# Addin this back because Nunchaku custom nodes rely on it, see comment here:
-# https://github.com/Comfy-Org/ComfyUI/pull/14178#issuecomment-4640475161
-# TODO: Eventually remove this once we natively support SVDQuants
-def apply_rotary_emb(x, freqs_cis):
-    if x.shape[1] == 0:
-        return x
-
-    t_ = x.reshape(*x.shape[:-1], -1, 1, 2)
-    t_out = freqs_cis[..., 0] * t_[..., 0] + freqs_cis[..., 1] * t_[..., 1]
-    return t_out.reshape(*x.shape)
-
-
 class QwenTimestepProjEmbeddings(nn.Module):
     def __init__(self, embedding_dim, pooled_projection_dim, use_additional_t_cond=False, dtype=None, device=None, operations=None):
         super().__init__()

comfy_extras/nodes_color.py

@@ -7,29 +7,29 @@ class ColorToRGBInt(io.ComfyNode):
     def define_schema(cls) -> io.Schema:
         return io.Schema(
             node_id="ColorToRGBInt",
-            display_name="Color Picker",
+            display_name="Color to RGB Int",
             category="utilities",
-            description="Return a color RGB integer value and hexadecimal representation.",
+            description="Convert a color to a RGB integer value.",
             inputs=[
                 io.Color.Input("color"),
             ],
             outputs=[
                 io.Int.Output(display_name="rgb_int"),
-                io.Color.Output(display_name="hex")
             ],
         )
 
     @classmethod
-    def execute(cls, color: str) -> io.NodeOutput:
+    def execute(
+        cls,
+        color: str,
+    ) -> io.NodeOutput:
         # expect format #RRGGBB
         if len(color) != 7 or color[0] != "#":
             raise ValueError("Color must be in format #RRGGBB")
         r = int(color[1:3], 16)
         g = int(color[3:5], 16)
         b = int(color[5:7], 16)
-
-        rgb_int = r * 256 * 256 + g * 256 + b
-        return io.NodeOutput(rgb_int, color)
+        return io.NodeOutput(r * 256 * 256 + g * 256 + b)
 
 
 class ColorExtension(ComfyExtension):

comfy_extras/nodes_load_3d.py

@@ -317,11 +317,71 @@ class PreviewPointCloud(IO.ComfyNode):
         )
 
 
+MESH_EXTENSIONS = {'.gltf', '.glb', '.obj', '.fbx', '.stl'}
+
+
+class Load3DAdvanced(IO.ComfyNode):
+    @classmethod
+    def define_schema(cls):
+        input_dir = folder_paths.get_input_directory()
+        os.makedirs(input_dir, exist_ok=True)
+
+        files = [
+            f for f in os.listdir(input_dir)
+            if os.path.isfile(os.path.join(input_dir, f))
+            and os.path.splitext(f)[1].lower() in MESH_EXTENSIONS
+        ]
+        return IO.Schema(
+            node_id="Load3DAdvanced",
+            display_name="Load 3D (Advanced)",
+            category="3d",
+            search_aliases=[
+                "load mesh",
+                "load gltf",
+                "load glb",
+                "load obj",
+                "load fbx",
+                "load stl",
+            ],
+            is_experimental=True,
+            inputs=[
+                IO.Combo.Input("model_file", options=["none"] + sorted(files), upload=IO.UploadType.model),
+                IO.Load3D.Input("viewport_state"),
+                IO.Int.Input("width", default=1024, min=1, max=4096, step=1),
+                IO.Int.Input("height", default=1024, min=1, max=4096, step=1),
+            ],
+            outputs=[
+                IO.File3DAny.Output(display_name="model_3d"),
+                IO.Load3DModelInfo.Output(display_name="model_3d_info"),
+                IO.Load3DCamera.Output(display_name="camera_info"),
+                IO.Int.Output(display_name="width"),
+                IO.Int.Output(display_name="height"),
+            ],
+        )
+
+    @classmethod
+    def validate_inputs(cls, model_file, **kwargs) -> bool | str:
+        if not model_file or model_file == "none":
+            return True
+        if not folder_paths.exists_annotated_filepath(model_file):
+            return f"Invalid 3D model file: {model_file}"
+        return True
+
+    @classmethod
+    def execute(cls, model_file, viewport_state, width: int, height: int, **kwargs) -> IO.NodeOutput:
+        file_3d = None
+        if model_file and model_file != "none":
+            file_3d = Types.File3D(folder_paths.get_annotated_filepath(model_file))
+        model_3d_info = viewport_state.get('model_3d_info', [])
+        return IO.NodeOutput(file_3d, model_3d_info, viewport_state['camera_info'], width, height)
+
+
 class Load3DExtension(ComfyExtension):
     @override
     async def get_node_list(self) -> list[type[IO.ComfyNode]]:
         return [
             Load3D,
+            Load3DAdvanced,
             Preview3D,
             Preview3DAdvanced,
             PreviewGaussianSplat,

comfy_extras/nodes_resolution.py

@@ -6,24 +6,24 @@ from comfy_api.latest import ComfyExtension, io
 
 class AspectRatio(str, Enum):
     SQUARE = "1:1 (Square)"
-    PHOTO_V = "2:3 (Portrait Photo)"
     PHOTO_H = "3:2 (Photo)"
-    STANDARD_V = "3:4 (Portrait Standard)"
     STANDARD_H = "4:3 (Standard)"
-    WIDESCREEN_V = "9:16 (Portrait Widescreen)"
     WIDESCREEN_H = "16:9 (Widescreen)"
     ULTRAWIDE_H = "21:9 (Ultrawide)"
+    PHOTO_V = "2:3 (Portrait Photo)"
+    STANDARD_V = "3:4 (Portrait Standard)"
+    WIDESCREEN_V = "9:16 (Portrait Widescreen)"
 
 
 ASPECT_RATIOS: dict[AspectRatio, tuple[int, int]] = {
     AspectRatio.SQUARE: (1, 1),
-    AspectRatio.PHOTO_V: (2, 3),
     AspectRatio.PHOTO_H: (3, 2),
-    AspectRatio.STANDARD_V: (3, 4),
     AspectRatio.STANDARD_H: (4, 3),
-    AspectRatio.WIDESCREEN_V: (9, 16),
     AspectRatio.WIDESCREEN_H: (16, 9),
     AspectRatio.ULTRAWIDE_H: (21, 9),
+    AspectRatio.PHOTO_V: (2, 3),
+    AspectRatio.STANDARD_V: (3, 4),
+    AspectRatio.WIDESCREEN_V: (9, 16),
 }
 
 
@@ -50,35 +50,26 @@ class ResolutionSelector(io.ComfyNode):
                     min=0.1,
                     max=16.0,
                     step=0.1,
-                    tooltip="Target total megapixels. 1.0 MP ≈ 1024x1024 for square.",
-                ),
-                io.Int.Input(
-                    id="multiple",
-                    default=8,
-                    min=8,
-                    max=128,
-                    step=4,
-                    tooltip="Nearest multiple of the result to set the selected resolution to.",
-                    advanced=True,
+                    tooltip="Target total megapixels. 1.0 MP ≈ 1024×1024 for square.",
                 ),
             ],
             outputs=[
                 io.Int.Output(
-                    "width", tooltip="Calculated width in pixels multiplied by the selected multiple."
+                    "width", tooltip="Calculated width in pixels (multiple of 8)."
                 ),
                 io.Int.Output(
-                    "height", tooltip="Calculated height in pixels multiplied by the selected multiple."
+                    "height", tooltip="Calculated height in pixels (multiple of 8)."
                 ),
             ],
         )
 
     @classmethod
-    def execute(cls, aspect_ratio: str, megapixels: float, multiple: int) -> io.NodeOutput:
+    def execute(cls, aspect_ratio: str, megapixels: float) -> io.NodeOutput:
         w_ratio, h_ratio = ASPECT_RATIOS[aspect_ratio]
         total_pixels = megapixels * 1024 * 1024
         scale = math.sqrt(total_pixels / (w_ratio * h_ratio))
-        width = round(w_ratio * scale / multiple) * multiple
-        height = round(h_ratio * scale / multiple) * multiple
+        width = round(w_ratio * scale / 8) * 8
+        height = round(h_ratio * scale / 8) * 8
         return io.NodeOutput(width, height)
 
 

openapi.yaml

@@ -3,6 +3,11 @@ components:
         Asset:
             description: Represents a user-owned asset (image, video, or other generated output).
             properties:
+                asset_hash:
+                    deprecated: true
+                    description: 'Deprecated: use hash instead. Blake3 hash of the asset content.'
+                    pattern: ^blake3:[a-f0-9]{64}$
+                    type: string
                 created_at:
                     description: Timestamp when the asset was created
                     format: date-time
@@ -11,12 +16,8 @@ components:
                     description: Display name of the asset. Mirrors name for backwards compatibility.
                     nullable: true
                     type: string
-                file_path:
-                    description: Relative path in global-namespace-root form (e.g. "models/checkpoints/flux.safetensors")
-                    nullable: true
-                    type: string
                 hash:
-                    description: Blake3 hash of the asset content.
+                    description: Blake3 hash of the asset content. Preferred over asset_hash.
                     pattern: ^blake3:[a-f0-9]{64}$
                     type: string
                 id:
@@ -138,16 +139,17 @@ components:
         AssetUpdated:
             description: Response returned when an existing asset is successfully updated.
             properties:
+                asset_hash:
+                    deprecated: true
+                    description: 'Deprecated: use hash instead. Blake3 hash of the asset content.'
+                    pattern: ^blake3:[a-f0-9]{64}$
+                    type: string
                 display_name:
                     description: Display name of the asset. Mirrors name for backwards compatibility.
                     nullable: true
                     type: string
-                file_path:
-                    description: Relative path in global-namespace-root form (e.g. "models/checkpoints/flux.safetensors")
-                    nullable: true
-                    type: string
                 hash:
-                    description: Blake3 hash of the asset content.
+                    description: Blake3 hash of the asset content. Preferred over asset_hash.
                     pattern: ^blake3:[a-f0-9]{64}$
                     type: string
                 id:
@@ -826,11 +828,7 @@ components:
                     type: string
             type: object
         PaginationInfo:
-            description: |
-                Pagination metadata included in list responses. Supports both legacy
-                offset/limit pagination and cursor-based pagination. When cursor-based
-                pagination is used, `next_cursor` is the primary pagination token and
-                `offset`/`total` may be zero.
+            description: Offset/limit-based pagination metadata included in list responses.
             properties:
                 has_more:
                     description: Whether more items are available beyond this page
@@ -839,19 +837,12 @@ components:
                     description: Items per page
                     minimum: 1
                     type: integer
-                next_cursor:
-                    description: |
-                        Opaque cursor for the next page. Pass this value as the `after`
-                        query parameter on the next request. Empty or absent when there
-                        are no more results.
-                    type: string
                 offset:
-                    deprecated: true
-                    description: 'Current offset (0-based). Deprecated: use cursor-based pagination.'
+                    description: Current offset (0-based)
                     minimum: 0
                     type: integer
                 total:
-                    description: Total number of items matching filters (may be 0 when using cursor pagination)
+                    description: Total number of items matching filters
                     minimum: 0
                     type: integer
             required:
@@ -1527,11 +1518,17 @@ paths:
                   schema:
                     default: true
                     type: boolean
-                - description: Filter assets by exact content hash.
+                - description: Filter assets by exact content hash. Preferred over asset_hash.
                   in: query
                   name: hash
                   schema:
                     type: string
+                - deprecated: true
+                  description: 'Deprecated: use hash instead. Filter assets by exact content hash.'
+                  in: query
+                  name: asset_hash
+                  schema:
+                    type: string
                 - description: |
                     Opaque cursor for keyset pagination. Pass the `next_cursor` value
                     from the previous response to fetch the next page. When provided,
@@ -1574,12 +1571,42 @@ paths:
                 - file
         post:
             description: |
-                Creates a new asset from a direct file upload (multipart/form-data) with associated metadata.
+                Uploads a new asset to the system with associated metadata.
+                Supports two upload methods:
+                1. Direct file upload (multipart/form-data)
+                2. URL-based upload (application/json with source: "url")
 
                 If an asset with the same hash already exists, returns the existing asset.
-            operationId: createAsset
+            operationId: uploadAsset
             requestBody:
                 content:
+                    application/json:
+                        schema:
+                            properties:
+                                name:
+                                    description: Display name for the asset (used to determine file extension)
+                                    type: string
+                                preview_id:
+                                    description: Optional preview asset ID
+                                    format: uuid
+                                    type: string
+                                tags:
+                                    description: Freeform tags for the asset. Common types include "models", "input", "output", and "temp", but any tag can be used in any order.
+                                    items:
+                                        type: string
+                                    type: array
+                                url:
+                                    description: HTTP/HTTPS URL to download the asset from
+                                    format: uri
+                                    type: string
+                                user_metadata:
+                                    additionalProperties: true
+                                    description: Custom metadata to store with the asset
+                                    type: object
+                            required:
+                                - url
+                                - name
+                            type: object
                     multipart/form-data:
                         schema:
                             properties:
@@ -1587,10 +1614,6 @@ paths:
                                     description: The asset file to upload
                                     format: binary
                                     type: string
-                                hash:
-                                    description: Content hash of the file.
-                                    pattern: ^(blake3|sha256):[a-f0-9]{64}$
-                                    type: string
                                 id:
                                     description: Optional asset ID for idempotent creation. If provided and asset exists, returns existing asset.
                                     format: uuid
@@ -1606,8 +1629,10 @@ paths:
                                     format: uuid
                                     type: string
                                 tags:
-                                    description: JSON-encoded array of freeform tag strings, e.g. '["models","checkpoint"]'. Common types include "models", "input", "output", and "temp", but any tag can be used in any order.
-                                    type: string
+                                    description: Freeform tags for the asset. Common types include "models", "input", "output", and "temp", but any tag can be used in any order.
+                                    items:
+                                        type: string
+                                    type: array
                                 user_metadata:
                                     description: Custom JSON metadata as a string
                                     type: string
@@ -1616,32 +1641,36 @@ paths:
                             type: object
                 required: true
             responses:
-                "200":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/AssetCreated'
-                    description: |
-                        Asset already existed for this user (deduplicated by content hash); the
-                        existing asset is returned with created_new=false.
                 "201":
                     content:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/AssetCreated'
-                    description: Asset created successfully (created_new=true)
+                    description: Asset created successfully
                 "400":
                     content:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/ErrorResponse'
-                    description: Invalid request (bad file, invalid content type, etc.)
+                    description: Invalid request (bad file, invalid URL, invalid content type, etc.)
                 "401":
                     content:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/ErrorResponse'
                     description: Unauthorized
+                "403":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Source URL requires authentication or access denied
+                "404":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Source URL not found
                 "413":
                     content:
                         application/json:
@@ -1654,13 +1683,19 @@ paths:
                             schema:
                                 $ref: '#/components/schemas/ErrorResponse'
                     description: Unsupported media type
+                "422":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Download failed due to network error or timeout
                 "500":
                     content:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/ErrorResponse'
                     description: Internal server error
-            summary: Create a new asset
+            summary: Upload a new asset
             tags:
                 - file
     /api/assets/{id}:
@@ -1695,7 +1730,7 @@ paths:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/ErrorResponse'
-                    description: 'Asset cannot be deleted because it is referenced by another resource, e.g. a workflow version (error code: ASSET_IN_USE)'
+                    description: Asset cannot be deleted because it is referenced by another resource (e.g., workflow version)
                 "500":
                     content:
                         application/json:
@@ -1748,7 +1783,7 @@ paths:
             description: |
                 Updates an asset's metadata. At least one field must be provided.
                 Only name, mime_type, preview_id, and user_metadata can be updated.
-                For tag management, use POST (add) and DELETE (remove) /api/assets/{id}/tags.
+                For tag management, use the dedicated PUT /api/assets/{id}/tags endpoint.
             operationId: updateAsset
             parameters:
                 - description: Asset ID
@@ -1947,6 +1982,76 @@ paths:
             summary: Add tags to asset
             tags:
                 - file
+        put:
+            description: Adds and removes tags from an asset in a single operation
+            operationId: updateAssetTags
+            parameters:
+                - description: Asset ID
+                  in: path
+                  name: id
+                  required: true
+                  schema:
+                    format: uuid
+                    type: string
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            description: At least one of add or remove must contain items. Empty arrays are allowed when the other array has items.
+                            minProperties: 1
+                            properties:
+                                add:
+                                    description: Tags to add to the asset. Can be empty if remove has items.
+                                    items:
+                                        type: string
+                                    type: array
+                                remove:
+                                    description: Tags to remove from the asset. Can be empty if add has items.
+                                    items:
+                                        type: string
+                                    type: array
+                            type: object
+                required: true
+            responses:
+                "200":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/TagsModificationResponse'
+                    description: Tags updated successfully
+                "400":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Invalid request
+                "401":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Unauthorized
+                "404":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Asset not found
+                "422":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Reserved tag validation error
+                "500":
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/ErrorResponse'
+                    description: Internal server error
+            summary: Update asset tags
+            tags:
+                - file
     /api/assets/from-hash:
         post:
             description: |
@@ -1985,20 +2090,12 @@ paths:
                             type: object
                 required: true
             responses:
-                "200":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/AssetCreated'
-                    description: |
-                        Asset reference already existed for this user (deduplicated by content
-                        hash); the existing asset is returned with created_new=false.
                 "201":
                     content:
                         application/json:
                             schema:
                                 $ref: '#/components/schemas/AssetCreated'
-                    description: Asset reference created successfully (created_new=true)
+                    description: Asset reference created successfully
                 "400":
                     content:
                         application/json:
@@ -2790,21 +2887,7 @@ paths:
                         - asc
                         - desc
                     type: string
-                - description: |
-                    Opaque cursor for keyset pagination. Pass the `next_cursor` value
-                    from a previous response to fetch the next page.
-                    Cursor pagination is supported only when `sort_by=create_time`
-                    (default). If `sort_by=execution_time`, `after` is ignored and
-                    offset/limit pagination is used.
-                    Cursors are opaque base64url payloads — clients should treat them
-                    as strings and not parse the contents.
-                  example: eyJzIjoiY3JlYXRlX3RpbWUiLCJ2IjoiMTcxNjIwMDAwMDAwMDAwMCIsImlkIjoiYTFiMmMzZDQtZTVmNi03YTg5LWIwYzEtZDJlM2Y0YTViNmM3In0
-                  in: query
-                  name: after
-                  schema:
-                    type: string
-                - deprecated: true
-                  description: 'Pagination offset (0-based). Deprecated: prefer cursor-based pagination via `after`.'
+                - description: Pagination offset (0-based)
                   in: query
                   name: offset
                   schema:
@@ -2826,12 +2909,6 @@ paths:
                             schema:
                                 $ref: '#/components/schemas/JobsListResponse'
                     description: Success - Jobs retrieved
-                "400":
-                    content:
-                        application/json:
-                            schema:
-                                $ref: '#/components/schemas/ErrorResponse'
-                    description: Bad request (e.g. malformed pagination cursor).
                 "401":
                     content:
                         application/json:

requirements.txt

@@ -1,6 +1,6 @@
 comfyui-frontend-package==1.45.15
 comfyui-workflow-templates==0.9.98
-comfyui-embedded-docs==0.5.3
+comfyui-embedded-docs==0.5.2
 torch
 torchsde
 torchvision

tests-unit/assets_test/services/test_image_dimensions.py

@@ -1,86 +0,0 @@
-"""Tests for the image_dimensions service."""
-from __future__ import annotations
-
-from pathlib import Path
-
-import pytest
-from PIL import Image
-
-from app.assets.services.image_dimensions import extract_image_dimensions
-
-
-def _make_png(path: Path, size: tuple[int, int]) -> Path:
-    img = Image.new("RGB", size, color=(123, 45, 67))
-    img.save(path, format="PNG")
-    return path
-
-
-def _make_jpeg(path: Path, size: tuple[int, int]) -> Path:
-    img = Image.new("RGB", size, color=(10, 20, 30))
-    img.save(path, format="JPEG", quality=80)
-    return path
-
-
-class TestExtractImageDimensions:
-    def test_extracts_png_dimensions(self, tmp_path: Path):
-        f = _make_png(tmp_path / "rect.png", (320, 240))
-
-        result = extract_image_dimensions(str(f), mime_type="image/png")
-
-        assert result == {"kind": "image", "width": 320, "height": 240}
-
-    def test_extracts_jpeg_dimensions(self, tmp_path: Path):
-        f = _make_jpeg(tmp_path / "shot.jpg", (1920, 1080))
-
-        result = extract_image_dimensions(str(f), mime_type="image/jpeg")
-
-        assert result == {"kind": "image", "width": 1920, "height": 1080}
-
-    def test_works_when_mime_type_is_none(self, tmp_path: Path):
-        f = _make_png(tmp_path / "no_mime.png", (50, 100))
-
-        result = extract_image_dimensions(str(f), mime_type=None)
-
-        assert result == {"kind": "image", "width": 50, "height": 100}
-
-    def test_skips_non_image_mime_without_touching_file(self, tmp_path: Path):
-        # Path doesn't need to exist — non-image MIME short-circuits.
-        result = extract_image_dimensions(
-            str(tmp_path / "model.safetensors"),
-            mime_type="application/octet-stream",
-        )
-
-        assert result is None
-
-    @pytest.mark.parametrize(
-        "mime",
-        ["application/json", "text/plain", "video/mp4", "audio/mpeg"],
-    )
-    def test_skips_all_non_image_mime_types(self, tmp_path: Path, mime: str):
-        f = tmp_path / "file.bin"
-        f.write_bytes(b"\x00\x01\x02")
-
-        assert extract_image_dimensions(str(f), mime_type=mime) is None
-
-    def test_returns_none_for_missing_file(self, tmp_path: Path):
-        result = extract_image_dimensions(
-            str(tmp_path / "does_not_exist.png"), mime_type="image/png"
-        )
-
-        assert result is None
-
-    def test_returns_none_for_corrupt_image(self, tmp_path: Path):
-        f = tmp_path / "corrupt.png"
-        f.write_bytes(b"not actually a png file")
-
-        result = extract_image_dimensions(str(f), mime_type="image/png")
-
-        assert result is None
-
-    def test_returns_none_for_empty_file(self, tmp_path: Path):
-        f = tmp_path / "empty.png"
-        f.write_bytes(b"")
-
-        result = extract_image_dimensions(str(f), mime_type="image/png")
-
-        assert result is None

tests-unit/assets_test/services/test_ingest.py

@@ -4,12 +4,10 @@ from pathlib import Path
 from unittest.mock import patch
 
 import pytest
-from PIL import Image
 from sqlalchemy.orm import Session as SASession, Session
 
 from app.assets.database.models import Asset, AssetReference, AssetReferenceTag, Tag
 from app.assets.database.queries import get_reference_tags
-from app.assets.helpers import get_utc_now
 from app.assets.services.ingest import (
     _ingest_file_from_path,
     _register_existing_asset,
@@ -17,11 +15,6 @@ from app.assets.services.ingest import (
 )
 
 
-def _make_png(path: Path, size: tuple[int, int]) -> Path:
-    Image.new("RGB", size, color=(80, 120, 200)).save(path, format="PNG")
-    return path
-
-
 class TestIngestFileFromPath:
     def test_creates_asset_and_reference(self, mock_create_session, temp_dir: Path, session: Session):
         file_path = temp_dir / "test_file.bin"
@@ -286,203 +279,4 @@ class TestIngestExistingFileTagFK:
             ref_tags = sess.query(AssetReferenceTag).all()
             ref_tag_names = {rt.tag_name for rt in ref_tags}
             assert "output" in ref_tag_names
-
-
-class TestIngestImageDimensions:
-    """system_metadata should carry {kind, width, height} for image assets."""
-
-    def test_image_asset_emits_dimensions(
-        self, mock_create_session, temp_dir: Path, session: Session
-    ):
-        f = _make_png(temp_dir / "shot.png", (640, 480))
-
-        result = _ingest_file_from_path(
-            abs_path=str(f),
-            asset_hash="blake3:img1",
-            size_bytes=f.stat().st_size,
-            mtime_ns=1234567890000000000,
-            mime_type="image/png",
-        )
-
-        ref = session.query(AssetReference).filter_by(id=result.reference_id).first()
-        assert ref.system_metadata == {
-            "kind": "image",
-            "width": 640,
-            "height": 480,
-        }
-
-    def test_non_image_asset_leaves_system_metadata_empty(
-        self, mock_create_session, temp_dir: Path, session: Session
-    ):
-        f = temp_dir / "model.safetensors"
-        f.write_bytes(b"not an image")
-
-        result = _ingest_file_from_path(
-            abs_path=str(f),
-            asset_hash="blake3:safetensors1",
-            size_bytes=f.stat().st_size,
-            mtime_ns=1234567890000000000,
-            mime_type="application/octet-stream",
-        )
-
-        ref = session.query(AssetReference).filter_by(id=result.reference_id).first()
-        assert ref.system_metadata in (None, {})
-
-    def test_preserves_existing_system_metadata_keys(
-        self, mock_create_session, temp_dir: Path, session: Session
-    ):
-        f = _make_png(temp_dir / "annotated.png", (100, 200))
-
-        # First pass populates a sentinel system_metadata key (simulating prior
-        # enricher write).
-        result = _ingest_file_from_path(
-            abs_path=str(f),
-            asset_hash="blake3:img-merge",
-            size_bytes=f.stat().st_size,
-            mtime_ns=1234567890000000000,
-            mime_type="image/png",
-        )
-        ref = session.query(AssetReference).filter_by(id=result.reference_id).first()
-        ref.system_metadata = {**(ref.system_metadata or {}), "source_url": "https://example/x.png"}
-        session.commit()
-
-        # Second pass with the same path triggers the merge code path again.
-        _ingest_file_from_path(
-            abs_path=str(f),
-            asset_hash="blake3:img-merge",
-            size_bytes=f.stat().st_size,
-            mtime_ns=1234567890000000001,
-            mime_type="image/png",
-        )
-
-        session.refresh(ref)
-        assert ref.system_metadata["kind"] == "image"
-        assert ref.system_metadata["width"] == 100
-        assert ref.system_metadata["height"] == 200
-        assert ref.system_metadata["source_url"] == "https://example/x.png"
-
-
-class TestRegisterExistingAssetBackfill:
-    """The from-hash path back-fills dimensions from a sibling reference."""
-
-    def _add_reference(
-        self,
-        session: Session,
-        asset: Asset,
-        name: str,
-        system_metadata: dict | None = None,
-    ) -> AssetReference:
-        now = get_utc_now()
-        ref = AssetReference(
-            asset_id=asset.id,
-            name=name,
-            owner_id="",
-            created_at=now,
-            updated_at=now,
-            last_access_time=now,
-            system_metadata=system_metadata or {},
-        )
-        session.add(ref)
-        session.flush()
-        return ref
-
-    def test_backfills_dimensions_from_sibling_image_reference(
-        self, mock_create_session, session: Session
-    ):
-        asset = Asset(hash="blake3:shared", size_bytes=2048, mime_type="image/png")
-        session.add(asset)
-        session.flush()
-        self._add_reference(
-            session,
-            asset,
-            name="original.png",
-            system_metadata={"kind": "image", "width": 800, "height": 600},
-        )
-        session.commit()
-
-        result = _register_existing_asset(
-            asset_hash="blake3:shared",
-            name="from_hash.png",
-            owner_id="user-x",
-        )
-
-        ref = session.query(AssetReference).filter_by(id=result.ref.id).first()
-        assert ref.system_metadata.get("kind") == "image"
-        assert ref.system_metadata.get("width") == 800
-        assert ref.system_metadata.get("height") == 600
-
-    def test_no_backfill_when_sibling_has_no_image_metadata(
-        self, mock_create_session, session: Session
-    ):
-        asset = Asset(hash="blake3:nodims", size_bytes=2048, mime_type="image/png")
-        session.add(asset)
-        session.flush()
-        self._add_reference(
-            session,
-            asset,
-            name="original.png",
-            system_metadata={"base_model": "flux"},  # no kind=image
-        )
-        session.commit()
-
-        result = _register_existing_asset(
-            asset_hash="blake3:nodims",
-            name="from_hash.png",
-            owner_id="user-x",
-        )
-
-        ref = session.query(AssetReference).filter_by(id=result.ref.id).first()
-        meta = ref.system_metadata or {}
-        assert "kind" not in meta
-        assert "width" not in meta
-        assert "height" not in meta
-
-    def test_no_backfill_when_no_sibling_exists(
-        self, mock_create_session, session: Session
-    ):
-        asset = Asset(hash="blake3:lonely", size_bytes=1024, mime_type="image/png")
-        session.add(asset)
-        session.commit()
-
-        result = _register_existing_asset(
-            asset_hash="blake3:lonely",
-            name="solo.png",
-            owner_id="user-x",
-        )
-
-        ref = session.query(AssetReference).filter_by(id=result.ref.id).first()
-        assert ref.system_metadata in (None, {})
-
-    def test_backfill_preserves_caller_supplied_keys(
-        self, mock_create_session, session: Session
-    ):
-        asset = Asset(hash="blake3:preserve", size_bytes=2048, mime_type="image/png")
-        session.add(asset)
-        session.flush()
-        self._add_reference(
-            session,
-            asset,
-            name="original.png",
-            system_metadata={"kind": "image", "width": 1024, "height": 768},
-        )
-        session.commit()
-
-        # Simulate a from-hash path where the new reference already carries
-        # some system_metadata (e.g. a download-provenance source_url written
-        # by an earlier step). The back-fill must merge dim keys without
-        # clobbering existing keys.
-        result = _register_existing_asset(
-            asset_hash="blake3:preserve",
-            name="from_hash.png",
-            owner_id="user-x",
-        )
-        ref = session.query(AssetReference).filter_by(id=result.ref.id).first()
-        # Seed a sentinel key and re-run back-fill via a second register call
-        # to exercise the merge path with pre-existing data.
-        ref.system_metadata = {**(ref.system_metadata or {}), "source_url": "https://example/p"}
-        session.commit()
-
-        assert ref.system_metadata.get("source_url") == "https://example/p"
-        assert ref.system_metadata.get("kind") == "image"
-        assert ref.system_metadata.get("width") == 1024
-        assert ref.system_metadata.get("height") == 768
+            assert "my-job" in ref_tag_names