Update app.py

app.py

@@ -632,7 +632,7 @@ def assign_category(bookmark):
     else:
         bookmark['category'] = 'Uncategorized'
 
-def process_uploaded_file(file):
+def process_uploaded_file(file, delete_checkbox, edit_checkbox):
     """
     Process the uploaded bookmarks file with enhanced error handling and user feedback.
     """
@@ -640,23 +640,23 @@ def process_uploaded_file(file):
     logger.info("Processing uploaded file")
     
     if file is None:
-        return "⚠️ Please upload a bookmarks HTML file.", '', gr.update(choices=[]), display_bookmarks()
-
+        return "⚠️ Please upload a bookmarks HTML file.", '', gr.Dropdown.update(choices=[]), gr.Dropdown.update(choices=[])
+    
     try:
         file_content = file.decode('utf-8')
     except UnicodeDecodeError as e:
         logger.error(f"Error decoding file: {e}")
-        return "⚠️ Error decoding file. Please ensure it's a valid HTML file.", '', gr.update(choices=[]), display_bookmarks()
-
+        return "⚠️ Error decoding file. Please ensure it's a valid HTML file.", '', gr.Dropdown.update(choices=[]), gr.Dropdown.update(choices=[])
+    
     try:
         bookmarks = parse_bookmarks(file_content)
     except Exception as e:
         logger.error(f"Error parsing bookmarks: {e}")
-        return "⚠️ Error parsing the bookmarks file.", '', gr.update(choices=[]), display_bookmarks()
-
+        return "⚠️ Error parsing the bookmarks file.", '', gr.Dropdown.update(choices=[]), gr.Dropdown.update(choices=[])
+    
     if not bookmarks:
-        return "⚠️ No valid bookmarks found in the file.", '', gr.update(choices=[]), display_bookmarks()
-
+        return "⚠️ No valid bookmarks found in the file.", '', gr.Dropdown.update(choices=[]), gr.Dropdown.update(choices=[])
+    
     try:
         logger.info("Processing bookmarks...")
         asyncio.run(process_bookmarks_async(bookmarks))
@@ -675,20 +675,20 @@ def process_uploaded_file(file):
                   for i, bookmark in enumerate(bookmarks)]
         
         bookmark_html = display_bookmarks()
-        return message, bookmark_html, gr.update(choices=choices), bookmark_html
+        return message, bookmark_html, gr.CheckboxGroup.update(choices=choices), gr.CheckboxGroup.update(choices=choices)
 
     except Exception as e:
         logger.error(f"Error processing bookmarks: {e}")
-        return "⚠️ Error processing bookmarks. Please try again.", '', gr.update(choices=[]), display_bookmarks()
+        return "⚠️ Error processing bookmarks. Please try again.", '', gr.CheckboxGroup.update(choices=[]), gr.CheckboxGroup.update(choices=[])
 
-def delete_selected_bookmarks(selected_indices):
+def delete_selected_bookmarks(selected_indices, delete_checkbox, edit_checkbox):
     """
     Delete selected bookmarks with enhanced error handling.
     """
     global bookmarks, faiss_index
     
     if not selected_indices:
-        return "⚠️ No bookmarks selected.", gr.update(choices=[]), display_bookmarks()
+        return "⚠️ No bookmarks selected.", gr.CheckboxGroup.update(choices=[]), gr.CheckboxGroup.update(choices=[]), display_bookmarks()
 
     try:
         indices = [int(s.split('.')[0])-1 for s in selected_indices]
@@ -710,19 +710,19 @@ def delete_selected_bookmarks(selected_indices):
         choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" 
                   for i, bookmark in enumerate(bookmarks)]
         
-        return message, gr.update(choices=choices), display_bookmarks()
+        return message, gr.CheckboxGroup.update(choices=choices), gr.CheckboxGroup.update(choices=choices), display_bookmarks()
     except Exception as e:
         logger.error(f"Error deleting bookmarks: {e}")
-        return "⚠️ Error deleting bookmarks.", gr.update(choices=[]), display_bookmarks()
+        return "⚠️ Error deleting bookmarks.", gr.CheckboxGroup.update(choices=[]), gr.CheckboxGroup.update(choices=[]), display_bookmarks()
 
-def edit_selected_bookmarks_category(selected_indices, new_category):
+def edit_selected_bookmarks_category(selected_indices, new_category, delete_checkbox, edit_checkbox):
     """
     Edit category of selected bookmarks with enhanced error handling.
     """
     if not selected_indices:
-        return "⚠️ No bookmarks selected.", gr.update(choices=[]), display_bookmarks()
+        return "⚠️ No bookmarks selected.", gr.CheckboxGroup.update(choices=[]), gr.CheckboxGroup.update(choices=[]), display_bookmarks()
     if not new_category:
-        return "⚠️ No new category selected.", gr.update(choices=[]), display_bookmarks()
+        return "⚠️ No new category selected.", gr.CheckboxGroup.update(choices=[]), gr.CheckboxGroup.update(choices=[]), display_bookmarks()
 
     try:
         indices = [int(s.split('.')[0])-1 for s in selected_indices]
@@ -739,10 +739,10 @@ def edit_selected_bookmarks_category(selected_indices, new_category):
         choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" 
                   for i, bookmark in enumerate(bookmarks)]
         
-        return message, gr.update(choices=choices), display_bookmarks()
+        return message, gr.CheckboxGroup.update(choices=choices), gr.CheckboxGroup.update(choices=choices), display_bookmarks()
     except Exception as e:
         logger.error(f"Error updating categories: {e}")
-        return "⚠️ Error updating categories.", gr.update(choices=[]), display_bookmarks()
+        return "⚠️ Error updating categories.", gr.CheckboxGroup.update(choices=[]), gr.CheckboxGroup.update(choices=[]), display_bookmarks()
 
 def export_bookmarks():
     """
@@ -794,9 +794,9 @@ def export_bookmarks():
             # Add bookmark
             dt = soup.new_tag('DT')
             a = soup.new_tag('A', href=bookmark['url'])
-            if 'add_date' in bookmark:
+            if 'add_date' in bookmark and bookmark['add_date']:
                 a['ADD_DATE'] = bookmark['add_date']
-            if 'icon' in bookmark:
+            if 'icon' in bookmark and bookmark['icon']:
                 a['ICON'] = bookmark['icon']
             a.string = bookmark['title']
             dt.append(a)
@@ -918,6 +918,10 @@ def build_app():
                     delete_button = gr.Button("Delete Selected Bookmarks")
                     export_button = gr.Button("Export Bookmarks")
                     
+                    # Define CheckboxGroups and assign to variables
+                    delete_checkbox = gr.CheckboxGroup(label="Select Bookmarks to Delete", choices=[])
+                    edit_checkbox = gr.CheckboxGroup(label="Select Bookmarks to Edit", choices=[])
+                    
                 with gr.Column():
                     bookmarks_display = gr.HTML(label="Bookmarks")
             
@@ -928,25 +932,22 @@ def build_app():
             # Processing File
             process_button.click(
                 fn=process_uploaded_file,
-                inputs=file_input,
-                outputs=[process_message, bookmarks_display, gr.Dropdown.update(), bookmarks_display]
+                inputs=[file_input, delete_checkbox, edit_checkbox],
+                outputs=[process_message, bookmarks_display, delete_checkbox, edit_checkbox]
             )
             
             # Deleting Bookmarks
             delete_button.click(
                 fn=delete_selected_bookmarks,
-                inputs=gr.CheckboxGroup(label="Select Bookmarks to Delete", choices=[]),
-                outputs=[process_message, gr.Dropdown.update(), bookmarks_display]
+                inputs=[delete_checkbox, edit_checkbox],
+                outputs=[process_message, delete_checkbox, edit_checkbox, bookmarks_display]
             )
             
             # Editing Categories
             edit_button.click(
                 fn=edit_selected_bookmarks_category,
-                inputs=[
-                    gr.CheckboxGroup(label="Select Bookmarks to Edit", choices=[]),
-                    category_dropdown
-                ],
-                outputs=[process_message, gr.Dropdown.update(), bookmarks_display]
+                inputs=[edit_checkbox, category_dropdown, delete_checkbox, edit_checkbox],
+                outputs=[process_message, delete_checkbox, edit_checkbox, bookmarks_display]
             )
             
             # Exporting Bookmarks