Merge 5f74786fd5 into a7d82baa06

CODEOWNERS

@@ -1,2 +1,2 @@
 # Admins
-* @comfyanonymous @kosinkadink @guill @alexisrolland @rattus128
+* @comfyanonymous @kosinkadink @guill

comfy/lora.py

@@ -342,12 +342,6 @@ def model_lora_keys_unet(model, key_map={}):
                 key_map["base_model.model.{}".format(key_lora)] = k  # Official base model loras
                 key_map["lycoris_{}".format(key_lora.replace(".", "_"))] = k  # LyCORIS/LoKR format
 
-    if isinstance(model, comfy.model_base.ErnieImage):
-        for k in sdk:
-            if k.startswith("diffusion_model.") and k.endswith(".weight"):
-                key_lora = k[len("diffusion_model."):-len(".weight")]
-                key_map["transformer.{}".format(key_lora)] = k
-
     return key_map
 
 

comfy/supported_models.py

@@ -1879,86 +1879,6 @@ class CogVideoX_I2V(CogVideoX_T2V):
         out = model_base.CogVideoX(self, image_to_video=True, device=device)
         return out
 
+models = [LotusD, Stable_Zero123, SD15_instructpix2pix, SD15, SD20, SD21UnclipL, SD21UnclipH, SDXL_instructpix2pix, SDXLRefiner, SDXL, SSD1B, KOALA_700M, KOALA_1B, Segmind_Vega, SD_X4Upscaler, Stable_Cascade_C, Stable_Cascade_B, SV3D_u, SV3D_p, SD3, StableAudio, AuraFlow, PixArtAlpha, PixArtSigma, HunyuanDiT, HunyuanDiT1, FluxInpaint, Flux, LongCatImage, FluxSchnell, GenmoMochi, LTXV, LTXAV, HunyuanVideo15_SR_Distilled, HunyuanVideo15, HunyuanImage21Refiner, HunyuanImage21, HunyuanVideoSkyreelsI2V, HunyuanVideoI2V, HunyuanVideo, CosmosT2V, CosmosI2V, CosmosT2IPredict2, CosmosI2VPredict2, ZImagePixelSpace, ZImage, Lumina2, WAN22_T2V, WAN21_T2V, WAN21_I2V, WAN21_FunControl2V, WAN21_Vace, WAN21_Camera, WAN22_Camera, WAN22_S2V, WAN21_HuMo, WAN22_Animate, WAN21_FlowRVS, WAN21_SCAIL, Hunyuan3Dv2mini, Hunyuan3Dv2, Hunyuan3Dv2_1, HiDream, Chroma, ChromaRadiance, ACEStep, ACEStep15, Omnigen2, QwenImage, Flux2, Kandinsky5Image, Kandinsky5, Anima, RT_DETR_v4, ErnieImage, SAM3, SAM31, CogVideoX_I2V, CogVideoX_T2V]
 
-models = [
-    LotusD,
-    Stable_Zero123,
-    SD15_instructpix2pix,
-    SD15,
-    SD20,
-    SD21UnclipL,
-    SD21UnclipH,
-    SDXL_instructpix2pix,
-    SDXLRefiner,
-    SDXL,
-    SSD1B,
-    KOALA_700M,
-    KOALA_1B,
-    Segmind_Vega,
-    SD_X4Upscaler,
-    Stable_Cascade_C,
-    Stable_Cascade_B,
-    SV3D_u,
-    SV3D_p,
-    SD3,
-    StableAudio,
-    AuraFlow,
-    PixArtAlpha,
-    PixArtSigma,
-    HunyuanDiT,
-    HunyuanDiT1,
-    FluxInpaint,
-    Flux,
-    LongCatImage,
-    FluxSchnell,
-    GenmoMochi,
-    LTXV,
-    LTXAV,
-    HunyuanVideo15_SR_Distilled,
-    HunyuanVideo15,
-    HunyuanImage21Refiner,
-    HunyuanImage21,
-    HunyuanVideoSkyreelsI2V,
-    HunyuanVideoI2V,
-    HunyuanVideo,
-    CosmosT2V,
-    CosmosI2V,
-    CosmosT2IPredict2,
-    CosmosI2VPredict2,
-    ZImagePixelSpace,
-    ZImage,
-    Lumina2,
-    WAN22_T2V,
-    WAN21_T2V,
-    WAN21_I2V,
-    WAN21_FunControl2V,
-    WAN21_Vace,
-    WAN21_Camera,
-    WAN22_Camera,
-    WAN22_S2V,
-    WAN21_HuMo,
-    WAN22_Animate,
-    WAN21_FlowRVS,
-    WAN21_SCAIL,
-    Hunyuan3Dv2mini,
-    Hunyuan3Dv2,
-    Hunyuan3Dv2_1,
-    HiDream,
-    Chroma,
-    ChromaRadiance,
-    ACEStep,
-    ACEStep15,
-    Omnigen2,
-    QwenImage,
-    Flux2,
-    Kandinsky5Image,
-    Kandinsky5,
-    Anima,
-    RT_DETR_v4,
-    ErnieImage,
-    SAM3,
-    SAM31,
-    CogVideoX_I2V,
-    CogVideoX_T2V,
-    SVD_img2vid,
-]
+models += [SVD_img2vid]

comfy_api/latest/_input_impl/video_types.py

@@ -290,7 +290,7 @@ class VideoFromFile(VideoInput):
                                     alphas = []
                                     alpha_channel = True
                                     break
-                            if frame.format.name in ("yuvj420p", "yuvj422p", "yuvj444p", "rgb24", "rgba", "pal8"):
+                            if frame.format.name in ("yuvj420p", "rgb24", "rgba", "pal8"):
                                 process_image_format = lambda a: a.float() / 255.0
                                 if alpha_channel:
                                     image_format = 'rgba'

comfy_api_nodes/apis/bytedance.py

@@ -157,11 +157,6 @@ class SeedanceCreateAssetResponse(BaseModel):
     asset_id: str = Field(...)
 
 
-class SeedanceVirtualLibraryCreateAssetRequest(BaseModel):
-    url: str = Field(..., description="Publicly accessible URL of the image asset to upload.")
-    hash: str = Field(..., description="Dedup key. Re-submitting the same hash returns the existing asset id.")
-
-
 # Dollars per 1K tokens, keyed by (model_id, has_video_input).
 SEEDANCE2_PRICE_PER_1K_TOKENS = {
     ("dreamina-seedance-2-0-260128", False): 0.007,

comfy_api_nodes/nodes_bytedance.py

@@ -1,4 +1,3 @@
-import hashlib
 import logging
 import math
 import re
@@ -21,7 +20,6 @@ from comfy_api_nodes.apis.bytedance import (
     SeedanceCreateAssetResponse,
     SeedanceCreateVisualValidateSessionResponse,
     SeedanceGetVisualValidateSessionResponse,
-    SeedanceVirtualLibraryCreateAssetRequest,
     Seedream4Options,
     Seedream4TaskCreationRequest,
     TaskAudioContent,
@@ -273,30 +271,6 @@ async def _wait_for_asset_active(cls: type[IO.ComfyNode], asset_id: str, group_i
     )
 
 
-async def _seedance_virtual_library_upload_image_asset(
-    cls: type[IO.ComfyNode],
-    image: torch.Tensor,
-    *,
-    wait_label: str = "Uploading image",
-) -> str:
-    """Upload an image into the caller's per-customer Seedance virtual library."""
-    public_url = await upload_image_to_comfyapi(cls, image, wait_label=wait_label)
-    normalized = image.detach().cpu().contiguous().to(torch.float32)
-    digest = hashlib.sha256()
-    digest.update(str(tuple(normalized.shape)).encode("utf-8"))
-    digest.update(b"\0")
-    digest.update(normalized.numpy().tobytes())
-    image_hash = digest.hexdigest()
-    create_resp = await sync_op(
-        cls,
-        ApiEndpoint(path="/proxy/seedance/virtual-library/assets", method="POST"),
-        response_model=SeedanceCreateAssetResponse,
-        data=SeedanceVirtualLibraryCreateAssetRequest(url=public_url, hash=image_hash),
-    )
-    await _wait_for_asset_active(cls, create_resp.asset_id, group_id="virtual-library")
-    return f"asset://{create_resp.asset_id}"
-
-
 def _seedance2_price_extractor(model_id: str, has_video_input: bool):
     """Returns a price_extractor closure for Seedance 2.0 poll_op."""
     rate = SEEDANCE2_PRICE_PER_1K_TOKENS.get((model_id, has_video_input))
@@ -1533,9 +1507,7 @@ class ByteDance2FirstLastFrameNode(IO.ComfyNode):
         if first_frame_asset_id:
             first_frame_url = image_assets[first_frame_asset_id]
         else:
-            first_frame_url = await _seedance_virtual_library_upload_image_asset(
-                cls, first_frame, wait_label="Uploading first frame."
-            )
+            first_frame_url = await upload_image_to_comfyapi(cls, first_frame, wait_label="Uploading first frame.")
 
         content: list[TaskTextContent | TaskImageContent] = [
             TaskTextContent(text=model["prompt"]),
@@ -1555,9 +1527,7 @@ class ByteDance2FirstLastFrameNode(IO.ComfyNode):
             content.append(
                 TaskImageContent(
                     image_url=TaskImageContentUrl(
-                        url=await _seedance_virtual_library_upload_image_asset(
-                            cls, last_frame, wait_label="Uploading last frame."
-                        )
+                        url=await upload_image_to_comfyapi(cls, last_frame, wait_label="Uploading last frame.")
                     ),
                     role="last_frame",
                 ),
@@ -1835,9 +1805,9 @@ class ByteDance2ReferenceNode(IO.ComfyNode):
             content.append(
                 TaskImageContent(
                     image_url=TaskImageContentUrl(
-                        url=await _seedance_virtual_library_upload_image_asset(
+                        url=await upload_image_to_comfyapi(
                             cls,
-                            reference_images[key],
+                            image=reference_images[key],
                             wait_label=f"Uploading image {i}",
                         ),
                     ),

comfy_api_nodes/nodes_openai.py

@@ -415,9 +415,8 @@ class OpenAIGPTImage1(IO.ComfyNode):
                         "1152x2048",
                         "3840x2160",
                         "2160x3840",
-                        "Custom",
                     ],
-                    tooltip="Image size. Select 'Custom' to use the custom width and height (GPT Image 2 only).",
+                    tooltip="Image size",
                     optional=True,
                 ),
                 IO.Int.Input(
@@ -446,24 +445,6 @@ class OpenAIGPTImage1(IO.ComfyNode):
                     default="gpt-image-2",
                     optional=True,
                 ),
-                IO.Int.Input(
-                    "custom_width",
-                    default=1024,
-                    min=1024,
-                    max=3840,
-                    step=16,
-                    tooltip="Used only when `size` is 'Custom'. Must be a multiple of 16 (GPT Image 2 only).",
-                    optional=True,
-                ),
-                IO.Int.Input(
-                    "custom_height",
-                    default=1024,
-                    min=1024,
-                    max=3840,
-                    step=16,
-                    tooltip="Used only when `size` is 'Custom'. Must be a multiple of 16 (GPT Image 2 only).",
-                    optional=True,
-                ),
             ],
             outputs=[
                 IO.Image.Output(),
@@ -490,9 +471,9 @@ class OpenAIGPTImage1(IO.ComfyNode):
                       "high":   [0.133, 0.22]
                     },
                     "gpt-image-2": {
-                      "low":    [0.0048, 0.019],
-                      "medium": [0.041, 0.168],
-                      "high":   [0.165, 0.67]
+                      "low":    [0.0048, 0.012],
+                      "medium": [0.041, 0.112],
+                      "high":   [0.165, 0.43]
                     }
                   };
                   $range := $lookup($lookup($ranges, widgets.model), widgets.quality);
@@ -522,8 +503,6 @@ class OpenAIGPTImage1(IO.ComfyNode):
         mask: Input.Image | None = None,
         n: int = 1,
         size: str = "1024x1024",
-        custom_width: int = 1024,
-        custom_height: int = 1024,
         model: str = "gpt-image-1",
     ) -> IO.NodeOutput:
         validate_string(prompt, strip_whitespace=False)
@@ -531,25 +510,7 @@ class OpenAIGPTImage1(IO.ComfyNode):
         if mask is not None and image is None:
             raise ValueError("Cannot use a mask without an input image")
 
-        if size == "Custom":
-            if model != "gpt-image-2":
-                raise ValueError("Custom resolution is only supported by GPT Image 2 model")
-            if custom_width % 16 != 0 or custom_height % 16 != 0:
-                raise ValueError(f"Custom width and height must be multiples of 16, got {custom_width}x{custom_height}")
-            if max(custom_width, custom_height) > 3840:
-                raise ValueError(f"Custom resolution max edge must be <= 3840, got {custom_width}x{custom_height}")
-            ratio = max(custom_width, custom_height) / min(custom_width, custom_height)
-            if ratio > 3:
-                raise ValueError(
-                    f"Custom resolution aspect ratio must not exceed 3:1, got {custom_width}x{custom_height}"
-                )
-            total_pixels = custom_width * custom_height
-            if not 655_360 <= total_pixels <= 8_294_400:
-                raise ValueError(
-                    f"Custom resolution total pixels must be between 655,360 and 8,294,400, got {total_pixels}"
-                )
-            size = f"{custom_width}x{custom_height}"
-        elif model in ("gpt-image-1", "gpt-image-1.5"):
+        if model in ("gpt-image-1", "gpt-image-1.5"):
             if size not in ("auto", "1024x1024", "1024x1536", "1536x1024"):
                 raise ValueError(f"Resolution {size} is only supported by GPT Image 2 model")
 

requirements.txt

@@ -1,5 +1,5 @@
 comfyui-frontend-package==1.42.15
-comfyui-workflow-templates==0.9.65
+comfyui-workflow-templates==0.9.63
 comfyui-embedded-docs==0.4.4
 torch
 torchsde