Update app.py

app.py

@@ -187,7 +187,7 @@ def prompt_generator_app(data_manager):
         # Add a refresh tags button
         refresh_tags_button = gr.Button("Refresh Tags")
 
-        inputs = {}
+        inputs_sliders = {}
         tag_displays = {}
         for category_name, var_name in categories:
             tags_list = data_manager.get_category_tags(var_name)
@@ -201,7 +201,7 @@ def prompt_generator_app(data_manager):
                 gr.Markdown(f"### {category_name}")
                 tag_display = gr.Markdown(f"**Tags:** {tags_string}")
                 tag_num = gr.Slider(minimum=0, maximum=max_tags, step=1, value=default_value, label=f"Number of {category_name} Tags to Select")
-            inputs[f"{var_name}_num"] = tag_num
+            inputs_sliders[var_name + '_num'] = tag_num
             tag_displays[var_name] = (tag_display, tag_num)
 
         # For Character Selection
@@ -222,11 +222,10 @@ def prompt_generator_app(data_manager):
 
             refresh_characters_button = gr.Button("Refresh Character List")
 
-            def refresh_characters():
-                new_options = get_character_options()
-                return gr.CheckboxGroup.update(choices=new_options)
-
-            refresh_characters_button.click(refresh_characters, outputs=character_select)
+            refresh_characters_button.click(
+                lambda: get_character_options(),
+                outputs=character_select
+            )
 
         random_characters = gr.Checkbox(label="Select Random Characters")
         num_characters = gr.Slider(minimum=1, maximum=10, step=1, value=1, label="Number of Characters (if random)")
@@ -323,7 +322,7 @@ def prompt_generator_app(data_manager):
         # Prepare the list of inputs for the generate_prompt function
         inputs_list = []
         for category_name, var_name in categories:
-            inputs_list.append(inputs[f"{var_name}_num"])
+            inputs_list.append(inputs_sliders[f"{var_name}_num"])
         # Add character_select directly to inputs
         inputs_list.extend([character_select, random_characters, num_characters])
 
@@ -364,158 +363,54 @@ def character_creation_app(data_manager):
         save_button = gr.Button("Save Character")
         output = gr.Textbox(label="Status", interactive=False)
 
-        def save_character(name, traits, image_path, gender, characters_container):
+        characters_renderer = gr.HTML(label="Existing Characters")
+
+        def list_characters():
+            characters = data_manager.get_characters()
+            if not characters:
+                return "<p>No characters created yet.</p>"
+
+            html_content = ""
+            for char in characters:
+                html_content += f"""
+                <div style="border:1px solid #ccc; padding:10px; margin-bottom:10px;">
+                    <h3>{char['name']}</h3>
+                    <p><strong>Gender:</strong> {char['gender']}</p>
+                    <p><strong>Traits:</strong> {', '.join(char['traits'])}</p>
+                </div>
+                """
+            return html_content
+
+        def save_character(name, traits, image_path, gender):
             if not name.strip() or not traits.strip() or not gender:
-                return "Please enter all fields.", None
+                return "Please enter all fields."
+
             # Check for duplicate names
             existing_names = [char['name'] for char in data_manager.get_characters()]
             if name in existing_names:
-                return f"Character with name '{name}' already exists. Please choose a different name.", None
+                return f"Character with name '{name}' already exists. Please choose a different name."
 
             character = {'name': name, 'traits': traits, 'gender': gender, 'image': image_path}
-
             data_manager.add_character(character)
-            # After adding, re-render the character list
-            return f"Character '{name}' saved successfully.", list_characters(data_manager)
+
+            return f"Character '{name}' saved successfully."
 
         save_button.click(
-            save_character, 
-            inputs=[name_input, traits_input, image_input, gender_input, gr.State()],
-            outputs=[output, "characters_renderer"]
+            save_character,
+            inputs=[name_input, traits_input, image_input, gender_input],
+            outputs=output
         )
 
-        # Divider
-        gr.Markdown("---")
-
         # Display Existing Characters
-        gr.Markdown("## Existing Characters")
-
-        # Renderer for characters
-        characters_renderer = gr.Column(label="Characters")
+        refresh_characters_button = gr.Button("Refresh Characters")
+        refresh_characters_button.click(
+            lambda: list_characters(),
+            inputs=None,
+            outputs=characters_renderer
+        )
 
-        def list_characters(data_manager):
-            characters = data_manager.get_characters()
-            if not characters:
-                return gr.Markdown("No characters created yet.")
-            
-            components = []
-            for char in characters:
-                with gr.Accordion(label=char['name'], open=False):
-                    with gr.Row():
-                        if char['image']:
-                            img_display = gr.Image(value=char['image'], label="Character Image", type="filepath", interactive=False)
-                        else:
-                            img_display = gr.Markdown("**No Image Provided**")
-                        with gr.Column():
-                            gr.Markdown(f"**Name:** {char['name']}").render()
-                            gr.Markdown(f"**Gender:** {char['gender']}").render()
-                            gr.Markdown(f"**Traits:** {', '.join(char['traits'])}").render()
-                            with gr.Row():
-                                edit_btn = gr.Button("Edit", variant="primary")
-                                delete_btn = gr.Button("Delete", variant="secondary")
-                            edit_output = gr.Textbox(label="", interactive=False, visible=False)
-                            delete_output = gr.Textbox(label="", interactive=False, visible=False)
-
-                            # Edit Interface (initially hidden)
-                            edit_interface = gr.Column(visible=False)
-                            with edit_interface:
-                                with gr.Row():
-                                    edit_name = gr.Textbox(label="Character Name", value=char['name'], placeholder="Enter new name")
-                                    edit_traits = gr.Textbox(label="Traits/Appearance Tags (comma separated)", value=', '.join(char['traits']), placeholder="e.g., red hair, blue eyes")
-                                edit_image = gr.Image(label="Upload New Character Image", type="filepath")
-                                edit_gender = gr.Radio(choices=["Boy", "Girl"], label="Gender", value=char['gender'])
-                                save_edit_btn = gr.Button("Save Changes")
-                                save_edit_output = gr.Textbox(label="Edit Status", interactive=False)
-
-                                def save_edit(original_name, new_name, new_traits, new_image_path, new_gender):
-                                    if not new_name.strip() or not new_traits.strip() or not new_gender:
-                                        return "Please enter all fields.", None
-                                    # If the name has changed, check for duplicates
-                                    if new_name != original_name:
-                                        existing_names = [c['name'] for c in data_manager.get_characters()]
-                                        if new_name in existing_names:
-                                            return f"Character with name '{new_name}' already exists. Please choose a different name.", None
-                                    updated_char = {
-                                        'name': new_name,
-                                        'traits': new_traits,
-                                        'gender': new_gender,
-                                        'image': new_image_path if new_image_path else data_manager.characters[[c['name'] for c in data_manager.get_characters()].index(original_name)]['image']
-                                    }
-                                    success = data_manager.update_character(original_name, updated_char)
-                                    if success:
-                                        return f"Character '{new_name}' updated successfully.", list_characters(data_manager)
-                                    else:
-                                        return "Failed to update character.", None
-
-                                save_edit_btn.click(
-                                    save_edit, 
-                                    inputs=[gr.State(char['name']), edit_name, edit_traits, edit_image, edit_gender],
-                                    outputs=[save_edit_output, "characters_renderer"]
-                                )
-
-                            # Define edit functionality
-                            def toggle_edit_visibility():
-                                return gr.update(visible=True)
-
-                            edit_btn.click(
-                                lambda: True,
-                                inputs=None,
-                                outputs=edit_interface
-                            )
-
-                            # Define delete functionality
-                            def confirm_delete(char_name):
-                                return f"Are you sure you want to delete '{char_name}'?", True
-
-                            def perform_delete(char_name, confirm):
-                                if confirm:
-                                    success = data_manager.delete_character(char_name)
-                                    if success:
-                                        return f"Character '{char_name}' deleted successfully.", list_characters(data_manager)
-                                    else:
-                                        return f"Failed to delete character '{char_name}'.", None
-                                return "Deletion cancelled.", None
-
-                            delete_btn.click(
-                                confirm_delete,
-                                inputs=[char['name']],
-                                outputs=[delete_output, delete_output]
-                            )
-
-                            delete_confirm = gr.Button("Confirm Delete", visible=False)
-                            delete_cancel = gr.Button("Cancel Delete", visible=False)
-
-                            # Show confirmation buttons when delete is clicked
-                            def show_delete_buttons(message):
-                                if "Are you sure" in message:
-                                    return gr.update(visible=True), gr.update(visible=True)
-                                return gr.update(visible=False), gr.update(visible=False)
-
-                            delete_btn.click(
-                                show_delete_buttons,
-                                inputs=[delete_output],
-                                outputs=[delete_confirm, delete_cancel]
-                            )
-
-                            # Handle delete confirmation
-                            delete_confirm.click(
-                                perform_delete,
-                                inputs=[char['name'], gr.Checkbox(label="", value=True)],
-                                outputs=[delete_output, "characters_renderer"]
-                            )
-
-                            # Handle delete cancellation
-                            delete_cancel.click(
-                                lambda: ("Deletion cancelled.", None),
-                                inputs=None,
-                                outputs=[delete_output, "characters_renderer"]
-                            )
-                return components
-
-        def list_characters_render():
-            return list_characters(data_manager)
-
-        characters_renderer.render(list_characters(data_manager))
+        # Initial load of characters
+        characters_renderer.render(list_characters())
 
 def tags_app(data_manager):
     with gr.Tab("Tags"):
@@ -546,12 +441,12 @@ def tags_app(data_manager):
         save_persistent_tags_button = gr.Button("Save Persistent Tags")
         persistent_status_output = gr.Textbox(label="", interactive=False)
 
-        def save_persistent_tags_fn(tags_string):
+        def save_persistent_tags(tags_string):
             tags_list = [t.strip() for t in tags_string.split(',') if t.strip()]
             data_manager.set_persistent_tags(tags_list)
             return "Persistent tags saved successfully."
 
-        save_persistent_tags_button.click(save_persistent_tags_fn, inputs=persistent_tags_input, outputs=persistent_status_output)
+        save_persistent_tags_button.click(save_persistent_tags, inputs=persistent_tags_input, outputs=persistent_status_output)
 
 def main():
     data_manager = DataManager(base_dir='/data')