From d7b65c9f5584f566f67502db6f2b8cff74c66333 Mon Sep 17 00:00:00 2001 From: doctorpangloss <@hiddenswitch.com> Date: Sun, 25 Aug 2024 15:24:39 -0700 Subject: [PATCH] Add flux controlnet to known controlnets --- comfy/controlnet.py | 3 ++- comfy/model_downloader.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/comfy/controlnet.py b/comfy/controlnet.py index 53f119589..7fb3398f3 100644 --- a/comfy/controlnet.py +++ b/comfy/controlnet.py @@ -180,7 +180,8 @@ class ControlNet(ControlBase): self.load_device = load_device if control_model is not None: self.control_model_wrapped = model_patcher.ModelPatcher(self.control_model, load_device=load_device, offload_device=model_management.unet_offload_device()) - self.control_model_wrapped.ckpt_name = os.path.basename(ckpt_name) + if ckpt_name is not None: + self.control_model_wrapped.ckpt_name = os.path.basename(ckpt_name) self.compression_ratio = compression_ratio self.global_average_pooling = global_average_pooling self.model_sampling_current = None diff --git a/comfy/model_downloader.py b/comfy/model_downloader.py index 252bb71dd..af30c6442 100644 --- a/comfy/model_downloader.py +++ b/comfy/model_downloader.py @@ -384,6 +384,7 @@ KNOWN_CONTROLNETS: Final[KnownDownloadables] = KnownDownloadables([ HuggingFile("TheMistoAI/MistoLine", "mistoLine_rank256.safetensors"), HuggingFile("xinsir/controlnet-union-sdxl-1.0", "diffusion_pytorch_model_promax.safetensors", save_with_filename="xinsir-controlnet-union-sdxl-1.0-promax.safetensors"), HuggingFile("xinsir/controlnet-union-sdxl-1.0", "diffusion_pytorch_model.safetensors", save_with_filename="xinsir-controlnet-union-sdxl-1.0.safetensors"), + HuggingFile("InstantX/FLUX.1-dev-Controlnet-Canny", "diffusion_pytorch_model.safetensors", save_with_filename="instantx-flux.1-dev-controlnet-canny.safetensors"), ], folder_name="controlnet") KNOWN_DIFF_CONTROLNETS: Final[KnownDownloadables] = KnownDownloadables([