Update app.py

app.py

@@ -135,9 +135,6 @@ with gr.Blocks() as demo:
     datasets = gr.State({})
     current_dataset_name = gr.State("")
     current_page_number = gr.State(0)
-    
-    # Define entry_selector here but do not place it in the interface yet
-    entry_selector = gr.Dropdown(label="Select Entry to Edit/Delete")
 
     # Top-level components
     with gr.Column():
@@ -152,7 +149,7 @@ with gr.Blocks() as demo:
             prev_button = gr.Button("Previous Page")
             next_button = gr.Button("Next Page")
 
-    # Tabs as before
+    # Tabs
     with gr.Tabs():
         with gr.TabItem("Create / Upload Dataset"):
             with gr.Row():
@@ -204,9 +201,9 @@ with gr.Blocks() as demo:
 
             def add_entry(image_data, prompt, current_dataset_name, datasets):
                 if not current_dataset_name:
-                    return datasets, gr.update(), gr.update(), gr.update(), "No dataset selected."
+                    return datasets, gr.update(), gr.update(), "No dataset selected."
                 if image_data is None or not prompt:
-                    return datasets, gr.update(), gr.update(), gr.update(), "Please provide both an image and a prompt."
+                    return datasets, gr.update(), gr.update(), "Please provide both an image and a prompt."
                 # Convert image_data to base64
                 image = Image.fromarray(image_data.astype('uint8'))
                 buffered = BytesIO()
@@ -218,22 +215,20 @@ with gr.Blocks() as demo:
                 # Reset page number to 0 when a new entry is added
                 page_number = 0
                 html_content = display_dataset_html(dataset, page_number=page_number)
-                # Update entry_selector options
-                entry_options = [f"{idx}: {entry['prompt'][:30]}" for idx, entry in enumerate(dataset)]
-                return datasets, page_number, gr.update(value=html_content), gr.update(choices=entry_options), f"Entry added to dataset '{current_dataset_name}'."
+                return datasets, page_number, gr.update(value=html_content), f"Entry added to dataset '{current_dataset_name}'."
 
             add_button.click(
                 add_entry,
                 inputs=[image_input, prompt_input, current_dataset_name, datasets],
-                outputs=[datasets, current_page_number, dataset_html, entry_selector, message_box]
+                outputs=[datasets, current_page_number, dataset_html, message_box]
             )
 
         with gr.TabItem("Edit / Delete Entry"):
             with gr.Column():
                 selected_image = gr.Image(label="Selected Image", interactive=False, type="numpy")
                 selected_prompt = gr.Textbox(label="Current Prompt", interactive=False)
-                # Include entry_selector in the layout
-                entry_selector
+                # Define entry_selector here
+                entry_selector = gr.Dropdown(label="Select Entry to Edit/Delete")
                 new_prompt_input = gr.Textbox(label="New Prompt (for Edit)")
                 with gr.Row():
                     edit_button = gr.Button("Edit Entry")
@@ -260,16 +255,16 @@ with gr.Blocks() as demo:
 
             def edit_entry(entry_option, new_prompt, current_dataset_name, datasets, current_page_number):
                 if not current_dataset_name:
-                    return datasets, gr.update(), gr.update(), gr.update(), gr.update(), "No dataset selected."
+                    return datasets, gr.update(), gr.update(), gr.update(), f"No dataset selected."
                 if not entry_option or not new_prompt.strip():
-                    return datasets, gr.update(), gr.update(), gr.update(), gr.update(), "Please select an entry and provide a new prompt."
+                    return datasets, gr.update(), gr.update(), gr.update(), f"Please select an entry and provide a new prompt."
                 index = int(entry_option.split(":")[0])
                 datasets[current_dataset_name][index]['prompt'] = new_prompt
                 dataset = datasets[current_dataset_name]
                 html_content = display_dataset_html(dataset, page_number=current_page_number)
                 # Update entry_selector options
                 entry_options = [f"{idx}: {entry['prompt'][:30]}" for idx, entry in enumerate(dataset)]
-                return datasets, gr.update(value=html_content), gr.update(choices=entry_options), gr.update(value=""), gr.update(), f"Entry {index} updated."
+                return datasets, gr.update(value=html_content), gr.update(choices=entry_options), gr.update(value=""), f"Entry {index} updated."
 
             edit_button.click(
                 edit_entry,
@@ -279,21 +274,44 @@ with gr.Blocks() as demo:
 
             def delete_entry(entry_option, current_dataset_name, datasets, current_page_number):
                 if not current_dataset_name:
-                    return datasets, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), "No dataset selected."
+                    return datasets, gr.update(), gr.update(), gr.update(), gr.update(), "No dataset selected."
                 if not entry_option:
-                    return datasets, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), "Please select an entry to delete."
+                    return datasets, gr.update(), gr.update(), gr.update(), gr.update(), "Please select an entry to delete."
                 index = int(entry_option.split(":")[0])
                 del datasets[current_dataset_name][index]
                 dataset = datasets[current_dataset_name]
                 html_content = display_dataset_html(dataset, page_number=current_page_number)
                 # Update entry_selector options
                 entry_options = [f"{idx}: {entry['prompt'][:30]}" for idx, entry in enumerate(dataset)]
-                return datasets, gr.update(value=html_content), gr.update(choices=entry_options), gr.update(value=None), gr.update(value=""), f"Entry {index} deleted."
+                return datasets, gr.update(value=html_content), gr.update(choices=entry_options), gr.update(value=None), f"Entry {index} deleted."
 
             delete_button.click(
                 delete_entry,
                 inputs=[entry_selector, current_dataset_name, datasets, current_page_number],
-                outputs=[datasets, dataset_html, entry_selector, selected_image, selected_prompt, message_box]
+                outputs=[datasets, dataset_html, entry_selector, selected_image, message_box]
+            )
+
+            # Function to update entry_selector options
+            def update_entry_selector(current_dataset_name, datasets):
+                if current_dataset_name in datasets:
+                    dataset = datasets[current_dataset_name]
+                    entry_options = [f"{idx}: {entry['prompt'][:30]}" for idx, entry in enumerate(dataset)]
+                    return gr.update(choices=entry_options)
+                else:
+                    return gr.update(choices=[])
+
+            # Update entry_selector when dataset is selected
+            dataset_selector.change(
+                update_entry_selector,
+                inputs=[current_dataset_name, datasets],
+                outputs=[entry_selector]
+            )
+
+            # Also update entry_selector when an entry is added in "Add Entry" tab
+            add_button.click(
+                update_entry_selector,
+                inputs=[current_dataset_name, datasets],
+                outputs=[entry_selector]
             )
 
         with gr.TabItem("Download Dataset"):
@@ -323,16 +341,14 @@ with gr.Blocks() as demo:
         if dataset_name in datasets:
             dataset = datasets[dataset_name]
             html_content = display_dataset_html(dataset, page_number=0)
-            # Update entry_selector options
-            entry_options = [f"{idx}: {entry['prompt'][:30]}" for idx, entry in enumerate(dataset)]
-            return dataset_name, 0, gr.update(value=html_content), gr.update(choices=entry_options), ""
+            return dataset_name, 0, gr.update(value=html_content), f"Dataset '{dataset_name}' selected."
         else:
-            return "", 0, gr.update(value="<div>Select a dataset.</div>"), gr.update(choices=[]), ""
+            return "", 0, gr.update(value="<div>Select a dataset.</div>"), ""
 
     dataset_selector.change(
         select_dataset,
         inputs=[dataset_selector, datasets],
-        outputs=[current_dataset_name, current_page_number, dataset_html, entry_selector, message_box]
+        outputs=[current_dataset_name, current_page_number, dataset_html, message_box]
     )
 
     def change_page(action, current_page_number, datasets, current_dataset_name):
@@ -361,14 +377,14 @@ with gr.Blocks() as demo:
         outputs=[current_page_number, dataset_html, message_box]
     )
 
-    # Initialize dataset_selector and entry_selector
+    # Initialize dataset_selector
     def initialize_components(datasets):
-        return gr.update(choices=list(datasets.keys())), gr.update(choices=[])
+        return gr.update(choices=list(datasets.keys()))
 
     demo.load(
         initialize_components,
         inputs=[datasets],
-        outputs=[dataset_selector, entry_selector]
+        outputs=[dataset_selector]
     )
 
 demo.launch()