next

prompt_generator.py

@@ -113,7 +113,6 @@ class PromptGenerator:
     def load_next_data(self):
         next_data = {}
         next_path = os.path.join("data", "next")
-        print(f"Loading next data from: {next_path}")
         for category in os.listdir(next_path):
             category_path = os.path.join(next_path, category)
             if os.path.isdir(category_path):
@@ -121,15 +120,12 @@ class PromptGenerator:
                 for file in os.listdir(category_path):
                     if file.endswith(".json"):
                         file_path = os.path.join(category_path, file)
-                        print(f"Loading file: {file_path}")
                         with open(file_path, "r", encoding="utf-8") as f:
                             json_data = json.load(f)
                             next_data[category][file[:-5]] = json_data
-        print(f"Loaded next_data: {next_data}")
         return next_data
 
     def process_next_data(self, prompt, separator, category, field, value):
-        print(f"Processing next data: category={category}, field={field}, value={value}")
         if category in self.next_data and field in self.next_data[category]:
             field_data = self.next_data[category][field]
             
@@ -328,7 +324,8 @@ class PromptGenerator:
         combined_prompt = replaced + " " + " ".join(next_prompts)
         combined_prompt = self.clean_consecutive_commas(combined_prompt)
 
-        return self.process_string(combined_prompt, seed)
+        # Return the processed string including next prompts
+        return self.process_string(combined_prompt.strip(), seed)
     
     def add_caption_to_prompt(self, prompt, caption):
         if caption:

ui_components.py

@@ -61,6 +61,22 @@ def create_interface():
                     photographer = gr.Dropdown(["disabled", "random"] + PHOTOGRAPHER, label="Photographer", value="disabled")
                     artist = gr.Dropdown(["disabled", "random"] + ARTIST, label="Artist", value="disabled")
                     digital_artform = gr.Dropdown(["disabled", "random"] + DIGITAL_ARTFORM, label="Digital Artform", value="disabled")
+
+                # Add Next components
+                with gr.Accordion("More Detailed Prompt Options", open=False):
+                    next_components = {}
+                    for category, fields in prompt_generator.next_data.items():
+                        with gr.Accordion(f"{category.capitalize()} Options", open=False):
+                            category_components = {}
+                            for field, data in fields.items():
+                                if isinstance(data, list):
+                                    options = ["None", "Random", "Multiple Random"] + data
+                                elif isinstance(data, dict):
+                                    options = ["None", "Random", "Multiple Random"] + data.get("items", [])
+                                else:
+                                    options = ["None", "Random", "Multiple Random"]
+                                category_components[field] = gr.Dropdown(options, label=field.capitalize(), value="None")
+                            next_components[category] = category_components
                 
                 generate_button = gr.Button("Generate Prompt")
 
@@ -102,20 +118,7 @@ def create_interface():
             outputs=[caption_output]
         )
 
-        # Add Next components
-        next_components = {}
-        for category, fields in prompt_generator.next_data.items():
-            with gr.Accordion(f"{category.capitalize()} Options", open=False):
-                category_components = {}
-                for field, data in fields.items():
-                    if isinstance(data, list):
-                        options = ["None", "Random", "Multiple Random"] + data
-                    elif isinstance(data, dict):
-                        options = ["None", "Random", "Multiple Random"] + data.get("items", [])
-                    else:
-                        options = ["None", "Random", "Multiple Random"]
-                    category_components[field] = gr.Dropdown(options, label=field.capitalize(), value="None")
-                next_components[category] = category_components
+        
 
         def generate_prompt_with_dynamic_seed(*args, **kwargs):
             dynamic_seed = random.randint(0, 1000000)
@@ -125,19 +128,23 @@ def create_interface():
             
             # Extract next_params
             next_params = {}
+            next_args = args[22:]  # All arguments after the main ones are for next_params
+            next_arg_index = 0
             for category, fields in prompt_generator.next_data.items():
                 category_params = {}
                 for field in fields:
-                    if field in kwargs:
-                        category_params[field] = kwargs[field]
+                    value = next_args[next_arg_index]
+                    # Include all values, even "None", "Random", and "Multiple Random"
+                    category_params[field] = value
+                    next_arg_index += 1
                 if category_params:
                     next_params[category] = category_params
 
+            print(next_params)
             # 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]
+
+            print(result)
             
             return [dynamic_seed] + list(result)