Update app.py

app.py

@@ -95,18 +95,37 @@ def download_file(url, directory=None):
 
 def get_trigger_word(base_model, lora_models):
     trigger_words = []  # Initialize an empty list to hold trigger words
-    if "lora1" in lora_models:
-        trigger_words.append(lora1.get('trigger_word', ''))
-    if "lora2" in lora_models:
-        trigger_words.append(lora2.get('trigger_word', ''))
-    if "lora3" in lora_models:
-        trigger_words.append(lora3.get('trigger_word', ''))
-    if "lora4" in lora_models:
-        trigger_words.append(lora4.get('trigger_word', ''))
+    for lora in lora_models:
+        trigger_word = lora.get('trigger_word', '')
+        if trigger_word:
+            trigger_words.append(trigger_word)
     
     # Join all trigger words with a space and wrap in a span
     trigger_word = "<span style='color:green;'> " + " ".join(trigger_words) + " </span>"
     return trigger_word
+    
+def randomize_loras(selected_indices, loras_state):
+    if len(loras_state) < 2:
+        raise gr.Error("Not enough LoRAs to randomize.")
+    
+    selected_indices = random.sample(range(len(loras_state)), 2)
+    lora1 = loras_state[selected_indices[0]]
+    lora2 = loras_state[selected_indices[1]]
+    
+    # Get trigger words for both selected LoRAs
+    trigger_word_1 = lora1.get('trigger_word', '')
+    trigger_word_2 = lora2.get('trigger_word', '')
+    
+    selected_info_1 = f"### LoRA 1 Selected: [{lora1['title']}](https://huggingface.co/{lora1['repo']}) ✨ {trigger_word_1}"
+    selected_info_2 = f"### LoRA 2 Selected: [{lora2['title']}](https://huggingface.co/{lora2['repo']}) ✨ {trigger_word_2}"
+    
+    lora_scale_1 = 0.5
+    lora_scale_2 = 0.5
+    lora_image_1 = lora1['image']
+    lora_image_2 = lora2['image']
+    random_prompt = random.choice(prompt_values)
+    
+    return selected_info_1, selected_info_2, selected_indices, lora_scale_1, lora_scale_2, lora_image_1, lora_image_2, random_prompt
 
 def update_selection(evt: gr.SelectData, selected_indices, loras_state, width, height):
     selected_index = evt.index
@@ -145,21 +164,6 @@ def update_selection(evt: gr.SelectData, selected_indices, loras_state, width, h
             gr.update()
     )
 
-def randomize_loras(selected_indices, loras_state):
-    if len(loras_state) < 2:
-        raise gr.Error("Not enough LoRAs to randomize.")
-    selected_indices = random.sample(range(len(loras_state)), 2)
-    lora1 = loras_state[selected_indices[0]]
-    lora2 = loras_state[selected_indices[1]]
-    selected_info_1 = f"### LoRA 1 Selected: [{lora1['title']}](https://huggingface.co/{lora1['repo']}) ✨ {trigger_word}"
-    selected_info_2 = f"### LoRA 2 Selected: [{lora2['title']}](https://huggingface.co/{lora2['repo']}) ✨ {trigger_word}"
-    lora_scale_1 = 0.5
-    lora_scale_2 = 0.5
-    lora_image_1 = lora1['image']
-    lora_image_2 = lora2['image']
-    random_prompt = random.choice(prompt_values)
-    return selected_info_1, selected_info_2, selected_info_3, selected_info_4, selected_indices, lora_scale_1, lora_scale_2, lora_scale_3, lora_scale_4, lora_image_1, lora_image_2, lora_image_3, lora_image_4, random_prompt
-
 def remove_lora_1(selected_indices, loras_state):
     if len(selected_indices) >= 1:
         selected_indices.pop(0)