Update app_local.py

app_local.py

@@ -242,35 +242,19 @@ try:
 except Exception as e:
     print(f"VAE Slicing Failed: {e}")
     
-# Function to update prompt preview when preset is selected
-def update_prompt_preview(preset_type, base_prompt):
-    """Update the prompt preview display based on selected preset and base prompt"""
-    if preset_type and preset_type in PRESETS:
-        preset = PRESETS[preset_type]
-        preview_text = f"**Preset: {preset_type}**\n\n"
-        preview_text += f"*{preset['description']}*\n\n"
-        preview_text += "**Generated Prompts:**\n"
-        
-        for i, preset_prompt in enumerate(preset["prompts"], 1):
-            full_prompt = f"{base_prompt}, {preset_prompt}"
-            preview_text += f"{i}. {full_prompt}\n"
-        
-        return preview_text
-    else:
-        return "Select a preset above to see how your base prompt will be modified for batch generation."
-        
+  
 def toggle_output_count(preset_type):
     """Control output count slider interactivity and show/hide preset editor"""
     if preset_type and preset_type in PRESETS:
         # When preset is selected, disable manual output count and show editor
         preset = PRESETS[preset_type]
-        prompts = preset["prompts"]
+        prompts = preset["prompts"][:4]  # Get up to 4 prompts
         # Pad prompts to 4 items if needed
         while len(prompts) < 4:
             prompts.append("")
         return (
             gr.Group(visible=True), 
-            gr.Slider(interactive=False, value=preset["count"]),  # Disable slider
+            gr.Slider(interactive=False, value=len([p for p in prompts if p.strip()])),  # Count non-empty prompts
             prompts[0], prompts[1], prompts[2], prompts[3]  # Populate preset prompts
         )
     else:
@@ -280,8 +264,48 @@ def toggle_output_count(preset_type):
             gr.Slider(interactive=True),  # Enable slider
             "", "", "", ""  # Clear preset prompts
         )
+### FIXED ### - Updated prompt preview to show only non-empty prompts
+def update_prompt_preview(preset_type, base_prompt):
+    """Update the prompt preview display based on selected preset and base prompt"""
+    if preset_type and preset_type in PRESETS:
+        preset = PRESETS[preset_type]
+        non_empty_prompts = [p for p in preset["prompts"] if p.strip()]
+        
+        if not non_empty_prompts:
+            return "No prompts defined. Please enter at least one prompt in the editor."
+        
+        preview_text = f"**Preset: {preset_type}**\n\n"
+        preview_text += f"*{preset['description']}*\n\n"
+        preview_text += f"**Generating {len(non_empty_prompts)} image{'s' if len(non_empty_prompts) > 1 else ''}:**\n"
+        
+        for i, preset_prompt in enumerate(non_empty_prompts, 1):
+            full_prompt = f"{base_prompt}, {preset_prompt}"
+            preview_text += f"{i}. {full_prompt}\n"
+        
+        return preview_text
+    else:
+        return "Select a preset above to see how your base prompt will be modified for batch generation."
 
+def update_preset_prompt_textbox(preset_type, prompt_1, prompt_2, prompt_3, prompt_4):
+    """Update preset prompts based on user input"""
+    if preset_type and preset_type in PRESETS:
+        # Update each prompt in the preset
+        new_prompts = [prompt_1, prompt_2, prompt_3, prompt_4]
+        for i, new_prompt in enumerate(new_prompts):
+            if i < len(PRESETS[preset_type]["prompts"]):
+                PRESETS[preset_type]["prompts"][i] = new_prompt.strip()
+            else:
+                PRESETS[preset_type]["prompts"].append(new_prompt.strip())
         
+        # Count non-empty prompts for the slider value
+        non_empty_count = len([p for p in new_prompts if p.strip()])
+        non_empty_count = max(1, min(4, non_empty_count))  # Ensure between 1-4
+        
+        # Return updated preset info for preview
+        return update_prompt_preview(preset_type, "your subject")  # Use placeholder for preview
+    return "Select a preset first to edit its prompts."
+
+
 @spaces.GPU()
 def infer(
     image,
@@ -344,16 +368,31 @@ def infer(
     # Handle preset batch generation
     if preset_type and preset_type in PRESETS:
         preset = PRESETS[preset_type]
-        batch_prompts = [f"{original_prompt}, {preset_prompt}" for preset_prompt in preset["prompts"]]
-        num_images_per_prompt = preset["count"]
-        prompt_info = (
-            f"<div style='margin:10px; padding:15px; border-radius:8px; border-left:4px solid #2196F3; background: #f0f8ff'>"
-            f"<h4 style='margin-top: 0;'>🎨 Preset: {preset_type}</h4>"
-            f"<p>{preset['description']}</p>"
-            f"<p><strong>Base Prompt:</strong> {original_prompt}</p>"
-            f"</div>"
-        )
-        print(f"Using preset: {preset_type} with {len(batch_prompts)} variations")
+        # Filter out empty prompts
+        non_empty_preset_prompts = [p for p in preset["prompts"] if p.strip()]
+        
+        if non_empty_preset_prompts:
+            batch_prompts = [f"{original_prompt}, {preset_prompt}" for preset_prompt in non_empty_preset_prompts]
+            num_images_per_prompt = len(non_empty_preset_prompts)  # Use actual count of non-empty prompts
+            prompt_info = (
+                f"<div style='margin:10px; padding:15px; border-radius:8px; border-left:4px solid #2196F3; background: #f0f8ff'>"
+                f"<h4 style='margin-top: 0;'>🎨 Preset: {preset_type}</h4>"
+                f"<p>{preset['description']}</p>"
+                f"<p><strong>Base Prompt:</strong> {original_prompt}</p>"
+                f"<p>Generating {len(non_empty_preset_prompts)} image{'s' if len(non_empty_preset_prompts) > 1 else ''}</p>"
+                f"</div>"
+            )
+            print(f"Using preset: {preset_type} with {len(batch_prompts)} variations")
+        else:
+            # Fallback to manual if no valid prompts
+            batch_prompts = [prompt]
+            prompt_info = (
+                f"<div style='margin:10px; padding:15px; border-radius:8px; border-left:4px solid #FF9800; background: #fff8f0'>"
+                f"<h4 style='margin-top: 0;'>⚠️ Invalid Preset</h4>"
+                f"<p>No valid prompts found. Using manual prompt.</p>"
+                f"<p><strong>Prompt:</strong> {original_prompt}</p>"
+                f"</div>"
+            )
     else:
         batch_prompts = [prompt]  # Single prompt in list
         
@@ -573,37 +612,13 @@ with gr.Blocks(title="Qwen Image Edit - Fast Lightning Mode w/ Batch") as demo:
                 prompts.append("")
             return gr.Group(visible=True), prompts[0], prompts[1], prompts[2], prompts[3]
         return gr.Group(visible=False), "", "", "", ""
-    # Function to update prompt preview when preset is selected
-    def update_prompt_preview(preset_type, base_prompt):
-        """Update the prompt preview display based on selected preset and base prompt"""
-        if preset_type and preset_type in PRESETS:
-            preset = PRESETS[preset_type]
-            preview_text = f"**Preset: {preset_type}**\n\n"
-            preview_text += f"*{preset['description']}*\n\n"
-            preview_text += "**Generated Prompts:**\n"
-            
-            for i, preset_prompt in enumerate(preset["prompts"], 1):
-                full_prompt = f"{base_prompt}, {preset_prompt}"
-                preview_text += f"{i}. {full_prompt}\n"
-            
-            return preview_text
-        else:
-            return "Select a preset above to see how your base prompt will be modified for batch generation."
-    
-    # Function to update individual preset prompts
-    def update_preset_prompt_textbox(preset_type, prompt_1, prompt_2, prompt_3, prompt_4):
-        """Update preset prompts based on user input"""
+
+    def update_preset_count(preset_type, prompt_1, prompt_2, prompt_3, prompt_4):
+        """Update the output count slider based on non-empty preset prompts"""
         if preset_type and preset_type in PRESETS:
-            # Update each prompt in the preset
-            new_prompts = [prompt_1, prompt_2, prompt_3, prompt_4]
-            for i, new_prompt in enumerate(new_prompts):
-                if new_prompt and i < len(PRESETS[preset_type]["prompts"]):
-                    PRESETS[preset_type]["prompts"][i] = new_prompt
-            
-            # Return updated preset info for preview
-            return update_prompt_preview(preset_type, "your subject")  # Use placeholder for preview
-        return "Select a preset first to edit its prompts."
-    
+            non_empty_count = len([p for p in [prompt_1, prompt_2, prompt_3, prompt_4] if p.strip()])
+            return gr.Slider(value=max(1, min(4, non_empty_count)), interactive=False)
+        return gr.Slider(interactive=True)
 
     # Set up preset dropdown change handler - now controls output count slider
     preset_dropdown.change(
@@ -619,6 +634,28 @@ with gr.Blocks(title="Qwen Image Edit - Fast Lightning Mode w/ Batch") as demo:
         outputs=prompt_preview
     )
     
+    # Set up handlers for preset editor changes
+    preset_prompt_1.change(
+        fn=update_preset_count,
+        inputs=[preset_dropdown, preset_prompt_1, preset_prompt_2, preset_prompt_3, preset_prompt_4],
+        outputs=num_images_per_prompt
+    )
+    preset_prompt_2.change(
+        fn=update_preset_count,
+        inputs=[preset_dropdown, preset_prompt_1, preset_prompt_2, preset_prompt_3, preset_prompt_4],
+        outputs=num_images_per_prompt
+    )
+    preset_prompt_3.change(
+        fn=update_preset_count,
+        inputs=[preset_dropdown, preset_prompt_1, preset_prompt_2, preset_prompt_3, preset_prompt_4],
+        outputs=num_images_per_prompt
+    )
+    preset_prompt_4.change(
+        fn=update_preset_count,
+        inputs=[preset_dropdown, preset_prompt_1, preset_prompt_2, preset_prompt_3, preset_prompt_4],
+        outputs=num_images_per_prompt
+    )
+
     prompt.change(
         fn=update_prompt_preview,
         inputs=[preset_dropdown, prompt],