Update app.py

app.py

@@ -290,29 +290,30 @@ def process_uploaded_file(file, state_bookmarks):
     logger.info("Processing uploaded file")
     if file is None:
         logger.warning("No file uploaded")
-        return "⚠️ Please upload a bookmarks HTML file.", ""
+        return "⚠️ Please upload a bookmarks HTML file.", "", [], ""
+
     try:
         file_content = file.decode('utf-8')
     except UnicodeDecodeError as e:
         logger.error(f"Error decoding the file: {e}")
-        return "⚠️ Error decoding the file. Please ensure it's a valid HTML file.", ""
+        return "⚠️ Error decoding the file. Please ensure it's a valid HTML file.", "", [], ""
 
     try:
         bookmarks = parse_bookmarks(file_content)
     except Exception as e:
         logger.error(f"Error parsing bookmarks: {e}")
-        return "⚠️ Error parsing the bookmarks HTML file.", ""
+        return "⚠️ Error parsing the bookmarks HTML file.", "", [], ""
 
     if not bookmarks:
         logger.warning("No bookmarks found in the uploaded file")
-        return "⚠️ No bookmarks found in the uploaded file.", ""
+        return "⚠️ No bookmarks found in the uploaded file.", "", [], ""
 
     # Asynchronously fetch bookmark info
     try:
         asyncio.run(process_bookmarks_async(bookmarks))
     except Exception as e:
         logger.error(f"Error processing bookmarks asynchronously: {e}")
-        return "⚠️ Error processing bookmarks.", ""
+        return "⚠️ Error processing bookmarks.", "", [], ""
 
     # Generate summaries and assign categories
     for bookmark in bookmarks:
@@ -323,28 +324,40 @@ def process_uploaded_file(file, state_bookmarks):
         faiss_index, embeddings = vectorize_and_index(bookmarks)
     except Exception as e:
         logger.error(f"Error building FAISS index: {e}")
-        return "⚠️ Error building search index.", ""
+        return "⚠️ Error building search index.", "", [], ""
 
     message = f"✅ Successfully processed {len(bookmarks)} bookmarks."
     logger.info(message)
     bookmark_html = display_bookmarks(bookmarks)
 
     # Update the shared state
-    state_bookmarks.append(bookmarks)
+    state_bookmarks[0] = bookmarks
+
+    # Prepare Manage Bookmarks tab outputs
+    choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
+    bookmarks_html_manage = display_bookmarks(bookmarks)
 
-    return message, bookmark_html
+    return message, bookmark_html, choices, bookmarks_html_manage
 
 # Delete selected bookmarks
 def delete_selected_bookmarks(selected_indices, state_bookmarks):
     if not selected_indices:
         return "⚠️ No bookmarks selected.", gr.update(choices=[]), ""
     bookmarks = state_bookmarks[0]
-    indices = [int(s.split('.')[0])-1 for s in selected_indices]
+    indices = []
+    for s in selected_indices:
+        try:
+            idx = int(s.split('.')[0]) - 1
+            if 0 <= idx < len(bookmarks):
+                indices.append(idx)
+            else:
+                logger.warning(f"Index out of range: {idx + 1}")
+        except ValueError:
+            logger.error(f"Invalid selection format: {s}")
     indices = sorted(indices, reverse=True)
     for idx in indices:
-        if 0 <= idx < len(bookmarks):
-            logger.info(f"Deleting bookmark at index {idx + 1}")
-            bookmarks.pop(idx)
+        logger.info(f"Deleting bookmark at index {idx + 1}")
+        bookmarks.pop(idx)
     if bookmarks:
         faiss_index, embeddings = vectorize_and_index(bookmarks)
     else:
@@ -362,15 +375,23 @@ def delete_selected_bookmarks(selected_indices, state_bookmarks):
 # Edit category of selected bookmarks
 def edit_selected_bookmarks_category(selected_indices, new_category, state_bookmarks):
     if not selected_indices:
-        return "⚠️ No bookmarks selected.", "", ""
+        return "⚠️ No bookmarks selected.", gr.update(choices=[]), ""
     if not new_category:
-        return "⚠️ No new category selected.", "", ""
+        return "⚠️ No new category selected.", gr.update(choices=[f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(state_bookmarks[0])]), display_bookmarks(state_bookmarks[0])
     bookmarks = state_bookmarks[0]
-    indices = [int(s.split('.')[0])-1 for s in selected_indices]
+    indices = []
+    for s in selected_indices:
+        try:
+            idx = int(s.split('.')[0]) - 1
+            if 0 <= idx < len(bookmarks):
+                indices.append(idx)
+            else:
+                logger.warning(f"Index out of range: {idx + 1}")
+        except ValueError:
+            logger.error(f"Invalid selection format: {s}")
     for idx in indices:
-        if 0 <= idx < len(bookmarks):
-            bookmarks[idx]['category'] = new_category
-            logger.info(f"Updated category for bookmark {idx + 1} to {new_category}")
+        bookmarks[idx]['category'] = new_category
+        logger.info(f"Updated category for bookmark {idx + 1} to {new_category}")
     message = "✏️ Category updated for selected bookmarks."
     logger.info(message)
     # Regenerate HTML display
@@ -520,7 +541,7 @@ Navigate through the tabs to explore each feature in detail.
                 process_button.click(
                     process_uploaded_file,
                     inputs=[upload, state_bookmarks],
-                    outputs=[output_text, bookmark_display]
+                    outputs=[output_text, bookmark_display, "bookmark_selector", "bookmark_display_manage"]  # Added outputs for Manage Bookmarks
                 )
 
             # Chat with Bookmarks Tab
@@ -558,14 +579,14 @@ Navigate through the tabs to explore each feature in detail.
                 chat_input.submit(
                     send_message,
                     inputs=[chat_input, chat_history, state_bookmarks],
-                    outputs=[chat_history_display, chat_history_display]
+                    outputs=[chat_history_display, chat_history]
                 )
 
                 # When user clicks Send button
                 chat_button.click(
                     send_message,
                     inputs=[chat_input, chat_history, state_bookmarks],
-                    outputs=[chat_history_display, chat_history_display]
+                    outputs=[chat_history_display, chat_history]
                 )
 
             # Manage Bookmarks Tab
@@ -605,22 +626,6 @@ Navigate through the tabs to explore each feature in detail.
                 bookmark_display_manage = gr.HTML(label="📄 Manage Bookmarks Display")
                 refresh_button = gr.Button("🔄 Refresh Bookmarks")
 
-                # Function to refresh Manage Bookmarks Tab
-                def refresh_manage_tab(state_bookmarks):
-                    bookmarks = state_bookmarks[0]
-                    if bookmarks:
-                        choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
-                        bookmarks_html = display_bookmarks(bookmarks)
-                        return choices, bookmarks_html
-                    else:
-                        return [], ""
-
-                refresh_button.click(
-                    refresh_manage_tab,
-                    inputs=[state_bookmarks],
-                    outputs=[bookmark_selector, bookmark_display_manage]
-                )
-
                 # Define button actions
                 delete_button.click(
                     delete_selected_bookmarks,
@@ -641,7 +646,9 @@ Navigate through the tabs to explore each feature in detail.
                 )
 
                 refresh_button.click(
-                    refresh_manage_tab,
+                    lambda bookmarks: ([
+                        f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)
+                    ], display_bookmarks(bookmarks)),
                     inputs=[state_bookmarks],
                     outputs=[bookmark_selector, bookmark_display_manage]
                 )