Update app.py

app.py

@@ -89,13 +89,15 @@ def character_creation_app(data_manager):
             name_input = gr.Textbox(label="Character Name")
             traits_input = gr.Textbox(label="Traits/Appearance Tags (comma separated)")
         image_input = gr.Image(label="Upload Character Image", type="filepath")
+        # New gender selection input
+        gender_input = gr.Radio(choices=["Boy", "Girl"], label="Gender")
         save_button = gr.Button("Save Character")
         output = gr.Textbox(label="Status", interactive=False)
 
-        def save_character(name, traits, image_path):
-            if not name or not traits:
+        def save_character(name, traits, image_path, gender):
+            if not name or not traits or not gender:
                 return "Please enter all fields."
-            character = {'name': name, 'traits': traits, 'image': None}
+            character = {'name': name, 'traits': traits, 'gender': gender, 'image': None}
 
             # Read and encode image if provided
             if image_path:
@@ -108,7 +110,7 @@ def character_creation_app(data_manager):
             data_manager.add_character(character)
             return f"Character '{name}' saved successfully."
 
-        save_button.click(save_character, inputs=[name_input, traits_input, image_input], outputs=output)
+        save_button.click(save_character, inputs=[name_input, traits_input, image_input, gender_input], outputs=output)
 
 def prompt_generator_app(data_manager):
     with gr.Tab("Prompt Generator"):
@@ -142,9 +144,6 @@ def prompt_generator_app(data_manager):
 
             refresh_characters_button = gr.Button("Refresh Character List")
 
-        # Number of people in the scene
-        num_people = gr.Slider(minimum=0, maximum=10, step=1, value=1, label="Number of People in the Scene")
-
         random_characters = gr.Checkbox(label="Select Random Characters")
         num_characters = gr.Slider(minimum=0, maximum=10, step=1, value=1, label="Number of Characters (if random)")
 
@@ -205,7 +204,6 @@ def prompt_generator_app(data_manager):
 
         def generate_prompt(*args):
             # args correspond to inputs in the order they are defined
-            # Need to map args to variables
             arg_idx = 0
 
             prompt_tags = []
@@ -218,14 +216,13 @@ def prompt_generator_app(data_manager):
                 if tags_list and tags_num > 0:
                     selected_tags = random.sample(tags_list, min(len(tags_list), int(tags_num)))
                     prompt_tags.extend(selected_tags)
-            
+
             # Handle Characters
             selected_characters_json = args[arg_idx]
             random_chars = args[arg_idx + 1]
             num_random_chars = args[arg_idx + 2]
-            num_people_in_scene = args[arg_idx + 3]
 
-            arg_idx += 4
+            arg_idx += 3
 
             selected_character_names_list = json.loads(selected_characters_json) if selected_characters_json else []
 
@@ -238,29 +235,57 @@ def prompt_generator_app(data_manager):
             else:
                 selected_chars = [char for char in characters if char['name'] in selected_character_names_list]
 
-            # Adjust the number of people in the scene
-            # You can modify how additional characters are added if needed
+            # Determine the number of boys and girls
+            num_girls = sum(1 for char in selected_chars if char.get('gender') == 'Girl')
+            num_boys = sum(1 for char in selected_chars if char.get('gender') == 'Boy')
+
+            # Build the initial character count tags
+            character_count_tags = []
+            if num_girls > 0:
+                character_count_tags.append(f"{num_girls}girl" if num_girls == 1 else f"{num_girls}girls")
+            if num_boys > 0:
+                character_count_tags.append(f"{num_boys}boy" if num_boys == 1 else f"{num_boys}boys")
+
+            prompt_string = ', '.join(character_count_tags)
 
+            # Build character descriptions
+            character_descriptions = []
             for idx, char in enumerate(selected_chars):
-                prompt_tags.append(f"{char['name']}")
-                prompt_tags.extend(char['traits'])
+                # Get traits for the character
+                traits = ', '.join(char['traits'])
+                # Create a description for each character
+                character_description = f"({char['name']}:1.0), ({traits}:1.0)"
+                character_descriptions.append(character_description)
+
+            # Include character descriptions in the prompt
+            if character_descriptions:
+                character_descriptions_str = ' AND '.join(character_descriptions)
+                prompt_string = f"{prompt_string}, {character_descriptions_str}"
+            else:
+                prompt_string = f"{prompt_string}"
+
+            # Append selected prompt tags from categories
+            if prompt_tags:
+                prompt_tags_str = ', '.join(f"({tag}:1.0)" for tag in prompt_tags if tag)
+                prompt_string = f"{prompt_string}, {prompt_tags_str}"
 
             # Load persistent tags
             persistent_tags = data_manager.get_persistent_tags()
-            prompt_tags.extend(persistent_tags)
+            if persistent_tags:
+                persistent_tags_str = ', '.join(f"({tag}:1.0)" for tag in persistent_tags if tag)
+                prompt_string = f"{prompt_string}, {persistent_tags_str}"
 
-            # Assemble prompt with classic syntax (word:weight)
-            prompt = ', '.join(f"({tag}:1.0)" for tag in prompt_tags if tag)
             # Add ending tags
             ending_tags = "source_anime, score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres, anime artwork, anime style, vibrant, studio anime, highly detailed"
-            prompt = f"{prompt}, {ending_tags}"
-            return prompt
+            prompt_string = f"{prompt_string}, {ending_tags}"
+
+            return prompt_string
 
         # Prepare the list of inputs for the generate_prompt function
         inputs_list = []
         for var_name in inputs:
             inputs_list.append(inputs[var_name])
-        inputs_list.extend([hidden_selected_characters, random_characters, num_characters, num_people])
+        inputs_list.extend([hidden_selected_characters, random_characters, num_characters])
 
         generate_button.click(generate_prompt, inputs=inputs_list, outputs=prompt_output)