Update app.py

app.py

@@ -12,15 +12,23 @@ import sys
 from sentence_transformers import SentenceTransformer
 import faiss
 import numpy as np
+
+# Import OpenAI library
 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
@@ -257,25 +265,6 @@ def display_bookmarks(bookmarks_list):
     logger.info("HTML display generated")
     return cards
 
-# Function to handle sending messages in chat
-def send_message(user_message, chat_history, state_bookmarks):
-    if not user_message:
-        return chat_history, chat_history
-
-    # Append user message to chat history
-    chat_history = chat_history + [(user_message, None)]
-
-    # Generate chatbot response
-    try:
-        response = chatbot_response(user_message, state_bookmarks)
-    except Exception as e:
-        response = f"⚠️ Error: {str(e)}"
-
-    # Append assistant response to chat history
-    chat_history[-1] = (user_message, response)
-
-    return chat_history, chat_history
-
 # Process the uploaded file
 def process_uploaded_file(file, state_bookmarks):
     logger.info("Processing uploaded file")
@@ -357,13 +346,13 @@ def process_uploaded_file(file, state_bookmarks):
     logger.info(message)
     bookmark_html = display_bookmarks(bookmarks)
 
-    # Update the shared state
-    updated_state = bookmarks.copy()
-
     # 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)
 
+    # Update the shared state
+    updated_state = bookmarks.copy()
+
     return (
         message,
         bookmark_html,
@@ -405,12 +394,12 @@ def delete_selected_bookmarks(selected_indices, state_bookmarks):
     # Regenerate HTML display
     bookmarks_html = display_bookmarks(bookmarks)
 
-    # Update the shared state
-    updated_state = bookmarks.copy()
-
     # Update choices for selection
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
 
+    # Update the shared state
+    updated_state = bookmarks.copy()
+
     return message, gr.update(choices=choices), bookmarks_html
 
 # Edit category of selected bookmarks
@@ -451,12 +440,12 @@ def edit_selected_bookmarks_category(selected_indices, new_category, state_bookm
     # Regenerate HTML display
     bookmarks_html = display_bookmarks(bookmarks)
 
-    # Update the shared state
-    updated_state = bookmarks.copy()
-
     # Update choices for selection
     choices = [f"{i+1}. {bookmark['title']} (Category: {bookmark['category']})" for i, bookmark in enumerate(bookmarks)]
 
+    # Update the shared state
+    updated_state = bookmarks.copy()
+
     return message, gr.update(choices=choices), bookmarks_html
 
 # Export bookmarks to HTML
@@ -638,16 +627,16 @@ Navigate through the tabs to explore each feature in detail.
 
                 # When user presses Enter in chat_input
                 chat_input.submit(
-                    send_message,
-                    inputs=[chat_input, chat_history, state_bookmarks],
-                    outputs=[chat_history_display, chat_history]
+                    chatbot_response,
+                    inputs=[chat_input, state_bookmarks],
+                    outputs=chat_history_display
                 )
 
                 # When user clicks Send button
                 chat_button.click(
-                    send_message,
-                    inputs=[chat_input, chat_history, state_bookmarks],
-                    outputs=[chat_history_display, chat_history]
+                    chatbot_response,
+                    inputs=[chat_input, state_bookmarks],
+                    outputs=chat_history_display
                 )
 
             # Manage Bookmarks Tab