Update app.py

app.py

@@ -70,6 +70,8 @@ def update_selection(evt: gr.SelectData, selected_indices, width, height):
     # Initialize outputs
     selected_info_1 = ""
     selected_info_2 = ""
+    lora_scale_1 = 0.95
+    lora_scale_2 = 0.95
     if len(selected_indices) >= 1:
         lora1 = loras[selected_indices[0]]
         selected_info_1 = f"### LoRA 1 Selected: [{lora1['title']}](https://huggingface.co/{lora1['repo']}) ✨"
@@ -89,6 +91,8 @@ def update_selection(evt: gr.SelectData, selected_indices, width, height):
         selected_info_1,
         selected_info_2,
         selected_indices,
+        lora_scale_1,
+        lora_scale_2,
         width,
         height,
     )
@@ -100,13 +104,15 @@ def remove_lora_1(selected_indices):
     # Update selected_info_1 and selected_info_2
     selected_info_1 = ""
     selected_info_2 = ""
+    lora_scale_1 = 0.95
+    lora_scale_2 = 0.95
     if len(selected_indices) >= 1:
         lora1 = loras[selected_indices[0]]
         selected_info_1 = f"### LoRA 1 Selected: [{lora1['title']}](https://huggingface.co/{lora1['repo']}) ✨"
     if len(selected_indices) >= 2:
         lora2 = loras[selected_indices[1]]
         selected_info_2 = f"### LoRA 2 Selected: [{lora2['title']}](https://huggingface.co/{lora2['repo']}) ✨"
-    return selected_info_1, selected_info_2, selected_indices
+    return selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2
 
 def remove_lora_2(selected_indices):
     selected_indices = selected_indices or []
@@ -115,13 +121,25 @@ def remove_lora_2(selected_indices):
     # Update selected_info_1 and selected_info_2
     selected_info_1 = ""
     selected_info_2 = ""
+    lora_scale_1 = 0.95
+    lora_scale_2 = 0.95
     if len(selected_indices) >= 1:
         lora1 = loras[selected_indices[0]]
         selected_info_1 = f"### LoRA 1 Selected: [{lora1['title']}](https://huggingface.co/{lora1['repo']}) ✨"
     if len(selected_indices) >= 2:
         lora2 = loras[selected_indices[1]]
         selected_info_2 = f"### LoRA 2 Selected: [{lora2['title']}](https://huggingface.co/{lora2['repo']}) ✨"
-    return selected_info_1, selected_info_2, selected_indices
+    return selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2
+
+def randomize_loras(selected_indices):
+    if len(loras) < 2:
+        raise gr.Error("Not enough LoRAs to randomize.")
+    selected_indices = random.sample(range(len(loras)), 2)
+    selected_info_1 = f"### LoRA 1 Selected: [{loras[selected_indices[0]]['title']}](https://huggingface.co/{loras[selected_indices[0]]['repo']}) ✨"
+    selected_info_2 = f"### LoRA 2 Selected: [{loras[selected_indices[1]]['title']}](https://huggingface.co/{loras[selected_indices[1]]['repo']}) ✨"
+    lora_scale_1 = 0.95
+    lora_scale_2 = 0.95
+    return selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2
 
 @spaces.GPU(duration=70)
 def generate_image(prompt_mash, steps, seed, cfg_scale, width, height, progress):
@@ -220,42 +238,44 @@ 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 not in ["black-forest-labs/FLUX.1-dev", "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()
+        safetensors_name = None
+        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)
+            raise Exception("Invalid Hugging Face repository with a *.safetensors LoRA")
+        if not safetensors_name:
+            raise Exception("No *.safetensors file found in the repository")
+        return split_link[1], link, safetensors_name, trigger_word, image_url
 
 def check_custom_model(link):
-    if(link.startswith("https://")):
-        if(link.startswith("https://huggingface.co") or link.startswith("https://www.huggingface.co")):
+    if link.startswith("https://"):
+        if link.startswith("https://huggingface.co") or link.startswith("https://www.huggingface.co"):
             link_split = link.split("huggingface.co/")
             return get_huggingface_safetensors(link_split[1])
     else: 
         return get_huggingface_safetensors(link)
 
-def add_custom_lora(custom_lora):
+def add_custom_lora(custom_lora, selected_indices):
     global loras
-    if(custom_lora):
+    if custom_lora:
         try:
             title, repo, path, trigger_word, image = check_custom_model(custom_lora)
             print(f"Loaded custom LoRA: {repo}")
@@ -272,7 +292,7 @@ def add_custom_lora(custom_lora):
             </div>
             '''
             existing_item_index = next((index for (index, item) in enumerate(loras) if item['repo'] == repo), None)
-            if(not existing_item_index):
+            if existing_item_index is None:
                 new_item = {
                     "image": image,
                     "title": title,
@@ -283,16 +303,46 @@ def add_custom_lora(custom_lora):
                 print(new_item)
                 existing_item_index = len(loras)
                 loras.append(new_item)
-        
-            return gr.update(visible=True, value=card), gr.update(visible=True), gr.Gallery(selected_index=None), f"Custom: {path}", existing_item_index, trigger_word
+
+            # Update gallery
+            gallery_items = [(item["image"], item["title"]) for item in loras]
+            # Update selected_indices if there's room
+            if len(selected_indices) < 2:
+                selected_indices.append(existing_item_index)
+                selected_info_1 = ""
+                selected_info_2 = ""
+                lora_scale_1 = 0.95
+                lora_scale_2 = 0.95
+                if len(selected_indices) >= 1:
+                    lora1 = loras[selected_indices[0]]
+                    selected_info_1 = f"### LoRA 1 Selected: [{lora1['title']}](https://huggingface.co/{lora1['repo']}) ✨"
+                if len(selected_indices) >= 2:
+                    lora2 = loras[selected_indices[1]]
+                    selected_info_2 = f"### LoRA 2 Selected: [{lora2['title']}](https://huggingface.co/{lora2['repo']}) ✨"
+                return (gr.update(visible=True, value=card), gr.update(visible=True), gr.update(value=gallery_items),
+                        selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2)
+            else:
+                return (gr.update(visible=True, value=card), gr.update(visible=True), gr.update(value=gallery_items),
+                        gr.NoChange(), gr.NoChange(), selected_indices, gr.NoChange(), gr.NoChange())
         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=True), gr.update(), "", None, ""
+            print(e)
+            return gr.update(visible=True, value=str(e)), gr.update(visible=True), gr.NoChange(), gr.NoChange(), gr.NoChange(), selected_indices, gr.NoChange(), gr.NoChange()
     else:
-        return gr.update(visible=False), gr.update(visible=False), gr.update(), "", None, ""
+        return gr.update(visible=False), gr.update(visible=False), gr.NoChange(), gr.NoChange(), gr.NoChange(), selected_indices, gr.NoChange(), gr.NoChange()
 
-def remove_custom_lora():
-    return gr.update(visible=False), gr.update(visible=False), gr.update(), "", None, ""
+def remove_custom_lora(custom_lora_info, custom_lora_button, selected_indices):
+    global loras
+    if loras:
+        custom_lora_repo = loras[-1]['repo']
+        # Remove from loras list
+        loras = loras[:-1]
+        # Remove from selected_indices if selected
+        custom_lora_index = len(loras)
+        if custom_lora_index in selected_indices:
+            selected_indices.remove(custom_lora_index)
+    # Update gallery
+    gallery_items = [(item["image"], item["title"]) for item in loras]
+    return gr.update(visible=False), gr.update(visible=False), gr.update(value=gallery_items), gr.NoChange(), gr.NoChange(), selected_indices, gr.NoChange(), gr.NoChange()
 
 run_lora.zerogpu = True
 
@@ -303,6 +353,7 @@ css = '''
 #title img{width: 100px; margin-right: 0.5em}
 #gallery .grid-wrap{height: 10vh}
 #lora_list{background: var(--block-background-fill);padding: 0 1em .3em; font-size: 90%}
+.custom_lora_card{margin-bottom: 1em}
 .card_internal{display: flex;height: 100px;margin-top: .5em}
 .card_internal img{margin-right: 1em}
 .styler{--form-gap-width: 0px !important}
@@ -311,6 +362,7 @@ 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:
     title = gr.HTML(
         """<h1><img src="https://huggingface.co/spaces/multimodalart/flux-lora-the-explorer/resolve/main/flux_lora.png" alt="LoRA"> LoRA Lab</h1>""",
@@ -322,6 +374,14 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
             prompt = gr.Textbox(label="Prompt", lines=1, placeholder="Type a prompt after selecting a LoRA")
         with gr.Column(scale=1, elem_id="gen_column"):
             generate_button = gr.Button("Generate", variant="primary", elem_id="gen_btn")
+            randomize_button = gr.Button("🎲", variant="secondary")
+    with gr.Row():
+        selected_info_1 = gr.Markdown("")
+        lora_scale_1 = gr.Slider(label="LoRA 1 Scale", minimum=0, maximum=3, step=0.01, value=0.95)
+        remove_button_1 = gr.Button("Remove LoRA 1")
+        selected_info_2 = gr.Markdown("")
+        lora_scale_2 = gr.Slider(label="LoRA 2 Scale", minimum=0, maximum=3, step=0.01, value=0.95)
+        remove_button_2 = gr.Button("Remove LoRA 2")
     with gr.Row():
         with gr.Column():
             gallery = gr.Gallery(
@@ -339,15 +399,6 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
         with gr.Column():
             progress_bar = gr.Markdown(elem_id="progress",visible=False)
             result = gr.Image(label="Generated Image")
-    with gr.Row():
-        with gr.Column():
-            selected_info_1 = gr.Markdown("")
-            lora_scale_1 = gr.Slider(label="LoRA 1 Scale", minimum=0, maximum=3, step=0.01, value=0.95)
-            remove_button_1 = gr.Button("Remove LoRA 1")
-        with gr.Column():
-            selected_info_2 = gr.Markdown("")
-            lora_scale_2 = gr.Slider(label="LoRA 2 Scale", minimum=0, maximum=3, step=0.01, value=0.95)
-            remove_button_2 = gr.Button("Remove LoRA 2")
     with gr.Row():
         with gr.Accordion("Advanced Settings", open=False):
             with gr.Row():
@@ -369,26 +420,32 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
     gallery.select(
         update_selection,
         inputs=[selected_indices, width, height],
-        outputs=[prompt, selected_info_1, selected_info_2, selected_indices, width, height]
+        outputs=[prompt, selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2, width, height]
     )
     remove_button_1.click(
         remove_lora_1,
         inputs=[selected_indices],
-        outputs=[selected_info_1, selected_info_2, selected_indices]
+        outputs=[selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2]
     )
     remove_button_2.click(
         remove_lora_2,
         inputs=[selected_indices],
-        outputs=[selected_info_1, selected_info_2, selected_indices]
+        outputs=[selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2]
+    )
+    randomize_button.click(
+        randomize_loras,
+        inputs=[selected_indices],
+        outputs=[selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2]
     )
-    custom_lora.input(
+    custom_lora.submit(
         add_custom_lora,
-        inputs=[custom_lora],
-        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info_1, selected_indices, prompt]
+        inputs=[custom_lora, selected_indices],
+        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2]
     )
     custom_lora_button.click(
         remove_custom_lora,
-        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info_1, selected_indices, custom_lora]
+        inputs=[custom_lora_info, custom_lora_button, selected_indices],
+        outputs=[custom_lora_info, custom_lora_button, gallery, selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2]
     )
     gr.on(
         triggers=[generate_button.click, prompt.submit],
@@ -398,4 +455,4 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 3600)) as app:
     )
 
 app.queue()
-app.launch()
+app.launch()