Upload 2 files

app.py

@@ -55,6 +55,16 @@ last_cn_on = False
 
 MAX_SEED = 2**32-1
 
+def unload_lora():
+    global pipe, pipe_i2i
+    try:
+        #pipe.unfuse_lora()
+        pipe.unload_lora_weights()
+        #pipe_i2i.unfuse_lora()
+        pipe_i2i.unload_lora_weights()
+    except Exception as e:
+        print(e)
+
 # https://huggingface.co/InstantX/FLUX.1-dev-Controlnet-Union
 # https://huggingface.co/spaces/jiuface/FLUX.1-dev-Controlnet-Union
 # https://huggingface.co/docs/diffusers/main/en/api/pipelines/flux
@@ -63,6 +73,7 @@ def change_base_model(repo_id: str, cn_on: bool, disable_model_cache: bool, prog
     global pipe, pipe_i2i, taef1, good_vae, controlnet_union, controlnet, last_model, last_cn_on, dtype
     try:
         if not disable_model_cache and (repo_id == last_model and cn_on is last_cn_on) or not is_repo_name(repo_id) or not is_repo_exists(repo_id): return gr.update(visible=True)
+        unload_lora()
         pipe.to("cpu")
         pipe_i2i.to("cpu")
         good_vae.to("cpu")
@@ -463,13 +474,7 @@ def run_lora(prompt, image_input, image_strength, cfg_scale, steps, selected_ind
 
     # Unload previous LoRA weights
     with calculateDuration("Unloading LoRA"):
-        try:
-            #pipe.unfuse_lora()
-            pipe.unload_lora_weights()
-            #pipe_i2i.unfuse_lora()
-            pipe_i2i.unload_lora_weights()
-        except Exception as e:
-            print(e)
+        unload_lora()
 
     print(pipe.get_active_adapters()) #
     print(pipe_i2i.get_active_adapters()) #
@@ -482,8 +487,8 @@ def run_lora(prompt, image_input, image_strength, cfg_scale, steps, selected_ind
     lora_weights = []
     if is_valid_lora(lora_json): # Load External LoRA weights
         with calculateDuration("Loading External LoRA weights"):
-            if image_input is not None: lora_names, lora_weights = fuse_loras(pipe_i2i, lora_json)
-            else: lora_names, lora_weights = fuse_loras(pipe, lora_json)
+            if image_input is not None: pipe_i2i, lora_names, lora_weights = fuse_loras(pipe_i2i, lora_json)
+            else: pipe, lora_names, lora_weights = fuse_loras(pipe, lora_json)
             trigger_word = get_trigger_word(lora_json)
             prompt_mash = f"{prompt_mash} {trigger_word}"
     print("Prompt Mash: ", prompt_mash) #

mod.py

@@ -269,7 +269,7 @@ def get_model_trigger(model_name: str):
 # https://github.com/huggingface/diffusers/issues/4919
 def fuse_loras(pipe, lorajson: list[dict]):
     try:
-        if not lorajson or not isinstance(lorajson, list): return [], []
+        if not lorajson or not isinstance(lorajson, list): return pipe, [], []
         a_list = []
         w_list = []
         for d in lorajson:
@@ -287,11 +287,11 @@ def fuse_loras(pipe, lorajson: list[dict]):
                 pipe.load_lora_weights(k, weight_name = w_name, adapter_name = a_name, low_cpu_mem_usage=True)
             a_list.append(a_name)
             w_list.append(d["scale"])
-        if not a_list: return [], []
+        if not a_list: return pipe, [], []
         #pipe.set_adapters(a_list, adapter_weights=w_list)
         #pipe.fuse_lora(adapter_names=a_list, lora_scale=1.0)
         #pipe.unload_lora_weights()
-        return a_list, w_list
+        return pipe, a_list, w_list
     except Exception as e:
         print(f"External LoRA Error: {e}")
         raise Exception(f"External LoRA Error: {e}") from e