next

prompt_generator.py

@@ -313,11 +313,18 @@ class PromptGenerator:
         replaced = self.clean_consecutive_commas(replaced)
 
         # Process next_params
+        next_prompts = []
         for category, fields in next_params.items():
             for field, value in fields.items():
-                prompt = self.process_next_data(prompt, ", ", category, field, value)
+                next_prompt = self.process_next_data("", ", ", category, field, value)
+                if next_prompt:
+                    next_prompts.append(next_prompt.strip())
 
-        return self.process_string(replaced, seed)
+        # Combine main prompt with next prompts
+        combined_prompt = replaced + " " + " ".join(next_prompts)
+        combined_prompt = self.clean_consecutive_commas(combined_prompt)
+
+        return self.process_string(combined_prompt, seed)
     
     def add_caption_to_prompt(self, prompt, caption):
         if caption:

ui_components.py

@@ -136,11 +136,10 @@ def create_interface():
             # Call generate_prompt with the correct arguments
             result = prompt_generator.generate_prompt(dynamic_seed, *main_args, next_params=next_params)
             
+            # The main prompt is now the first element of the result
             main_prompt = result[0]
-            next_prompts = [v for category in next_params.values() for v in category.values() if v]
-            combined_prompt = main_prompt + " " + " ".join(next_prompts)
             
-            return [dynamic_seed, combined_prompt] + list(result[1:])
+            return [dynamic_seed] + list(result)
 
         generate_button.click(
             generate_prompt_with_dynamic_seed,