Merge 498fc2e39a into b633244635

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/nodes_openai.py

@@ -454,6 +454,7 @@ class OpenAIGPTImage1(IO.ComfyNode):
                     step=16,
                     tooltip="Used only when `size` is 'Custom'. Must be a multiple of 16 (GPT Image 2 only).",
                     optional=True,
+                    advanced=True,
                 ),
                 IO.Int.Input(
                     "custom_height",
@@ -463,6 +464,7 @@ class OpenAIGPTImage1(IO.ComfyNode):
                     step=16,
                     tooltip="Used only when `size` is 'Custom'. Must be a multiple of 16 (GPT Image 2 only).",
                     optional=True,
+                    advanced=True,
                 ),
             ],
             outputs=[

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