Update app.py

app.py

@@ -36,7 +36,6 @@ logger.addHandler(console_handler)
 logger.info("Initializing models and variables")
 embedding_model = SentenceTransformer('all-MiniLM-L6-v2')
 faiss_index = None
-bookmarks = []
 fetch_cache = {}
 
 # Define the categories
@@ -234,10 +233,10 @@ def vectorize_and_index(bookmarks):
         raise
 
 # Generate HTML display for bookmarks
-def display_bookmarks():
+def display_bookmarks(bookmarks_list):
     logger.info("Generating HTML display for bookmarks")
     cards = ''
-    for i, bookmark in enumerate(bookmarks):
+    for i, bookmark in enumerate(bookmarks_list):
         index = i + 1  # Start index at 1
         status = "❌ Dead Link" if bookmark.get('dead_link') else "✅ Active"
         title = bookmark['title']
@@ -253,7 +252,7 @@ def display_bookmarks():
             card_classes = "card active-link"
 
         card_html = f'''
-        <div class="{card_classes}" style="padding: 10px; margin: 10px; border-radius: 5px;">
+        <div class="{card_classes}">
             <div class="card-content">
                 <h3>{index}. {title} {status}</h3>
                 <p><strong>Category:</strong> {category}</p>
@@ -268,34 +267,33 @@ def display_bookmarks():
     return cards
 
 # Process the uploaded file
-def process_uploaded_file(file):
-    global bookmarks, faiss_index
+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.", '', gr.update(choices=[]), display_bookmarks()
+        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.", '', gr.update(choices=[]), display_bookmarks()
+        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.", '', gr.update(choices=[]), display_bookmarks()
+        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.", '', gr.update(choices=[]), display_bookmarks()
+        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.", '', gr.update(choices=[]), display_bookmarks()
+        return "⚠️ Error processing bookmarks.", ""
 
     # Generate summaries and assign categories
     for bookmark in bookmarks:
@@ -306,26 +304,22 @@ def process_uploaded_file(file):
         faiss_index, embeddings = vectorize_and_index(bookmarks)
     except Exception as e:
         logger.error(f"Error building FAISS index: {e}")
-        return "⚠️ Error building search index.", '', gr.update(choices=[]), display_bookmarks()
+        return "⚠️ Error building search index.", ""
 
     message = f"✅ Successfully processed {len(bookmarks)} bookmarks."
     logger.info(message)
-    bookmark_html = display_bookmarks()
+    bookmark_html = display_bookmarks(bookmarks)
 
-    # Update bookmark_selector choices
-    choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
-    bookmark_selector_update = gr.update(choices=choices, value=[])
-
-    # Update bookmark_display_manage
-    bookmark_display_manage_update = display_bookmarks()
+    # Update the shared state
+    state_bookmarks.append(bookmarks)
 
-    return message, bookmark_html, bookmark_selector_update, bookmark_display_manage_update
+    return message, bookmark_html
 
 # Delete selected bookmarks
-def delete_selected_bookmarks(selected_indices):
-    global bookmarks, faiss_index
+def delete_selected_bookmarks(selected_indices, state_bookmarks):
     if not selected_indices:
-        return "⚠️ No bookmarks selected.", gr.update(choices=[]), display_bookmarks()
+        return "⚠️ No bookmarks selected.", gr.update(choices=[]), ""
+    bookmarks = state_bookmarks[0]
     indices = [int(s.split('.')[0])-1 for s in selected_indices]
     indices = sorted(indices, reverse=True)
     for idx in indices:
@@ -338,19 +332,21 @@ def delete_selected_bookmarks(selected_indices):
         faiss_index = None
     message = "🗑️ Selected bookmarks deleted successfully."
     logger.info(message)
-    # Update bookmark_selector choices
+    # Regenerate HTML display
+    bookmarks_html = display_bookmarks(bookmarks)
+    # Update the shared state
+    state_bookmarks[0] = bookmarks
+    # Update choices for selection
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
-    bookmark_selector_update = gr.update(choices=choices, value=[])
-    # Update bookmarks display
-    bookmarks_html = display_bookmarks()
-    return message, bookmark_selector_update, bookmarks_html
+    return message, gr.update(choices=choices), bookmarks_html
 
 # Edit category of selected bookmarks
-def edit_selected_bookmarks_category(selected_indices, new_category):
+def edit_selected_bookmarks_category(selected_indices, new_category, state_bookmarks):
     if not selected_indices:
-        return "⚠️ No bookmarks selected.", '', gr.update()
+        return "⚠️ No bookmarks selected.", "", ""
     if not new_category:
-        return "⚠️ No new category selected.", '', gr.update()
+        return "⚠️ No new category selected.", "", ""
+    bookmarks = state_bookmarks[0]
     indices = [int(s.split('.')[0])-1 for s in selected_indices]
     for idx in indices:
         if 0 <= idx < len(bookmarks):
@@ -358,15 +354,17 @@ def edit_selected_bookmarks_category(selected_indices, new_category):
             logger.info(f"Updated category for bookmark {idx + 1} to {new_category}")
     message = "✏️ Category updated for selected bookmarks."
     logger.info(message)
-    # Update bookmark_selector choices
+    # Regenerate HTML display
+    bookmarks_html = display_bookmarks(bookmarks)
+    # Update the shared state
+    state_bookmarks[0] = bookmarks
+    # Update choices for selection
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
-    bookmark_selector_update = gr.update(choices=choices, value=[])
-    # Update bookmarks display
-    bookmarks_html = display_bookmarks()
-    return message, bookmark_selector_update, bookmarks_html
+    return message, gr.update(choices=choices), bookmarks_html
 
 # Export bookmarks to HTML
-def export_bookmarks():
+def export_bookmarks(state_bookmarks):
+    bookmarks = state_bookmarks[0]
     if not bookmarks:
         logger.warning("No bookmarks to export")
         return "⚠️ No bookmarks to export."
@@ -393,11 +391,12 @@ def export_bookmarks():
         return "⚠️ Error exporting bookmarks."
 
 # Chatbot response using Groq Cloud API
-def chatbot_response(user_query):
+def chatbot_response(user_query, state_bookmarks):
     if not GROQ_API_KEY:
         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]
     if not bookmarks:
         logger.warning("No bookmarks available for chatbot")
         return "⚠️ No bookmarks available. Please upload and process your bookmarks first."
@@ -452,6 +451,9 @@ def build_app():
     try:
         logger.info("Building Gradio app")
         with gr.Blocks(theme=gr.themes.Default(), css="app.css") as demo:
+            # Shared state to store bookmarks
+            state_bookmarks = gr.State([])
+
             # General Overview
             gr.Markdown("""
             # 📚 SmartMarks - AI Browser Bookmarks Manager
@@ -495,14 +497,10 @@ def build_app():
                 output_text = gr.Textbox(label="✅ Output", interactive=False)
                 bookmark_display = gr.HTML(label="📄 Bookmarks")
 
-                # Initialize Manage Bookmarks components
-                bookmark_selector = gr.CheckboxGroup(label="✅ Select Bookmarks", choices=[])
-                bookmark_display_manage = gr.HTML(label="📄 Manage Bookmarks Display")
-
                 process_button.click(
                     process_uploaded_file,
-                    inputs=upload,
-                    outputs=[output_text, bookmark_display, bookmark_selector, bookmark_display_manage]
+                    inputs=[upload, state_bookmarks],
+                    outputs=[output_text, bookmark_display]
                 )
 
             # Chat with Bookmarks Tab
@@ -528,7 +526,7 @@ def build_app():
 
                 chat_button.click(
                     chatbot_response,
-                    inputs=user_input,
+                    inputs=[user_input, state_bookmarks],
                     outputs=chat_output
                 )
 
@@ -559,44 +557,53 @@ def build_app():
                 """)
 
                 manage_output = gr.Textbox(label="🔄 Manage Output", interactive=False)
-                bookmark_display_manage = gr.HTML(label="📄 Manage Bookmarks Display")
                 bookmark_selector = gr.CheckboxGroup(label="✅ Select Bookmarks", choices=[])
-
                 new_category_input = gr.Dropdown(label="🆕 New Category", choices=CATEGORIES, value="Uncategorized")
                 with gr.Row():
                     delete_button = gr.Button("🗑️ Delete Selected Bookmarks")
                     edit_category_button = gr.Button("✏️ Edit Category of Selected Bookmarks")
                     export_button = gr.Button("💾 Export Bookmarks")
                 download_link = gr.HTML(label="📥 Download Exported Bookmarks")
+                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,
-                    inputs=bookmark_selector,
+                    inputs=[bookmark_selector, state_bookmarks],
                     outputs=[manage_output, bookmark_selector, bookmark_display_manage]
                 )
 
                 edit_category_button.click(
                     edit_selected_bookmarks_category,
-                    inputs=[bookmark_selector, new_category_input],
+                    inputs=[bookmark_selector, new_category_input, state_bookmarks],
                     outputs=[manage_output, bookmark_selector, bookmark_display_manage]
                 )
 
                 export_button.click(
                     export_bookmarks,
-                    inputs=None,
+                    inputs=[state_bookmarks],
                     outputs=download_link
                 )
 
-                # Initialize display after processing bookmarks
-                process_button.click(
-                    process_uploaded_file,
-                    inputs=upload,
-                    outputs=[output_text, bookmark_display, bookmark_selector, bookmark_display_manage]
-                )
-
-        logger.info("Launching Gradio app")
-        demo.launch(debug=True)
+            logger.info("Launching Gradio app")
+            demo.launch(debug=True)
     except Exception as e:
         logger.error(f"Error building the app: {e}")
         print(f"Error building the app: {e}")