Update app.py

app.py

@@ -2,10 +2,6 @@
 
 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
@@ -13,6 +9,9 @@ import base64
 import logging
 import os
 import sys
+from sentence_transformers import SentenceTransformer
+import faiss
+import numpy as np
 
 # Import OpenAI library
 import openai
@@ -36,7 +35,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 +232,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']
@@ -246,16 +244,16 @@ def display_bookmarks():
         summary = bookmark.get('summary', '')
         category = bookmark.get('category', 'Uncategorized')
 
-        # Apply inline styles for dead links
+        # Assign CSS classes based on bookmark status
         if bookmark.get('dead_link'):
-            card_style = "border: 2px solid #D32F2F;"
-            text_style = "color: #D32F2F;"
+            card_classes = "card dead-link"
+            text_style = "color: #D32F2F;"  # Red color for dead links
         else:
-            card_style = "border: 2px solid #4CAF50;"
-            text_style = "color: #000000;"
+            card_classes = "card active-link"
+            text_style = "color: #000000;"  # Black color for active links
 
         card_html = f'''
-        <div class="card" style="{card_style}; padding: 10px; margin: 10px; border-radius: 5px;">
+        <div class="{card_classes}" style="border: 2px solid; padding: 10px; margin: 10px; border-radius: 5px;">
             <div class="card-content">
                 <h3 style="{text_style}">{index}. {title} {status}</h3>
                 <p style="{text_style}"><strong>Category:</strong> {category}</p>
@@ -270,34 +268,64 @@ 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.",
+            "",
+            [],
+            "",
+            state_bookmarks  # Return the unchanged state
+        )
+
     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.",
+            "",
+            [],
+            "",
+            state_bookmarks  # Return the unchanged state
+        )
 
     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.",
+            "",
+            [],
+            "",
+            state_bookmarks  # Return the unchanged state
+        )
 
     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.",
+            "",
+            [],
+            "",
+            state_bookmarks  # Return the unchanged state
+        )
 
     # 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.",
+            "",
+            [],
+            "",
+            state_bookmarks  # Return the unchanged state
+        )
 
     # Generate summaries and assign categories
     for bookmark in bookmarks:
@@ -308,67 +336,125 @@ 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.",
+            "",
+            [],
+            "",
+            state_bookmarks  # Return the unchanged state
+        )
 
     message = f"✅ Successfully processed {len(bookmarks)} bookmarks."
     logger.info(message)
-    bookmark_html = display_bookmarks()
+    bookmark_html = display_bookmarks(bookmarks)
 
-    # Update bookmark_selector choices
+    # Prepare Manage Bookmarks tab outputs
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
-    bookmark_selector_update = gr.update(choices=choices, value=[])
+    bookmarks_html_manage = display_bookmarks(bookmarks)
 
-    # Update bookmark_display_manage
-    bookmark_display_manage_update = display_bookmarks()
+    # Update the shared state
+    updated_state = bookmarks.copy()
 
-    return message, bookmark_html, bookmark_selector_update, bookmark_display_manage_update
+    return (
+        message,
+        bookmark_html,
+        choices,
+        bookmarks_html_manage,
+        updated_state  # Return the updated state
+    )
 
 # 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()
-    indices = [int(s.split('.')[0])-1 for s in selected_indices]
+        return "⚠️ No bookmarks selected.", gr.update(choices=[]), ""
+
+    bookmarks = state_bookmarks.copy()
+    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:
         faiss_index = None
+
     message = "🗑️ Selected bookmarks deleted successfully."
     logger.info(message)
-    # Update bookmark_selector choices
+
+    # Regenerate HTML display
+    bookmarks_html = display_bookmarks(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
+
+    # Update the shared state
+    updated_state = bookmarks.copy()
+
+    return message, gr.update(choices=choices), bookmarks_html, updated_state
 
 # 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.",
+            gr.update(choices=[f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(state_bookmarks)]),
+            display_bookmarks(state_bookmarks),
+            state_bookmarks
+        )
+
     if not new_category:
-        return "⚠️ No new category selected.", '', gr.update()
-    indices = [int(s.split('.')[0])-1 for s in selected_indices]
+        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),
+            state_bookmarks
+        )
+
+    bookmarks = state_bookmarks.copy()
+    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)
-    # Update bookmark_selector choices
+
+    # Regenerate HTML display
+    bookmarks_html = display_bookmarks(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
+
+    # Update the shared state
+    updated_state = bookmarks.copy()
+
+    return message, gr.update(choices=choices), bookmarks_html, updated_state
 
 # Export bookmarks to HTML
-def export_bookmarks():
+def export_bookmarks(state_bookmarks):
+    bookmarks = state_bookmarks
     if not bookmarks:
         logger.warning("No bookmarks to export")
         return "⚠️ No bookmarks to export."
@@ -395,11 +481,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
     if not bookmarks:
         logger.warning("No bookmarks available for chatbot")
         return "⚠️ No bookmarks available. Please upload and process your bookmarks first."
@@ -453,7 +540,7 @@ Please identify the most relevant bookmarks that match the user's query. Provide
 def build_app():
     try:
         logger.info("Building Gradio app")
-        with gr.Blocks(css="""
+        with gr.Blocks(theme=gr.themes.Default(), css="""
         .card {
             box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
             transition: 0.3s;
@@ -462,147 +549,168 @@ def build_app():
             box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
         }
         """) as demo:
+            # Shared states
+            state_bookmarks = gr.State([])
+            chat_history = gr.State([])  # Optional, if you want to maintain chat history
+
             # General Overview
             gr.Markdown("""
-            # 📚 SmartMarks - AI Browser Bookmarks Manager
+# 📚 SmartMarks - AI Browser Bookmarks Manager
+
+Welcome to **SmartMarks**, your intelligent assistant for managing browser bookmarks. SmartMarks leverages AI to help you organize, search, and interact with your bookmarks seamlessly. Whether you're looking to categorize your links, retrieve information quickly, or maintain an updated list, SmartMarks has you covered.
 
-            Welcome to **SmartMarks**, your intelligent assistant for managing browser bookmarks. SmartMarks leverages AI to help you organize, search, and interact with your bookmarks seamlessly. Whether you're looking to categorize your links, retrieve information quickly, or maintain an updated list, SmartMarks has you covered.
+---
 
-            ---
+## 🚀 **How to Use SmartMarks**
 
-            ## 🚀 **How to Use SmartMarks**
+SmartMarks is divided into three main sections:
 
-            SmartMarks is divided into three main sections:
+1. **📂 Upload and Process Bookmarks:** Import your existing bookmarks and let SmartMarks analyze and categorize them for you.
+2. **💬 Chat with Bookmarks:** Interact with your bookmarks using natural language queries to find relevant links effortlessly.
+3. **🛠️ Manage Bookmarks:** View, edit, delete, and export your bookmarks with ease.
 
-            1. **📂 Upload and Process Bookmarks:** Import your existing bookmarks and let SmartMarks analyze and categorize them for you.
-            2. **💬 Chat with Bookmarks:** Interact with your bookmarks using natural language queries to find relevant links effortlessly.
-            3. **🛠️ Manage Bookmarks:** View, edit, delete, and export your bookmarks with ease.
+Navigate through the tabs to explore each feature in detail.
+""")
 
-            Navigate through the tabs to explore each feature in detail.
-            """)
+            # Define Manage Bookmarks components outside the tab for global access
+            bookmark_selector = gr.CheckboxGroup(label="✅ Select Bookmarks", choices=[])
+            bookmark_display_manage = gr.HTML(label="📄 Manage Bookmarks Display")
 
             # Upload and Process Bookmarks Tab
             with gr.Tab("Upload and Process Bookmarks"):
                 gr.Markdown("""
-                ## 📂 **Upload and Process Bookmarks**
+## 📂 **Upload and Process Bookmarks**
 
-                ### 📝 **Steps to Upload and Process:**
+### 📝 **Steps to Upload and Process:**
 
-                1. **🔽 Upload Bookmarks File:**
-                   - Click on the **"Upload Bookmarks HTML File"** button.
-                   - Select your browser's exported bookmarks HTML file from your device.
+1. **🔽 Upload Bookmarks File:**
+   - Click on the **"📁 Upload Bookmarks HTML File"** button.
+   - Select your browser's exported bookmarks HTML file from your device.
 
-                2. **⚙️ Process Bookmarks:**
-                   - After uploading, click on the **"Process Bookmarks"** button.
-                   - SmartMarks will parse your bookmarks, fetch additional information, generate summaries, and categorize each link based on predefined categories.
+2. **⚙️ Process Bookmarks:**
+   - After uploading, click on the **"⚙️ Process Bookmarks"** button.
+   - SmartMarks will parse your bookmarks, fetch additional information, generate summaries, and categorize each link based on predefined categories.
 
-                3. **📄 View Processed Bookmarks:**
-                   - Once processing is complete, your bookmarks will be displayed in an organized and visually appealing format below.
-                """)
+3. **📄 View Processed Bookmarks:**
+   - Once processing is complete, your bookmarks will be displayed in an organized and visually appealing format below.
+""")
 
                 upload = gr.File(label="📁 Upload Bookmarks HTML File", type='binary')
                 process_button = gr.Button("⚙️ Process Bookmarks")
                 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, bookmark_selector, bookmark_display_manage, state_bookmarks]
                 )
 
             # Chat with Bookmarks Tab
             with gr.Tab("Chat with Bookmarks"):
                 gr.Markdown("""
-                ## 💬 **Chat with Bookmarks**
+## 💬 **Chat with Bookmarks**
 
-                ### 🤖 **How to Interact:**
+### 🤖 **How to Interact:**
 
-                1. **✍️ Enter Your Query:**
-                   - In the **"Ask about your bookmarks"** textbox, type your question or keyword related to your bookmarks. For example, "Do I have any bookmarks about GenerativeAI?"
+1. **✍️ Enter Your Query:**
+   - In the **"✍️ Ask about your bookmarks"** textbox, type your question or keyword related to your bookmarks. For example, "Do I have any bookmarks about GenerativeAI?"
 
-                2. **📨 Submit Your Query:**
-                   - Click the **"Send"** button to submit your query.
+2. **📨 Submit Your Query:**
+   - Click the **"📨 Send"** button to submit your query.
 
-                3. **📈 Receive AI-Driven Responses:**
-                   - SmartMarks will analyze your query and provide relevant bookmarks that match your request, making it easier to find specific links without manual searching.
-                """)
+3. **📈 Receive AI-Driven Responses:**
+   - SmartMarks will analyze your query and provide relevant bookmarks that match your request, making it easier to find specific links without manual searching.
+""")
 
-                user_input = gr.Textbox(label="✍️ Ask about your bookmarks", placeholder="e.g., Do I have any bookmarks about GenerativeAI?")
-                chat_output = gr.Textbox(label="💬 Chatbot Response", interactive=False)
-                chat_button = gr.Button("📨 Send")
+                with gr.Row():
+                    chat_history_display = gr.Chatbot(label="🗨️ Chat History")
+                    with gr.Column(scale=1):
+                        chat_input = gr.Textbox(
+                            label="✍️ Ask about your bookmarks",
+                            placeholder="e.g., Do I have any bookmarks about GenerativeAI?",
+                            lines=1,
+                            interactive=True
+                        )
+                        chat_button = gr.Button("📨 Send")
+
+                # When user presses Enter in chat_input
+                chat_input.submit(
+                    chatbot_response,
+                    inputs=[chat_input, state_bookmarks],
+                    outputs=chat_history_display
+                )
 
+                # When user clicks Send button
                 chat_button.click(
                     chatbot_response,
-                    inputs=user_input,
-                    outputs=chat_output
+                    inputs=[chat_input, state_bookmarks],
+                    outputs=chat_history_display
                 )
 
             # Manage Bookmarks Tab
             with gr.Tab("Manage Bookmarks"):
                 gr.Markdown("""
-                ## 🛠️ **Manage Bookmarks**
+## 🛠️ **Manage Bookmarks**
 
-                ### 🗂️ **Features:**
+### 🗂️ **Features:**
 
-                1. **👁️ View Bookmarks:**
-                   - All your processed bookmarks are displayed here with their respective categories and summaries.
+1. **👁️ View Bookmarks:**
+   - All your processed bookmarks are displayed here with their respective categories and summaries.
 
-                2. **✅ Select Bookmarks:**
-                   - Use the checkboxes next to each bookmark to select one, multiple, or all bookmarks you wish to manage.
+2. **✅ Select Bookmarks:**
+   - Use the checkboxes next to each bookmark to select one, multiple, or all bookmarks you wish to manage.
 
-                3. **🗑️ Delete Selected Bookmarks:**
-                   - After selecting the desired bookmarks, click the **"Delete Selected Bookmarks"** button to remove them from your list.
+3. **🗑️ Delete Selected Bookmarks:**
+   - After selecting the desired bookmarks, click the **"🗑️ Delete Selected Bookmarks"** button to remove them from your list.
 
-                4. **✏️ Edit Categories:**
-                   - Select the bookmarks you want to re-categorize.
-                   - Choose a new category from the dropdown menu labeled **"New Category"**.
-                   - Click the **"Edit Category of Selected Bookmarks"** button to update their categories.
+4. **✏️ Edit Categories:**
+   - Select the bookmarks you want to re-categorize.
+   - Choose a new category from the dropdown menu labeled **"🆕 New Category"**.
+   - Click the **"✏️ Edit Category of Selected Bookmarks"** button to update their categories.
 
-                5. **💾 Export Bookmarks:**
-                   - Click the **"Export Bookmarks"** button to download your updated bookmarks as an HTML file.
-                   - This file can be uploaded back to your browser to reflect the changes made within SmartMarks.
-                """)
+5. **💾 Export Bookmarks:**
+   - Click the **"💾 Export Bookmarks"** button to download your updated bookmarks as an HTML file.
+   - This file can be uploaded back to your browser to reflect the changes made within SmartMarks.
+""")
 
                 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")
+                refresh_button = gr.Button("🔄 Refresh Bookmarks")
 
                 # Define button actions
                 delete_button.click(
                     delete_selected_bookmarks,
-                    inputs=bookmark_selector,
-                    outputs=[manage_output, bookmark_selector, bookmark_display_manage]
+                    inputs=[bookmark_selector, state_bookmarks],
+                    outputs=[manage_output, bookmark_selector, bookmark_display_manage, state_bookmarks]
                 )
 
                 edit_category_button.click(
                     edit_selected_bookmarks_category,
-                    inputs=[bookmark_selector, new_category_input],
-                    outputs=[manage_output, bookmark_selector, bookmark_display_manage]
+                    inputs=[bookmark_selector, new_category_input, state_bookmarks],
+                    outputs=[manage_output, bookmark_selector, bookmark_display_manage, state_bookmarks]
                 )
 
                 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]
+                refresh_button.click(
+                    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]
                 )
 
         logger.info("Launching Gradio app")