ahora se permiten versiones de loras

app.py

@@ -1,5 +1,6 @@
+import os
 
-MOCK = False
+MOCK = not os.environ.get("HF_SPACE_ID")
 
 if (MOCK):
     import sys
@@ -20,7 +21,6 @@ if (MOCK):
     sys.modules["spaces"] = mock_spaces
 
 
-import os
 import gradio as gr
 import json
 import logging
@@ -112,6 +112,9 @@ def load_loras_from_file():
 #loras = load_loras_from_file()
 loras = load_loras_hot()
 
+# loras = load_loras_hot()
+loras = load_loras_hot()
+
 selected_loras = []
 
 if not MOCK:
@@ -209,6 +212,13 @@ class calculateDuration:
 
 def update_selection(evt: gr.SelectData, width, height):
     selected_lora = loras[evt.index]
+    versions = selected_lora.get("versions", [])
+    if versions:
+        # Use first version or logic to pick one? Logic in get_selection handles the "active" one.
+        # This function updates just the placeholder and info text, might not be fully used anymore or overlapping logic.
+        # We will keep it but maybe it's not the primary update mechanism for state.
+        pass
+        
     new_placeholder = f"Type a prompt for {selected_lora['title']}"
     lora_repo = selected_lora["repo"]
     updated_text = f"### Selected: [{lora_repo}](https://huggingface.co/{lora_repo}) ✨"
@@ -231,10 +241,54 @@ def update_selection(evt: gr.SelectData, width, height):
         updated_text,
         evt.index,
         width,
+        width,
         height
     )
 
 
+def update_version_selection(version_title, current_state, idx):
+    """
+    Handle version dropdown change.
+    Update state and the specific Markdown to show the version's image.
+    """
+    # current_state is list of tuples: (image_index, version_index, scale)
+    # idx is the column index (0-based)
+    
+    new_state = [tuple(item) for item in current_state]
+    current_image_index = new_state[idx][0]
+    
+    if current_image_index is None:
+        return gr.update(), new_state # Should not happen if logic is correct
+
+    # Handle legacy state (2 elements) or new state (3 elements)
+    if len(new_state[idx]) == 3:
+        current_image_index, current_version_index, current_scale = new_state[idx]
+    else:
+        current_image_index, current_scale = new_state[idx]
+        current_version_index = None
+
+    lora = loras[current_image_index]
+    versions = lora.get("versions", [])
+    
+    # Find selected version object
+    selected_version = next((v for i, v in enumerate(versions) if v["title"] == version_title), None)
+    selected_version_index = next((i for i, v in enumerate(versions) if v["title"] == version_title), None)
+    
+    if selected_version:
+        # Update Markdown image
+        lora_name = lora["title"]
+        version_image = selected_version.get("image", lora.get("image"))
+        markdown_content = f"<img src='{version_image}' style='height:100px; display:block; margin-bottom:10px;' />\n\n**{lora_name}** ({version_title})"
+        
+        
+        # Update state: (image_index, version_index, scale)
+        new_state[idx] = (current_image_index, selected_version_index, current_scale)
+        
+        return gr.update(value=markdown_content), new_state
+    
+    return gr.update(), new_state
+
+
 def handle_speed_mode(speed_mode):
     """Update UI based on speed/quality toggle."""
     if speed_mode == "light 4":
@@ -278,9 +332,21 @@ def run_lora_multi(
     prompt_enhance=False,
     progress=gr.Progress(track_tqdm=True)
 ):
-    # selected_loras_state is a list of tuples: [(image_index, scale), ...]
+    # selected_loras_state is a list of tuples: [(image_index, version_index, scale), ...]
+    if selected_loras_state is None:
+        selected_loras_state = []
+
     # Filter to get only columns with loaded LoRAs
-    loaded_loras = [(idx, image_idx, scale) for idx, (image_idx, scale) in enumerate(selected_loras_state) if image_idx is not None]
+    loaded_loras = []
+    for idx, item in enumerate(selected_loras_state):
+        if item[0] is not None:
+             # item structure: (image_index, version_index, scale)
+             if len(item) == 3:
+                 loaded_loras.append((idx, item[0], item[1], item[2]))
+             else:
+                 # Legacy state support
+                 loaded_loras.append((idx, item[0], None, item[1]))
+
     print(f"Loaded LoRAs: {loaded_loras}")
     print(f"Quantity: {quantity}")
     print(f"Selected LoRAs: {selected_loras_state}")    
@@ -349,14 +415,24 @@ def run_lora_multi(
         adapter_weights.append(1.0)
     
     # Load all selected LoRAs from columns
-    for col_idx, image_idx, scale in loaded_loras:
+    for col_idx, image_idx, version_idx, scale in loaded_loras:
         selected_lora = loras[image_idx]
-        lora_path = selected_lora["repo"]
+        
+        # Determine weights and repo based on version
+        if version_idx is not None and "versions" in selected_lora:
+            version_data = selected_lora["versions"][version_idx]
+            lora_path = version_data.get("repo", selected_lora["repo"])
+            weight_name = version_data.get("weights", selected_lora.get("weights"))
+            print(f"Using version '{version_data['title']}' for LoRA {selected_lora['title']}")
+        else:
+            lora_path = selected_lora["repo"]
+            weight_name = selected_lora.get("weights")
+
         adapter_name = f"lora_{col_idx}"
         
         pipe.load_lora_weights(
             lora_path,
-            weight_name=selected_lora.get("weights"),
+            weight_name=weight_name,
             adapter_name=adapter_name
         )
         print(f"Loaded LoRA: {lora_path} as {adapter_name} with scale {scale}")
@@ -369,7 +445,8 @@ def run_lora_multi(
 
     # Colectar trigger words de todos los LoRAs cargados
     all_trigger_words = []
-    for _, image_idx, _ in loaded_loras:
+    for _, image_idx, version_idx, _ in loaded_loras:
+        # PENDING: Could also fetch trigger words from version specific data if available
         trigger = loras[image_idx].get("trigger_word", "")
         if trigger:
             all_trigger_words.append(trigger)
@@ -595,41 +672,48 @@ def init(speed_mode, aspect_ratio):
 
 
 def update_slider_state(val, state, idx):
-    # state is list of tuples (image_index, scale)
-    # Force a deep copy or comprehensive new list creation to avoid reference issues
+    # state is list of tuples (image_index, version_index, scale)
     new_state = [tuple(item) for item in state]
-    current_image = new_state[idx][0]
-    new_state[idx] = (current_image, float(val))
+    
+    if len(new_state[idx]) == 3:
+        current_image, current_version, current_scale = new_state[idx]
+    else:
+        current_image, current_scale = new_state[idx]
+        current_version = None
+        
+    new_state[idx] = (current_image, current_version, float(val))
     print(f"Slider {idx} updated. New state: {new_state}") 
     return new_state
 
 def remove_lora(state, idx):
     new_state = list(state)
-    new_state[idx] = (None, 1.0) # Reset to default
+    new_state[idx] = (None, None, 1.0) # Reset to default
     
-    # Return updates for: global_state, radio, slider, markdown, delete_btn, output_text
+    # Return updates for: global_state, radio, slider, markdown, delete_btn, output_text, version_dropdown
     return (
         new_state,                 # selected_loras
         gr.update(value=None),     # radio
         gr.update(visible=False, value=1.0), # slider
         gr.update(value=""),       # markdown
         gr.update(visible=False),  # delete_btn
+        gr.update(visible=False, value=None, choices=[]) # version_dropdown
     )
 
 def validate_generate_button(state):
     """Enable generate button if at least one LoRA is loaded."""
-    # state is list of tuples (image_index, scale)
+    # state is list of tuples (image_index, version_index, scale)
     # Check if any column has a LoRA loaded (image_index is not None)
     has_lora = any(item[0] is not None for item in state)
     return gr.update(interactive=has_lora)
 
 def get_selection(evt: gr.SelectData, *args):
-    # args: radios (N) + scales (N) + mds (N) + selected_loras (1) + gallery (1)
+    # args: radios (N) + scales (N) + mds (N) + dropdowns (N) + selected_loras (1) + gallery (1)
     
     num_radios = NUM_LORAS
     radio_vals = args[:num_radios]
     scale_vals = args[num_radios:num_radios*2]
-    md_vals = args[num_radios*2:num_radios*3]
+    # mds
+    # dropdowns (version)
     current_state = args[-2]
     gallery_val = args[-1]
     
@@ -643,11 +727,12 @@ def get_selection(evt: gr.SelectData, *args):
             selected_index = i
             break
             
-    # Prepare outputs: [output_text] + [md_0_update, ...] + [selected_loras_update] + [scale_0_update, ...] + [del_btn_0_update, ...] + [thumb_0_update, ...]
+    # Prepare outputs: [output_text] + [md_0_update, ...] + [selected_loras_update] + [scale_0_update, ...] + [del_btn_0_update, ...] + [dropdown_0_update, ...]
     
     md_updates = [gr.update() for _ in range(num_radios)]
     scale_updates = [gr.update() for _ in range(num_radios)]
     del_btn_updates = [gr.update() for _ in range(num_radios)]
+    dropdown_updates = [gr.update() for _ in range(num_radios)]
     
     new_state = current_state
     
@@ -658,19 +743,52 @@ def get_selection(evt: gr.SelectData, *args):
         lora = loras[evt.index]
         lora_name = lora["title"]
         lora_image = lora["image"]
+        
+        versions = lora.get("versions", [])
+        
+        version_index = None
+        version_title = ""
+
+        if versions:
+            # Has versions. Find default (match main weights or last one)
+            main_weights = lora.get("weights")
+            
+            # Try to match by weights first
+            found = False
+            for i, v in enumerate(versions):
+                if v.get("weights") == main_weights:
+                    version_index = i
+                    found = True
+                    break
+            
+            if not found:
+                 # Default to the last one if not found (convention mostly)
+                 version_index = len(versions) - 1
+            
+            version_data = versions[version_index]
+            version_title = version_data["title"]
+            version_image = version_data.get("image", lora_image)
+            
+            version_choices = [v["title"] for v in versions]
+            
+            dropdown_updates[selected_index] = gr.update(visible=True, choices=version_choices, value=version_title)
+        else:
+            dropdown_updates[selected_index] = gr.update(visible=False, value=None, choices=[])
+
 
         # Update specific markdown with image and name
         selected_image_info = f"Selected LoRA: {lora_name}"
-        markdown_content = f"<img src='{lora_image}' style='height:100px; display:block; margin-bottom:10px;' />\n\n**{lora_name}**"
+        markdown_content = f"<img src='{version_image if versions else lora_image}' style='height:100px; display:block; margin-bottom:10px;' />\n\n**{lora_name}**{' ('+version_title+')' if version_title else ''}"
         md_updates[selected_index] = gr.update(value=markdown_content)
         scale_updates[selected_index] = gr.update(visible=True)
         del_btn_updates[selected_index] = gr.update(visible=True)
         
-        # Update state for this column: (image_index, scale)
+        # Update state for this column: (image_index, version_index, scale)
         new_state = list(current_state)
-        new_state[selected_index] = (evt.index, scale_vals[selected_index])
+        # Preserve scale if it was already set? No, taking from current slider val usually 1.0 or user set
+        new_state[selected_index] = (evt.index, version_index, scale_vals[selected_index])
 
-    return md_updates + [new_state] + scale_updates + del_btn_updates
+    return md_updates + [new_state] + scale_updates + del_btn_updates + dropdown_updates
 
 
 
@@ -714,11 +832,13 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 60)) as app:
 
 
     
-    selected_loras = gr.State([(None, 1.0)] * NUM_LORAS)
+
+    selected_loras = gr.State([(None, None, 1.0)] * NUM_LORAS)
     radios = []
     scales = []
     mds = []
     delete_btns = []
+    version_dropdowns = []
 
 
     with gr.Row():
@@ -738,6 +858,10 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 60)) as app:
                         md = gr.Markdown("")
                         mds.append(md)
                         
+                        # New version dropdown
+                        v_dd = gr.Dropdown(label="Version", choices=[], visible=False, interactive=True)
+                        version_dropdowns.append(v_dd)
+
                         lora_scale = gr.Slider(label="LoRA Scale", minimum=0, maximum=3, step=0.1, value=1.0, interactive=True, visible=False)
                         scales.append(lora_scale)
                         
@@ -945,21 +1069,46 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css, delete_cache=(60, 60)) as app:
         r.change(fn=None, inputs=radios, outputs=None, js=js_gallery_toggle)
         
     # Bind slider changes separately to ensure all inputs/outputs are available
-    for i, scale in enumerate(scales):
-        scale_event = scale.change(fn=partial(update_slider_state, idx=i), inputs=[scale, selected_loras], outputs=[selected_loras])
-        scale_event.then(fn=validate_generate_button, inputs=[selected_loras], outputs=[generate_button])
-
-    # Bind delete buttons
-    for i, del_btn in enumerate(delete_btns):
-        del_event = del_btn.click(
+    for i in range(NUM_LORAS):
+        # Slider change
+        scales[i].change(
+            fn=partial(update_slider_state, idx=i),
+            inputs=[scales[i], selected_loras],
+            outputs=[selected_loras]
+        )
+        scales[i].change(fn=validate_generate_button, inputs=[selected_loras], outputs=[generate_button])
+        
+        # Delete LoRA
+        delete_btns[i].click(
             fn=partial(remove_lora, idx=i),
             inputs=[selected_loras],
-            outputs=[selected_loras, radios[i], scales[i], mds[i], del_btn]
+            outputs=[selected_loras, radios[i], scales[i], mds[i], delete_btns[i], version_dropdowns[i]]
+        )
+        delete_btns[i].click(fn=validate_generate_button, inputs=[selected_loras], outputs=[generate_button])
+
+        # Version change
+        version_dropdowns[i].change(
+            fn=partial(update_version_selection, idx=i),
+            inputs=[version_dropdowns[i], selected_loras],
+            outputs=[mds[i], selected_loras]
         )
-        del_event.then(fn=validate_generate_button, inputs=[selected_loras], outputs=[generate_button])
 
-    gallery_event = gallery.select(fn=get_selection, inputs=radios + scales + mds + [selected_loras, gallery], outputs=mds + [selected_loras] + scales + delete_btns)
-    gallery_event.then(fn=validate_generate_button, inputs=[selected_loras], outputs=[generate_button])
+    
+    # When gallery is selected
+    gallery.select(
+        fn=get_selection,
+        inputs=radios + scales + mds + version_dropdowns + [selected_loras, gallery], # Pass dropdowns too
+        outputs=mds + [selected_loras] + scales + delete_btns + version_dropdowns
+    )
+    
+    # Also trigger validation on selection
+    gallery.select(fn=validate_generate_button, inputs=[selected_loras], outputs=[generate_button])
+
+    
+    # -----------------------------------------------------
+    # START GENERATION
+    # -----------------------------------------------------
+    # Handler is already defined in generate_event (gr.on triggers)
 
 
 

loras.json

@@ -102,7 +102,8 @@
         "trigger_position": "",
         "aspect": "square",
         "title": "Masha 2d anime"
-    },    {
+    },
+    {
         "repo": "lichorosario/lobato-qwen-image-lora",
         "image": "https://huggingface.co/lichorosario/lobato-qwen-image-lora/resolve/main/images/milei.png",
         "trigger_word": "",
@@ -111,11 +112,26 @@
         "title": "Pablo Lobato"
     },
     {
-        "repo": "lichorosario/tosti-qwen-image-lora",
-        "image": "https://huggingface.co/lichorosario/tosti-qwen-image-lora/resolve/main/images/example_85rpareuq.png",
+        "image": "https://huggingface.co/lichorosario/tostiadvbg-v1-qwen-image2512/resolve/main/images/tostiadv-v1-qwen-image-2512_20.webp",
         "trigger_word": "",
-        "aspect": "square",
-        "title": "Tosti"
+        "trigger_position": "",
+        "aspect": "landscape",
+        "title": "TostiAdvBg",
+        "description": "Model trained on synth pictures mimicking Day of the Tentacle style",
+        "versions": [
+            {
+                "repo": "lichorosario/tostiadvbg-v1-qwen-image2512",
+                "weights": "tostiadv-v1-qwen-image-2512_5.safetensors",
+                "image": "https://huggingface.co/lichorosario/tostiadvbg-v1-qwen-image2512/resolve/main/images/tostiadv-v1-qwen-image-2512_5.webp",
+                "title": "2512.ckpt5"
+            },
+            {
+                "repo": "lichorosario/tostiadvbg-v1-qwen-image2512",
+                "weights": "tostiadv-v1-qwen-image-2512_20.safetensors",
+                "image": "https://huggingface.co/lichorosario/tostiadvbg-v1-qwen-image2512/resolve/main/images/tostiadv-v1-qwen-image-2512_20.webp",
+                "title": "2512.ckpt20"
+            }
+        ]
     },
     {
         "repo": "lichorosario/blbfsh-qwen-image-lora",
@@ -181,7 +197,6 @@
         "aspect": "square",
         "title": "China Zorrilla"
     },
-
     {
         "repo": "lichorosario/martha-qwen-image-lora",
         "image": "https://huggingface.co/lichorosario/martha-qwen-image-lora/resolve/main/images/17.png",
@@ -206,7 +221,6 @@
         "aspect": "square",
         "title": "Estoy Presa"
     },
-  
     {
         "repo": "lichorosario/panorama-qwen-image-lora",
         "image": "https://huggingface.co/lichorosario/samuraijack-qwen-image-lora/resolve/main/images/7.png",