Update app.py

app.py

@@ -15,7 +15,7 @@ import time
 
 # Load LoRAs from JSON file
 with open('loras.json', 'r') as f:
-    initial_loras = json.load(f)
+    loras = json.load(f)
 
 # Initialize the base model
 dtype = torch.bfloat16
@@ -55,7 +55,7 @@ class calculateDuration:
         else:
             print(f"Elapsed time: {self.elapsed_time:.6f} seconds")
 
-def update_selection(evt: gr.SelectData, width, height, loras):
+def update_selection(evt: gr.SelectData, width, height):
     selected_lora = loras[evt.index]
     new_placeholder = f"Type a prompt for {selected_lora['title']}"
     lora_repo = selected_lora["repo"]
@@ -116,7 +116,7 @@ def generate_image_to_image(prompt_mash, image_input_path, image_strength, steps
     ).images[0]
     return final_image 
 
-def run_lora(prompt, image_input, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale, loras, progress=gr.Progress(track_tqdm=True)):
+def run_lora(prompt, image_input, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale, progress=gr.Progress(track_tqdm=True)):
     if selected_index is None:
         raise gr.Error("You must select a LoRA before proceeding.")
     selected_lora = loras[selected_index]
@@ -174,30 +174,30 @@ def run_lora(prompt, image_input, image_strength, cfg_scale, steps, selected_ind
         yield final_image, seed, gr.update(value=progress_bar, visible=False)
         
 def get_huggingface_safetensors(link):
-    split_link = link.split("/")
-    if(len(split_link) == 2):
-        model_card = ModelCard.load(link)
-        base_model = model_card.data.get("base_model")
-        print(base_model)
-        if((base_model != "black-forest-labs/FLUX.1-dev") and (base_model != "black-forest-labs/FLUX.1-schnell")):
-            raise Exception("Not a FLUX LoRA!")
-        image_path = model_card.data.get("widget", [{}])[0].get("output", {}).get("url", None)
-        trigger_word = model_card.data.get("instance_prompt", "")
-        image_url = f"https://huggingface.co/{link}/resolve/main/{image_path}" if image_path else None
-        fs = HfFileSystem()
-        try:
-            list_of_files = fs.ls(link, detail=False)
-            for file in list_of_files:
-                if(file.endswith(".safetensors")):
-                    safetensors_name = file.split("/")[-1]
-                if (not image_url and file.lower().endswith((".jpg", ".jpeg", ".png", ".webp"))):
-                    image_elements = file.split("/")
-                    image_url = f"https://huggingface.co/{link}/resolve/main/{image_elements[-1]}"
-        except Exception as e:
-            print(e)
-            gr.Warning(f"You didn't include a link neither a valid Hugging Face repository with a *.safetensors LoRA")
-            raise Exception(f"You didn't include a link neither a valid Hugging Face repository with a *.safetensors LoRA")
-        return split_link[1], link, safetensors_name, trigger_word, image_url
+  split_link = link.split("/")
+  if(len(split_link) == 2):
+            model_card = ModelCard.load(link)
+            base_model = model_card.data.get("base_model")
+            print(base_model)
+            if((base_model != "black-forest-labs/FLUX.1-dev") and (base_model != "black-forest-labs/FLUX.1-schnell")):
+                raise Exception("Not a FLUX LoRA!")
+            image_path = model_card.data.get("widget", [{}])[0].get("output", {}).get("url", None)
+            trigger_word = model_card.data.get("instance_prompt", "")
+            image_url = f"https://huggingface.co/{link}/resolve/main/{image_path}" if image_path else None
+            fs = HfFileSystem()
+            try:
+                list_of_files = fs.ls(link, detail=False)
+                for file in list_of_files:
+                    if(file.endswith(".safetensors")):
+                        safetensors_name = file.split("/")[-1]
+                    if (not image_url and file.lower().endswith((".jpg", ".jpeg", ".png", ".webp"))):
+                      image_elements = file.split("/")
+                      image_url = f"https://huggingface.co/{link}/resolve/main/{image_elements[-1]}"
+            except Exception as e:
+              print(e)
+              gr.Warning(f"You didn't include a link neither a valid Hugging Face repository with a *.safetensors LoRA")
+              raise Exception(f"You didn't include a link neither a valid Hugging Face repository with a *.safetensors LoRA")
+            return split_link[1], link, safetensors_name, trigger_word, image_url
 
 def check_custom_model(link):
     if(link.startswith("https://")):
@@ -207,7 +207,8 @@ def check_custom_model(link):
     else: 
         return get_huggingface_safetensors(link)
 
-def add_custom_lora(custom_lora, loras):
+def add_custom_lora(custom_lora):
+    global loras
     if(custom_lora):
         try:
             title, repo, path, trigger_word, image = check_custom_model(custom_lora)
@@ -225,7 +226,7 @@ def add_custom_lora(custom_lora, loras):
             </div>
             '''
             existing_item_index = next((index for (index, item) in enumerate(loras) if item['repo'] == repo), None)
-            if existing_item_index is None:
+            if(not existing_item_index):
                 new_item = {
                     "image": image,
                     "title": title,
@@ -235,17 +236,17 @@ def add_custom_lora(custom_lora, loras):
                 }
                 print(new_item)
                 existing_item_index = len(loras)
-                loras = loras + [new_item]
+                loras.append(new_item)
         
-            return gr.update(visible=True, value=card), gr.update(visible=True), gr.Gallery(value=[(item["image"], item["title"]) for item in loras]), f"Custom: {path}", existing_item_index, trigger_word, loras
+            return gr.update(visible=True, value=card), gr.update(visible=True), gr.Gallery(selected_index=None), f"Custom: {path}", existing_item_index, trigger_word
         except Exception as e:
             gr.Warning(f"Invalid LoRA: either you entered an invalid link, or a non-FLUX LoRA")
-            return gr.update(visible=True, value=f"Invalid LoRA: either you entered an invalid link, a non-FLUX LoRA"), gr.update(visible=False), gr.update(), "", None, "", loras
+            return gr.update(visible=True, value=f"Invalid LoRA: either you entered an invalid link, a non-FLUX LoRA"), gr.update(visible=True), gr.update(), "", None, ""
     else:
-        return gr.update(visible=False), gr.update(visible=False), gr.update(), "", None, "", loras
+        return gr.update(visible=False), gr.update(visible=False), gr.update(), "", None, ""
 
-def remove_custom_lora(loras):
-    return gr.update(visible=False), gr.update(visible=False), gr.Gallery(value=[(item["image"], item["title"]) for item in initial_loras]), "", None, "", initial_loras
+def remove_custom_lora():
+    return gr.update(visible=False), gr.update(visible=False), gr.update(), "", None, ""
 
 run_lora.zerogpu = True
 
@@ -265,16 +266,12 @@ css = '''
 .progress-container {width: 100%;height: 30px;background-color: #f0f0f0;border-radius: 15px;overflow: hidden;margin-bottom: 20px}
 .progress-bar {height: 100%;background-color: #4f46e5;width: calc(var(--current) / var(--total) * 100%);transition: width 0.5s ease-in-out}
 '''
-
 with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
-    loras = gr.State(initial_loras)
-    selected_index = gr.State(None)
-    
     title = gr.HTML(
         """<h1><img src="https://huggingface.co/spaces/multimodalart/flux-lora-the-explorer/resolve/main/flux_lora.png" alt="LoRA"> FLUX LoRA the Explorer</h1>""",
         elem_id="title",
     )
-    
+    selected_index = gr.State(None)
     with gr.Row():
         with gr.Column(scale=3):
             prompt = gr.Textbox(label="Prompt", lines=1, placeholder="Type a prompt after selecting a LoRA")
@@ -284,7 +281,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
         with gr.Column():
             selected_info = gr.Markdown("")
             gallery = gr.Gallery(
-                [(item["image"], item["title"]) for item in initial_loras],
+                [(item["image"], item["title"]) for item in loras],
                 label="LoRA Gallery",
                 allow_preview=False,
                 columns=3,
@@ -320,23 +317,22 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
 
     gallery.select(
         update_selection,
-        inputs=[width, height, loras],
+        inputs=[width, height],
         outputs=[prompt, selected_info, selected_index, width, height]
     )
     custom_lora.input(
         add_custom_lora,
-        inputs=[custom_lora, loras],
-        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info, selected_index, prompt, loras]
+        inputs=[custom_lora],
+        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info, selected_index, prompt]
     )
     custom_lora_button.click(
         remove_custom_lora,
-        inputs=[loras],
-        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info, selected_index, custom_lora, loras]
+        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info, selected_index, custom_lora]
     )
     gr.on(
         triggers=[generate_button.click, prompt.submit],
         fn=run_lora,
-        inputs=[prompt, input_image, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale, loras],
+        inputs=[prompt, input_image, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale],
         outputs=[result, seed, progress_bar]
     )