Merge pull request #331 from Haidra-Org/main

fix: don't abandon job on bad lora file
Haidra-Org · Sep 17, 2024 · e33736f · e33736f
2 parents f2ce9f3 + ba9456e
commit e33736f
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/hordelib/nodes/node_lora_loader.py b/hordelib/nodes/node_lora_loader.py
@@ -59,7 +59,6 @@ def load_lora(self, model, clip, lora_name, strength_model, strength_clip):
             return (model, clip)
 
         lora_path = folder_paths.get_full_path("loras", lora_name)
-
         lora = None
         if self.loaded_lora is not None:
             if self.loaded_lora[0] == lora_path:
@@ -69,13 +68,18 @@ def load_lora(self, model, clip, lora_name, strength_model, strength_clip):
                 self.loaded_lora = None
                 del temp
 
-        if lora is None:
-            lora = comfy.utils.load_torch_file(lora_path, safe_load=True)
-            self.loaded_lora = (lora_path, lora)
-
-        model_lora, clip_lora = comfy.sd.load_lora_for_models(model, clip, lora, strength_model, strength_clip)
-        log_free_ram()
-        return (model_lora, clip_lora)
+        try:
+            with logger.catch(reraise=True):
+                if lora is None:
+                    lora = comfy.utils.load_torch_file(lora_path, safe_load=True)
+                    self.loaded_lora = (lora_path, lora)
+
+                model_lora, clip_lora = comfy.sd.load_lora_for_models(model, clip, lora, strength_model, strength_clip)
+                log_free_ram()
+                return (model_lora, clip_lora)
+        except Exception as e:
+            logger.error(f"Error loading lora {lora_name}: {e}")
+            return (model, clip)
 
 
 NODE_CLASS_MAPPINGS = {"HordeLoraLoader": HordeLoraLoader}