From a40fcfc2d5392a5014cd87588035ebce194cb015 Mon Sep 17 00:00:00 2001
From: Chenlei Hu <hcl@comfy.org>
Date: Fri, 28 Mar 2025 02:27:01 -0400
Subject: [PATCH 01/18] Update frontend to 1.14.6 (#7416)

Cherry-pick the fix: https://github.com/Comfy-Org/ComfyUI_frontend/pull/3252
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c78d3c22..806fbc75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-comfyui-frontend-package==1.14.5
+comfyui-frontend-package==1.14.6
 torch
 torchsde
 torchvision

From 2d17d8910c7d34383feaf1aaac8d08571fe42077 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Fri, 28 Mar 2025 08:40:25 -0400
Subject: [PATCH 02/18] Don't error if wan concat image has extra channels.

---
 comfy/model_base.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/comfy/model_base.py b/comfy/model_base.py
index 8f588e2b..f55cbe18 100644
--- a/comfy/model_base.py
+++ b/comfy/model_base.py
@@ -1013,6 +1013,9 @@ class WAN21(BaseModel):
         if not self.image_to_video or extra_channels == image.shape[1]:
             return image
 
+        if image.shape[1] > (extra_channels - 4):
+            image = image[:, :(extra_channels - 4)]
+
         mask = kwargs.get("concat_mask", kwargs.get("denoise_mask", None))
         if mask is None:
             mask = torch.zeros_like(noise)[:, :4]

From 832fc02330c1843b9817b8ee90b061d2298a5911 Mon Sep 17 00:00:00 2001
From: Michael Kupchick <michael@lightricks.com>
Date: Sun, 30 Mar 2025 03:03:02 +0300
Subject: [PATCH 03/18] ltxv: fix preprocessing exception when compression is
 0. (#7431)

---
 comfy_extras/nodes_lt.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/comfy_extras/nodes_lt.py b/comfy_extras/nodes_lt.py
index fdc6c7c1..52588920 100644
--- a/comfy_extras/nodes_lt.py
+++ b/comfy_extras/nodes_lt.py
@@ -446,10 +446,9 @@ class LTXVPreprocess:
     CATEGORY = "image"
 
     def preprocess(self, image, img_compression):
-        if img_compression > 0:
-            output_images = []
-            for i in range(image.shape[0]):
-                output_images.append(preprocess(image[i], img_compression))
+        output_images = []
+        for i in range(image.shape[0]):
+            output_images.append(preprocess(image[i], img_compression))
         return (torch.stack(output_images),)
 
 

From a3100c8452862e914996648e0fbc56098ab26b60 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sat, 29 Mar 2025 20:11:43 -0400
Subject: [PATCH 04/18] Remove useless code.

---
 comfy/model_base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/comfy/model_base.py b/comfy/model_base.py
index f55cbe18..6bc627ae 100644
--- a/comfy/model_base.py
+++ b/comfy/model_base.py
@@ -1000,7 +1000,6 @@ class WAN21(BaseModel):
         device = kwargs["device"]
 
         if image is None:
-            image = torch.zeros_like(noise)
             shape_image = list(noise.shape)
             shape_image[1] = extra_channels
             image = torch.zeros(shape_image, dtype=noise.dtype, layout=noise.layout, device=noise.device)

From 0b4584c7413f1c3f6a34875a790c0381b3510447 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sun, 30 Mar 2025 21:47:05 -0400
Subject: [PATCH 05/18] Fix latent composite node not working when source has
 alpha.

---
 comfy_extras/nodes_mask.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/comfy_extras/nodes_mask.py b/comfy_extras/nodes_mask.py
index 63fd13b9..2dd826b2 100644
--- a/comfy_extras/nodes_mask.py
+++ b/comfy_extras/nodes_mask.py
@@ -87,6 +87,8 @@ class ImageCompositeMasked:
     CATEGORY = "image"
 
     def composite(self, destination, source, x, y, resize_source, mask = None):
+        if destination.shape[-1] < source.shape[-1]:
+            source = source[...,:destination.shape[-1]]
         destination = destination.clone().movedim(-1, 1)
         output = composite(destination, source.movedim(-1, 1), x, y, mask, 1, resize_source).movedim(1, -1)
         return (output,)

From 548457bac47bb6c0ce233a9f5abb3467582d710d Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Mon, 31 Mar 2025 20:59:12 -0400
Subject: [PATCH 06/18] Fix alpha channel mismatch on destination in
 ImageCompositeMasked

---
 comfy_extras/nodes_mask.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/comfy_extras/nodes_mask.py b/comfy_extras/nodes_mask.py
index 2dd826b2..e1f0c822 100644
--- a/comfy_extras/nodes_mask.py
+++ b/comfy_extras/nodes_mask.py
@@ -89,6 +89,9 @@ class ImageCompositeMasked:
     def composite(self, destination, source, x, y, resize_source, mask = None):
         if destination.shape[-1] < source.shape[-1]:
             source = source[...,:destination.shape[-1]]
+        elif destination.shape[-1] > source.shape[-1]:
+            destination = torch.nn.functional.pad(destination, (0, 1))
+            destination[..., -1] = source[..., -1]
         destination = destination.clone().movedim(-1, 1)
         output = composite(destination, source.movedim(-1, 1), x, y, mask, 1, resize_source).movedim(1, -1)
         return (output,)

From 301e26b131e99577aa64a366ca93c2bf85f34b96 Mon Sep 17 00:00:00 2001
From: BVH <82035780+bvhari@users.noreply.github.com>
Date: Tue, 1 Apr 2025 23:18:53 +0530
Subject: [PATCH 07/18] Add option to store TE in bf16 (#7461)

---
 comfy/cli_args.py         | 1 +
 comfy/model_management.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/comfy/cli_args.py b/comfy/cli_args.py
index 91c1fe70..62079e6a 100644
--- a/comfy/cli_args.py
+++ b/comfy/cli_args.py
@@ -79,6 +79,7 @@ fpte_group.add_argument("--fp8_e4m3fn-text-enc", action="store_true", help="Stor
 fpte_group.add_argument("--fp8_e5m2-text-enc", action="store_true", help="Store text encoder weights in fp8 (e5m2 variant).")
 fpte_group.add_argument("--fp16-text-enc", action="store_true", help="Store text encoder weights in fp16.")
 fpte_group.add_argument("--fp32-text-enc", action="store_true", help="Store text encoder weights in fp32.")
+fpte_group.add_argument("--bf16-text-enc", action="store_true", help="Store text encoder weights in bf16.")
 
 parser.add_argument("--force-channels-last", action="store_true", help="Force channels last format when inferencing the models.")
 
diff --git a/comfy/model_management.py b/comfy/model_management.py
index f1ecfc20..84a260fc 100644
--- a/comfy/model_management.py
+++ b/comfy/model_management.py
@@ -823,6 +823,8 @@ def text_encoder_dtype(device=None):
         return torch.float8_e5m2
     elif args.fp16_text_enc:
         return torch.float16
+    elif args.bf16_text_enc:
+        return torch.bfloat16
     elif args.fp32_text_enc:
         return torch.float32
 

From 2b71aab29903c3d26d71f9ca2a034442a419ab0a Mon Sep 17 00:00:00 2001
From: Laurent Erignoux <lerignoux@gmail.com>
Date: Wed, 2 Apr 2025 01:53:52 +0800
Subject: [PATCH 08/18] User missing (#7439)

* Ensuring a 401 error is returned when user data is not found in multi-user context.

* Returning a 401 error when provided comfy-user does not exists on server side.
---
 app/app_settings.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/app_settings.py b/app/app_settings.py
index a545df92..c7ac73bf 100644
--- a/app/app_settings.py
+++ b/app/app_settings.py
@@ -9,8 +9,14 @@ class AppSettings():
         self.user_manager = user_manager
 
     def get_settings(self, request):
-        file = self.user_manager.get_request_user_filepath(
-            request, "comfy.settings.json")
+        try:
+            file = self.user_manager.get_request_user_filepath(
+                request,
+                "comfy.settings.json"
+            )
+        except KeyError as e:
+            logging.error("User settings not found.")
+            raise web.HTTPUnauthorized() from e
         if os.path.isfile(file):
             try:
                 with open(file) as f:

From ab5413351eee61f3d7f10c74e75286df0058bb18 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Tue, 1 Apr 2025 14:09:31 -0400
Subject: [PATCH 09/18] Fix comment.

This function does not support quads.
---
 comfy_extras/nodes_hunyuan3d.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/comfy_extras/nodes_hunyuan3d.py b/comfy_extras/nodes_hunyuan3d.py
index 1ca7c2fe..5adc6b65 100644
--- a/comfy_extras/nodes_hunyuan3d.py
+++ b/comfy_extras/nodes_hunyuan3d.py
@@ -244,7 +244,7 @@ def save_glb(vertices, faces, filepath, metadata=None):
 
     Parameters:
     vertices: torch.Tensor of shape (N, 3) - The vertex coordinates
-    faces: torch.Tensor of shape (M, 4) or (M, 3) - The face indices (quad or triangle faces)
+    faces: torch.Tensor of shape (M, 3) - The face indices (triangle faces)
     filepath: str - Output filepath (should end with .glb)
     """
 

From 2222cf67fdb2a3b805c622f7e309a6db2bb04d19 Mon Sep 17 00:00:00 2001
From: BiologicalExplosion
 <49753622+BiologicalExplosion@users.noreply.github.com>
Date: Thu, 3 Apr 2025 07:24:04 +0800
Subject: [PATCH 10/18] MLU memory optimization (#7470)

Co-authored-by: huzhan <huzhan@cambricon.com>
---
 comfy/model_management.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/comfy/model_management.py b/comfy/model_management.py
index 84a260fc..19e6c8df 100644
--- a/comfy/model_management.py
+++ b/comfy/model_management.py
@@ -1237,6 +1237,8 @@ def soft_empty_cache(force=False):
         torch.xpu.empty_cache()
     elif is_ascend_npu():
         torch.npu.empty_cache()
+    elif is_mlu():
+        torch.mlu.empty_cache()
     elif torch.cuda.is_available():
         torch.cuda.empty_cache()
         torch.cuda.ipc_collect()

From 3d2e3a6f29670809aa97b41505fa4e93ce11b98d Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Wed, 2 Apr 2025 19:32:34 -0400
Subject: [PATCH 11/18] Fix alpha image issue in more nodes.

---
 comfy_extras/nodes_mask.py            | 7 ++-----
 comfy_extras/nodes_post_processing.py | 3 ++-
 node_helpers.py                       | 8 ++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/comfy_extras/nodes_mask.py b/comfy_extras/nodes_mask.py
index e1f0c822..13d2b4ba 100644
--- a/comfy_extras/nodes_mask.py
+++ b/comfy_extras/nodes_mask.py
@@ -2,6 +2,7 @@ import numpy as np
 import scipy.ndimage
 import torch
 import comfy.utils
+import node_helpers
 
 from nodes import MAX_RESOLUTION
 
@@ -87,11 +88,7 @@ class ImageCompositeMasked:
     CATEGORY = "image"
 
     def composite(self, destination, source, x, y, resize_source, mask = None):
-        if destination.shape[-1] < source.shape[-1]:
-            source = source[...,:destination.shape[-1]]
-        elif destination.shape[-1] > source.shape[-1]:
-            destination = torch.nn.functional.pad(destination, (0, 1))
-            destination[..., -1] = source[..., -1]
+        destination, source = node_helpers.image_alpha_fix(destination, source)
         destination = destination.clone().movedim(-1, 1)
         output = composite(destination, source.movedim(-1, 1), x, y, mask, 1, resize_source).movedim(1, -1)
         return (output,)
diff --git a/comfy_extras/nodes_post_processing.py b/comfy_extras/nodes_post_processing.py
index 68f6ef51..5b954201 100644
--- a/comfy_extras/nodes_post_processing.py
+++ b/comfy_extras/nodes_post_processing.py
@@ -6,7 +6,7 @@ import math
 
 import comfy.utils
 import comfy.model_management
-
+import node_helpers
 
 class Blend:
     def __init__(self):
@@ -34,6 +34,7 @@ class Blend:
     CATEGORY = "image/postprocessing"
 
     def blend_images(self, image1: torch.Tensor, image2: torch.Tensor, blend_factor: float, blend_mode: str):
+        image1, image2 = node_helpers.image_alpha_fix(image1, image2)
         image2 = image2.to(image1.device)
         if image1.shape != image2.shape:
             image2 = image2.permute(0, 3, 1, 2)
diff --git a/node_helpers.py b/node_helpers.py
index 48da3b09..4f805387 100644
--- a/node_helpers.py
+++ b/node_helpers.py
@@ -44,3 +44,11 @@ def string_to_torch_dtype(string):
         return torch.float16
     if string == "bf16":
         return torch.bfloat16
+
+def image_alpha_fix(destination, source):
+    if destination.shape[-1] < source.shape[-1]:
+        source = source[...,:destination.shape[-1]]
+    elif destination.shape[-1] > source.shape[-1]:
+        destination = torch.nn.functional.pad(destination, (0, 1))
+        destination[..., -1] = source[..., -1]
+    return destination, source

From 721253cb0527e0476f12bd20835b4fff5961508e Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Thu, 3 Apr 2025 20:57:59 -0400
Subject: [PATCH 12/18] Fix problem.

---
 node_helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node_helpers.py b/node_helpers.py
index 4f805387..c3e1a14c 100644
--- a/node_helpers.py
+++ b/node_helpers.py
@@ -50,5 +50,5 @@ def image_alpha_fix(destination, source):
         source = source[...,:destination.shape[-1]]
     elif destination.shape[-1] > source.shape[-1]:
         destination = torch.nn.functional.pad(destination, (0, 1))
-        destination[..., -1] = source[..., -1]
+        destination[..., -1] = 1.0
     return destination, source

From 3a100b9a550b9700d08eecb006b5accd65863925 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Fri, 4 Apr 2025 21:24:56 -0400
Subject: [PATCH 13/18] Disable partial offloading of audio VAE.

---
 comfy/sd.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/comfy/sd.py b/comfy/sd.py
index d096f496..4d3aef3e 100644
--- a/comfy/sd.py
+++ b/comfy/sd.py
@@ -265,6 +265,7 @@ class VAE:
         self.process_input = lambda image: image * 2.0 - 1.0
         self.process_output = lambda image: torch.clamp((image + 1.0) / 2.0, min=0.0, max=1.0)
         self.working_dtypes = [torch.bfloat16, torch.float32]
+        self.disable_offload = False
 
         self.downscale_index_formula = None
         self.upscale_index_formula = None
@@ -337,6 +338,7 @@ class VAE:
                 self.process_output = lambda audio: audio
                 self.process_input = lambda audio: audio
                 self.working_dtypes = [torch.float16, torch.bfloat16, torch.float32]
+                self.disable_offload = True
             elif "blocks.2.blocks.3.stack.5.weight" in sd or "decoder.blocks.2.blocks.3.stack.5.weight" in sd or "layers.4.layers.1.attn_block.attn.qkv.weight" in sd or "encoder.layers.4.layers.1.attn_block.attn.qkv.weight" in sd: #genmo mochi vae
                 if "blocks.2.blocks.3.stack.5.weight" in sd:
                     sd = comfy.utils.state_dict_prefix_replace(sd, {"": "decoder."})
@@ -515,7 +517,7 @@ class VAE:
         pixel_samples = None
         try:
             memory_used = self.memory_used_decode(samples_in.shape, self.vae_dtype)
-            model_management.load_models_gpu([self.patcher], memory_required=memory_used)
+            model_management.load_models_gpu([self.patcher], memory_required=memory_used, force_full_load=self.disable_offload)
             free_memory = model_management.get_free_memory(self.device)
             batch_number = int(free_memory / memory_used)
             batch_number = max(1, batch_number)
@@ -544,7 +546,7 @@ class VAE:
     def decode_tiled(self, samples, tile_x=None, tile_y=None, overlap=None, tile_t=None, overlap_t=None):
         self.throw_exception_if_invalid()
         memory_used = self.memory_used_decode(samples.shape, self.vae_dtype) #TODO: calculate mem required for tile
-        model_management.load_models_gpu([self.patcher], memory_required=memory_used)
+        model_management.load_models_gpu([self.patcher], memory_required=memory_used, force_full_load=self.disable_offload)
         dims = samples.ndim - 2
         args = {}
         if tile_x is not None:
@@ -578,7 +580,7 @@ class VAE:
             pixel_samples = pixel_samples.movedim(1, 0).unsqueeze(0)
         try:
             memory_used = self.memory_used_encode(pixel_samples.shape, self.vae_dtype)
-            model_management.load_models_gpu([self.patcher], memory_required=memory_used)
+            model_management.load_models_gpu([self.patcher], memory_required=memory_used, force_full_load=self.disable_offload)
             free_memory = model_management.get_free_memory(self.device)
             batch_number = int(free_memory / max(1, memory_used))
             batch_number = max(1, batch_number)
@@ -612,7 +614,7 @@ class VAE:
             pixel_samples = pixel_samples.movedim(1, 0).unsqueeze(0)
 
         memory_used = self.memory_used_encode(pixel_samples.shape, self.vae_dtype)  # TODO: calculate mem required for tile
-        model_management.load_models_gpu([self.patcher], memory_required=memory_used)
+        model_management.load_models_gpu([self.patcher], memory_required=memory_used, force_full_load=self.disable_offload)
 
         args = {}
         if tile_x is not None:

From 89e4ea01754fc043913ac164f5b7880ec58ebab9 Mon Sep 17 00:00:00 2001
From: Raphael Walker <slickytail.mc@gmail.com>
Date: Sat, 5 Apr 2025 03:27:54 +0200
Subject: [PATCH 14/18] Add activations_shape info in UNet models (#7482)

* Add activations_shape info in UNet models

* activations_shape should be a list
---
 comfy/ldm/modules/attention.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/comfy/ldm/modules/attention.py b/comfy/ldm/modules/attention.py
index ede50646..45f9e311 100644
--- a/comfy/ldm/modules/attention.py
+++ b/comfy/ldm/modules/attention.py
@@ -847,6 +847,7 @@ class SpatialTransformer(nn.Module):
         if not isinstance(context, list):
             context = [context] * len(self.transformer_blocks)
         b, c, h, w = x.shape
+        transformer_options["activations_shape"] = list(x.shape)
         x_in = x
         x = self.norm(x)
         if not self.use_linear:
@@ -962,6 +963,7 @@ class SpatialVideoTransformer(SpatialTransformer):
         transformer_options={}
     ) -> torch.Tensor:
         _, _, h, w = x.shape
+        transformer_options["activations_shape"] = list(x.shape)
         x_in = x
         spatial_context = None
         if exists(context):

From 3bfe4e527665d71a3cc88fe06e2733209602ae3a Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sat, 5 Apr 2025 06:14:10 -0400
Subject: [PATCH 15/18] Support 512 siglip model.

---
 comfy/clip_vision.py              |  8 ++++++--
 comfy/clip_vision_siglip_512.json | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 comfy/clip_vision_siglip_512.json

diff --git a/comfy/clip_vision.py b/comfy/clip_vision.py
index 87d32a66..11bc5778 100644
--- a/comfy/clip_vision.py
+++ b/comfy/clip_vision.py
@@ -110,9 +110,13 @@ def load_clipvision_from_sd(sd, prefix="", convert_keys=False):
     elif "vision_model.encoder.layers.30.layer_norm1.weight" in sd:
         json_config = os.path.join(os.path.dirname(os.path.realpath(__file__)), "clip_vision_config_h.json")
     elif "vision_model.encoder.layers.22.layer_norm1.weight" in sd:
+        embed_shape = sd["vision_model.embeddings.position_embedding.weight"].shape[0]
         if sd["vision_model.encoder.layers.0.layer_norm1.weight"].shape[0] == 1152:
-            json_config = os.path.join(os.path.dirname(os.path.realpath(__file__)), "clip_vision_siglip_384.json")
-        elif sd["vision_model.embeddings.position_embedding.weight"].shape[0] == 577:
+            if embed_shape == 729:
+                json_config = os.path.join(os.path.dirname(os.path.realpath(__file__)), "clip_vision_siglip_384.json")
+            elif embed_shape == 1024:
+                json_config = os.path.join(os.path.dirname(os.path.realpath(__file__)), "clip_vision_siglip_512.json")
+        elif embed_shape == 577:
             if "multi_modal_projector.linear_1.bias" in sd:
                 json_config = os.path.join(os.path.dirname(os.path.realpath(__file__)), "clip_vision_config_vitl_336_llava.json")
             else:
diff --git a/comfy/clip_vision_siglip_512.json b/comfy/clip_vision_siglip_512.json
new file mode 100644
index 00000000..7fb93ce1
--- /dev/null
+++ b/comfy/clip_vision_siglip_512.json
@@ -0,0 +1,13 @@
+{
+  "num_channels": 3,
+  "hidden_act": "gelu_pytorch_tanh",
+  "hidden_size": 1152,
+  "image_size": 512,
+  "intermediate_size": 4304,
+  "model_type": "siglip_vision_model",
+  "num_attention_heads": 16,
+  "num_hidden_layers": 27,
+  "patch_size": 16,
+  "image_mean": [0.5, 0.5, 0.5],
+  "image_std": [0.5, 0.5, 0.5]
+}

From 49b732afd54e1871d59fd0bca9e7a3a97e3532ea Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Sun, 6 Apr 2025 22:43:56 -0400
Subject: [PATCH 16/18] Show a proper error to the user when a vision model
 file is invalid.

---
 nodes.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nodes.py b/nodes.py
index 272c2a25..218f9325 100644
--- a/nodes.py
+++ b/nodes.py
@@ -1006,6 +1006,8 @@ class CLIPVisionLoader:
     def load_clip(self, clip_name):
         clip_path = folder_paths.get_full_path_or_raise("clip_vision", clip_name)
         clip_vision = comfy.clip_vision.load(clip_path)
+        if clip_vision is None:
+            raise RuntimeError("ERROR: clip vision file is invalid and does not contain a valid vision model.")
         return (clip_vision,)
 
 class CLIPVisionEncode:

From 70d7242e57e853c489b608e88d7874e546474604 Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Mon, 7 Apr 2025 05:01:47 -0400
Subject: [PATCH 17/18] Support the wan fun reward loras.

---
 comfy/lora_convert.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/comfy/lora_convert.py b/comfy/lora_convert.py
index 05032c69..3e00b63d 100644
--- a/comfy/lora_convert.py
+++ b/comfy/lora_convert.py
@@ -1,4 +1,5 @@
 import torch
+import comfy.utils
 
 
 def convert_lora_bfl_control(sd): #BFL loras for Flux
@@ -11,7 +12,13 @@ def convert_lora_bfl_control(sd): #BFL loras for Flux
     return sd_out
 
 
+def convert_lora_wan_fun(sd): #Wan Fun loras
+    return comfy.utils.state_dict_prefix_replace(sd, {"lora_unet__": "lora_unet_"})
+
+
 def convert_lora(sd):
     if "img_in.lora_A.weight" in sd and "single_blocks.0.norm.key_norm.scale" in sd:
         return convert_lora_bfl_control(sd)
+    if "lora_unet__blocks_0_cross_attn_k.lora_down.weight" in sd:
+        return convert_lora_wan_fun(sd)
     return sd

From 2f7d8159c32de22c15fbeea7ff9063f2231586bb Mon Sep 17 00:00:00 2001
From: comfyanonymous <comfyanonymous@protonmail.com>
Date: Tue, 8 Apr 2025 08:11:59 -0400
Subject: [PATCH 18/18] Show the user an error when the controlnet file is
 invalid.

---
 nodes.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nodes.py b/nodes.py
index 218f9325..55d832df 100644
--- a/nodes.py
+++ b/nodes.py
@@ -786,6 +786,8 @@ class ControlNetLoader:
     def load_controlnet(self, control_net_name):
         controlnet_path = folder_paths.get_full_path_or_raise("controlnet", control_net_name)
         controlnet = comfy.controlnet.load_controlnet(controlnet_path)
+        if controlnet is None:
+            raise RuntimeError("ERROR: controlnet file is invalid and does not contain a valid controlnet model.")
         return (controlnet,)
 
 class DiffControlNetLoader: