Update app.py

app.py

@@ -108,6 +108,7 @@ def character_creation_app(data_manager):
                 character['image'] = None
 
             data_manager.add_character(character)
+            # Clear inputs after saving
             return f"Character '{name}' saved successfully."
 
         save_button.click(save_character, inputs=[name_input, traits_input, image_input, gender_input], outputs=output)
@@ -137,12 +138,37 @@ def prompt_generator_app(data_manager):
         with gr.Group():
             gr.Markdown("### Character Selection")
 
-            # Placeholders for dynamic components
-            hidden_selected_characters = gr.Textbox(visible=False, elem_id='selected_character_names')
-
-            characters_display = gr.HTML()
-
-            refresh_characters_button = gr.Button("Refresh Character List")
+            characters = data_manager.get_characters()
+            if not characters:
+                gr.Markdown("No characters available. Please add characters in the Character Creation tab.")
+            else:
+                # Display characters in a gallery
+                character_images = []
+                character_labels = []
+                for idx, char in enumerate(characters):
+                    image_path = char.get('image_path', '')
+                    image_url = ''
+                    if image_path and os.path.exists(image_path):
+                        image_url = image_path
+                    else:
+                        image_url = None  # Or a placeholder image
+                    character_images.append(image_url)
+                    character_labels.append(f"{char['name']} ({char['gender']})")
+                character_select = gr.Gallery(label="Select Characters").style(grid=[3], height='auto')
+
+                selected_characters_state = gr.State([])
+
+                # Function to update selected characters
+                def update_selected_characters(selected_indices):
+                    selected_indices = selected_indices or []
+                    selected_chars = [characters[i] for i in selected_indices]
+                    selected_char_names = [char['name'] for char in selected_chars]
+                    return selected_characters_state.update(value=selected_chars)
+
+                # Update the gallery
+                character_select.render(character_images)
+
+                character_select.select(fn=update_selected_characters, inputs=[character_select], outputs=[selected_characters_state])
 
         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)")
@@ -150,60 +176,7 @@ def prompt_generator_app(data_manager):
         generate_button = gr.Button("Generate Prompt")
         prompt_output = gr.Textbox(label="Generated Prompt", lines=5)
 
-        # Function to display characters with images and selection checkboxes
-        def display_characters():
-            characters = data_manager.get_characters()
-            if not characters:
-                return "<p>No characters available. Please add characters in the Character Creation tab.</p>"
-
-            # Build HTML content for characters display
-            html_content = "<div style='display: flex; flex-wrap: wrap;'>"
-            for idx, char in enumerate(characters):
-                image_path = char.get('image_path', '')
-                image_url = ''
-                if image_path and os.path.exists(image_path):
-                    with open(image_path, "rb") as img_file:
-                        image_data = base64.b64encode(img_file.read()).decode('utf-8')
-                        image_url = f"data:image/png;base64,{image_data}"
-                else:
-                    image_url = ""
-
-                # Each character card
-                html_content += f"""
-                <div style='margin: 10px; text-align: center; width: 150px;'>
-                    <img src='{image_url}' style='width: 100%; height: auto;'/>
-                    <p>{char['name']}</p>
-                    <input type='checkbox' name='character_select' value='{char['name']}' onchange='updateSelectedCharacters()'/>
-                </div>
-                """
-            html_content += "</div>"
-
-            # JavaScript function to update selected characters
-            html_content += """
-            <script>
-            function updateSelectedCharacters() {
-                let selected = [];
-                let checkboxes = document.getElementsByName('character_select');
-                for (let i = 0; i < checkboxes.length; i++) {
-                    if (checkboxes[i].checked) {
-                        selected.push(checkboxes[i].value);
-                    }
-                }
-                document.getElementById('selected_character_names').value = JSON.stringify(selected);
-            }
-            </script>
-            """
-
-            return html_content
-
-        # Initialize characters_display with the HTML content
-        characters_display.value = display_characters()
-
-        # When refresh_characters_button is clicked, update characters_display
-        refresh_characters_button.click(fn=display_characters, outputs=characters_display)
-
         def generate_prompt(*args):
-            # args correspond to inputs in the order they are defined
             arg_idx = 0
 
             prompt_tags = []
@@ -218,22 +191,21 @@ def prompt_generator_app(data_manager):
                     prompt_tags.extend(selected_tags)
 
             # Handle Characters
-            selected_characters_json = args[arg_idx]
+            # Since Gradio's State cannot be passed directly, we retrieve it via args
+            selected_chars = args[arg_idx]
             random_chars = args[arg_idx + 1]
             num_random_chars = args[arg_idx + 2]
 
             arg_idx += 3
 
-            selected_character_names_list = json.loads(selected_characters_json) if selected_characters_json else []
-
             characters = data_manager.get_characters()
 
-            selected_chars = []
             if random_chars:
                 num = min(len(characters), int(num_random_chars))
                 selected_chars = random.sample(characters, num)
             else:
-                selected_chars = [char for char in characters if char['name'] in selected_character_names_list]
+                # selected_chars is already set from the selected characters in the gallery
+                pass
 
             # Determine the number of boys and girls
             num_girls = sum(1 for char in selected_chars if char.get('gender') == 'Girl')
@@ -246,7 +218,10 @@ def prompt_generator_app(data_manager):
             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)
+            prompt_parts = []
+
+            if character_count_tags:
+                prompt_parts.append(', '.join(character_count_tags))
 
             # Build character descriptions
             character_descriptions = []
@@ -254,30 +229,32 @@ def prompt_generator_app(data_manager):
                 # 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)"
+                # For SDXL models, use the format "[char1] AND [char2]"
+                # Each character's description is enclosed in parentheses
+                character_description = f"({traits})"
                 character_descriptions.append(character_description)
 
-            # Include character descriptions in the prompt
+            # Join character descriptions appropriately for SDXL models
             if character_descriptions:
                 character_descriptions_str = ' AND '.join(character_descriptions)
-                prompt_string = f"{prompt_string}, {character_descriptions_str}"
-            else:
-                prompt_string = f"{prompt_string}"
+                prompt_parts.append(character_descriptions_str)
 
             # 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}"
+                prompt_tags_str = ', '.join(prompt_tags)
+                prompt_parts.append(prompt_tags_str)
 
             # Load persistent tags
             persistent_tags = data_manager.get_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}"
+                persistent_tags_str = ', '.join(persistent_tags)
+                prompt_parts.append(persistent_tags_str)
 
             # 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_string = f"{prompt_string}, {ending_tags}"
+            prompt_parts.append(ending_tags)
+
+            prompt_string = ', '.join(prompt_parts)
 
             return prompt_string
 
@@ -285,7 +262,8 @@ def prompt_generator_app(data_manager):
         inputs_list = []
         for var_name in inputs:
             inputs_list.append(inputs[var_name])
-        inputs_list.extend([hidden_selected_characters, random_characters, num_characters])
+        # Add selected characters state to inputs
+        inputs_list.extend([selected_characters_state, random_characters, num_characters])
 
         generate_button.click(generate_prompt, inputs=inputs_list, outputs=prompt_output)