Update app.py

app.py

@@ -102,16 +102,21 @@ class DataManager:
 
     def add_character(self, character):
         # Save image to disk and store the filename
-        image_data = character['image']  # This is base64 encoded string
+        image_data = character['image']  # This is the file path
         safe_name = "".join(c for c in character['name'] if c.isalnum() or c in (' ', '_', '-')).rstrip()
         image_filename = f"{safe_name}.png"
         image_path = os.path.join(self.images_folder, image_filename)
 
-        # Decode the base64 image data and save it
+        # Save the image if provided
         if image_data:
-            image = Image.open(io.BytesIO(base64.b64decode(image_data.split(",")[1])))
-            image.save(image_path)
-            character['image_path'] = image_path
+            try:
+                # Copy the uploaded image to the images folder
+                image = Image.open(image_data)
+                image.save(image_path)
+                character['image_path'] = image_path
+            except Exception as e:
+                print(f"Error saving image: {e}")
+                character['image_path'] = None
         else:
             character['image_path'] = None
 
@@ -131,15 +136,18 @@ class DataManager:
             if char['name'] == original_name:
                 # Handle image update
                 if updated_character['image']:
-                    image_data = updated_character['image']  # base64 string
+                    image_path = updated_character['image']  # File path
                     safe_name = "".join(c for c in updated_character['name'] if c.isalnum() or c in (' ', '_', '-')).rstrip()
                     image_filename = f"{safe_name}.png"
-                    image_path = os.path.join(self.images_folder, image_filename)
-
-                    # Decode and save the new image
-                    image = Image.open(io.BytesIO(base64.b64decode(image_data.split(",")[1])))
-                    image.save(image_path)
-                    updated_character['image_path'] = image_path
+                    new_image_path = os.path.join(self.images_folder, image_filename)
+
+                    try:
+                        image = Image.open(image_path)
+                        image.save(new_image_path)
+                        updated_character['image_path'] = new_image_path
+                    except Exception as e:
+                        print(f"Error updating image: {e}")
+                        updated_character['image_path'] = char.get('image_path')
                 else:
                     # If no new image provided, retain the old image_path
                     updated_character['image_path'] = char.get('image_path')
@@ -173,13 +181,13 @@ def character_creation_app(data_manager):
         with gr.Row():
             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="base64")
+        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_data, gender):
+        def save_character(name, traits, image_path, gender):
             if not name or not traits or not gender:
                 return "Please enter all fields."
             # Check for duplicate names
@@ -187,7 +195,7 @@ def character_creation_app(data_manager):
             if name in existing_names:
                 return f"Character with name '{name}' already exists. Please choose a different name."
 
-            character = {'name': name, 'traits': traits, 'gender': gender, 'image': image_data}
+            character = {'name': name, 'traits': traits, 'gender': gender, 'image': image_path}
 
             data_manager.add_character(character)
             return f"Character '{name}' saved successfully."
@@ -210,19 +218,13 @@ def character_creation_app(data_manager):
 
             components = []
             for char in characters:
-                with gr.AccordionItem(label=char['name']):
+                with gr.Accordion(label=char['name'], open=False):
                     with gr.Row():
                         if char['image']:
-                            image = Image.open(char['image'])
-                            image_thumbnail = image.copy()
-                            image_thumbnail.thumbnail((150, 150))
-                            buffered = io.BytesIO()
-                            image_thumbnail.save(buffered, format="PNG")
-                            img_str = base64.b64encode(buffered.getvalue()).decode()
-                            img_data = f"data:image/png;base64,{img_str}"
-                            gr.Image(value=img_data, label="Character Image", width=150).render()
+                            # Display the image using filepath
+                            img_display = gr.Image(value=char['image'], label="Character Image", type="filepath", interactive=False)
                         else:
-                            gr.Markdown("**No Image Provided**").render()
+                            img_display = gr.Markdown("**No Image Provided**")
                         with gr.Column():
                             gr.Markdown(f"**Name:** {char['name']}").render()
                             gr.Markdown(f"**Gender:** {char['gender']}").render()
@@ -233,21 +235,17 @@ def character_creation_app(data_manager):
                             edit_output = gr.Textbox(label="", interactive=False)
                             delete_output = gr.Textbox(label="", interactive=False)
 
-                            # Define edit functionality
-                            def initiate_edit(char_name):
-                                return gr.update(visible=True), char_name
-
-                            edit_interface = gr.Accordion(label=f"Edit {char['name']}", open=False, visible=False)
+                            # Edit Interface (initially hidden)
+                            edit_interface = gr.Row(visible=False)
                             with edit_interface:
-                                with gr.Row():
-                                    edit_name = gr.Textbox(label="Character Name", value=char['name'])
-                                    edit_traits = gr.Textbox(label="Traits/Appearance Tags (comma separated)", value=', '.join(char['traits']))
-                                edit_image = gr.Image(label="Upload New Character Image", type="base64")
+                                edit_name = gr.Textbox(label="Character Name", value=char['name'])
+                                edit_traits = gr.Textbox(label="Traits/Appearance Tags (comma separated)", value=', '.join(char['traits']))
+                                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, new_gender):
+                                def save_edit(original_name, new_name, new_traits, new_image_path, new_gender):
                                     if not new_name or not new_traits or not new_gender:
                                         return "Please enter all fields."
                                     # If the name has changed, check for duplicates
@@ -259,7 +257,7 @@ def character_creation_app(data_manager):
                                         'name': new_name,
                                         'traits': new_traits,
                                         'gender': new_gender,
-                                        'image': new_image
+                                        'image': new_image_path
                                     }
                                     success = data_manager.update_character(original_name, updated_char)
                                     if success:
@@ -273,6 +271,16 @@ def character_creation_app(data_manager):
                                     outputs=save_edit_output
                                 )
 
+                            # Define edit functionality
+                            def toggle_edit_interface(visible, *args):
+                                return gr.update(visible=visible)
+
+                            edit_btn.click(
+                                fn=lambda: gr.update(visible=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}'?"
@@ -319,7 +327,7 @@ def character_creation_app(data_manager):
 
                     components.append("")  # Placeholder for spacing
 
-            return gr.Row(components)
+            return components
 
         characters_container.load(fn=list_characters, outputs=characters_container)
 
@@ -371,7 +379,7 @@ def prompt_generator_app(data_manager):
 
             def refresh_characters():
                 new_options = get_character_options()
-                return gr.update(choices=new_options)
+                return gr.CheckboxGroup.update(choices=new_options)
 
             refresh_characters_button.click(refresh_characters, outputs=character_select)
 
@@ -490,8 +498,8 @@ def prompt_generator_app(data_manager):
                     slider_value = min(1, max_tags)
                 # Update the tag display and slider
                 tag_display, tag_num = tag_displays[var_name]
-                updates.append(gr.update(value=f"**Tags:** {tags_string}"))
-                updates.append(gr.update(maximum=max_tags, value=slider_value))
+                updates.append(gr.Markdown.update(value=f"**Tags:** {tags_string}"))
+                updates.append(gr.Slider.update(maximum=max_tags, value=slider_value))
             return updates
 
         # Prepare the outputs list