Update app.py

app.py

@@ -154,19 +154,15 @@ def run_lora(prompt, negative, lora_scale, selected_state, sdxl_loras, progress=
     full_path_lora = state_dicts[repo_name]["saved_name"]
     loaded_state_dict = state_dicts[repo_name]["state_dict"]
     cross_attention_kwargs = None
-    
-    print("Last LoRA:", last_lora, "Was it last merged? ", last_merged, "Was it last fused?", last_fused)
-    print("Current LoRA: ", repo_name)
-    
     if last_lora != repo_name:
-        #if last_merged:
-        del pipe
-        gc.collect()
-        pipe = copy.deepcopy(original_pipe)
-        pipe.to(device)
-        #elif(last_fused):
-            #pipe.unfuse_lora()
-            #pipe.unload_lora_weights()
+        if last_merged:
+            del pipe
+            gc.collect()
+            pipe = copy.deepcopy(original_pipe)
+            pipe.to(device)
+        elif(last_fused):
+            pipe.unfuse_lora()
+            pipe.unload_lora_weights()
         is_compatible = sdxl_loras[selected_state.index]["is_compatible"]
         
         if is_compatible:
@@ -187,6 +183,7 @@ def run_lora(prompt, negative, lora_scale, selected_state, sdxl_loras, progress=
                 embedding_path = hf_hub_download(repo_id=repo_name, filename=text_embedding_name, repo_type="model")
                 embhandler = TokenEmbeddingsHandler(text_encoders, tokenizers)
                 embhandler.load_embeddings(embedding_path)
+                
             else:
                 merge_incompatible_lora(full_path_lora, lora_scale)
                 last_fused=False
@@ -198,7 +195,6 @@ def run_lora(prompt, negative, lora_scale, selected_state, sdxl_loras, progress=
         width=1024,
         height=1024,
         num_inference_steps=20,
-        cross_attention_kwargs = {"scale" : lora_scale},
         guidance_scale=7.5,
     ).images[0]
     last_lora = repo_name