Update app.py

app.py

@@ -1,10 +1,7 @@
 # app.py
+
 import gradio as gr
 from bs4 import BeautifulSoup
-import requests
-from sentence_transformers import SentenceTransformer
-import faiss
-import numpy as np
 import asyncio
 import aiohttp
 import re
@@ -12,23 +9,18 @@ import base64
 import logging
 import os
 import sys
-
-# Import OpenAI library
+from sentence_transformers import SentenceTransformer
+import faiss
+import numpy as np
 import openai
 
 # Set up logging to output to the console
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
-
-# Create a console handler
 console_handler = logging.StreamHandler(sys.stdout)
 console_handler.setLevel(logging.INFO)
-
-# Create a formatter and set it for the handler
 formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
 console_handler.setFormatter(formatter)
-
-# Add the handler to the logger
 logger.addHandler(console_handler)
 
 # Initialize models and variables
@@ -289,30 +281,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.", "", [], "", state_bookmarks
 
     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.", "", [], "", state_bookmarks
 
     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.", "", [], "", state_bookmarks
 
     # 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.", "", [], "", state_bookmarks
 
     # Generate summaries and assign categories
     for bookmark in bookmarks:
@@ -323,27 +315,25 @@ 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.", "", [], "", state_bookmarks
 
     message = f"✅ Successfully processed {len(bookmarks)} bookmarks."
     logger.info(message)
     bookmark_html = display_bookmarks(bookmarks)
 
-    # Update the shared state
-    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, choices, bookmarks_html_manage
+    # Return the updated state as the last output
+    return message, bookmark_html, choices, bookmarks_html_manage, bookmarks
 
 # 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]
+    bookmarks = state_bookmarks.copy()
     indices = []
     for s in selected_indices:
         try:
@@ -354,31 +344,40 @@ def delete_selected_bookmarks(selected_indices, state_bookmarks):
                 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:
         logger.info(f"Deleting bookmark at index {idx + 1}")
         bookmarks.pop(idx)
+
     if bookmarks:
         faiss_index, embeddings = vectorize_and_index(bookmarks)
     else:
         faiss_index = None
+
     message = "🗑️ Selected bookmarks deleted successfully."
     logger.info(message)
+
     # Regenerate HTML display
     bookmarks_html = display_bookmarks(bookmarks)
+
     # Update the shared state
-    state_bookmarks[0] = bookmarks
+    state_bookmarks = bookmarks.copy()
+
     # Update choices for selection
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
+
     return message, gr.update(choices=choices), bookmarks_html
 
 # Edit category of selected bookmarks
 def edit_selected_bookmarks_category(selected_indices, new_category, state_bookmarks):
     if not selected_indices:
-        return "⚠️ No bookmarks selected.", gr.update(choices=[]), ""
+        return "⚠️ No bookmarks selected.", gr.update(choices=[f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(state_bookmarks)]), display_bookmarks(state_bookmarks)
+
     if not new_category:
-        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]
+        return "⚠️ No new category selected.", gr.update(choices=[f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(state_bookmarks)]), display_bookmarks(state_bookmarks)
+
+    bookmarks = state_bookmarks.copy()
     indices = []
     for s in selected_indices:
         try:
@@ -389,22 +388,28 @@ def edit_selected_bookmarks_category(selected_indices, new_category, state_bookm
                 logger.warning(f"Index out of range: {idx + 1}")
         except ValueError:
             logger.error(f"Invalid selection format: {s}")
+
     for idx in indices:
         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
     bookmarks_html = display_bookmarks(bookmarks)
+
     # Update the shared state
-    state_bookmarks[0] = bookmarks
+    state_bookmarks = bookmarks.copy()
+
     # Update choices for selection
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
+
     return message, gr.update(choices=choices), bookmarks_html
 
 # Export bookmarks to HTML
 def export_bookmarks(state_bookmarks):
-    bookmarks = state_bookmarks[0]
+    bookmarks = state_bookmarks
     if not bookmarks:
         logger.warning("No bookmarks to export")
         return "⚠️ No bookmarks to export."
@@ -436,7 +441,7 @@ def chatbot_response(user_query, state_bookmarks):
         logger.warning("GROQ_API_KEY not set.")
         return "⚠️ API key not set. Please set the GROQ_API_KEY environment variable in the Hugging Face Space settings."
 
-    bookmarks = state_bookmarks[0]
+    bookmarks = state_bookmarks
     if not bookmarks:
         logger.warning("No bookmarks available for chatbot")
         return "⚠️ No bookmarks available. Please upload and process your bookmarks first."
@@ -545,7 +550,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, bookmark_selector, bookmark_display_manage]
+                    outputs=[output_text, bookmark_display, bookmark_selector, bookmark_display_manage, state_bookmarks]
                 )
 
             # Chat with Bookmarks Tab