Update app.py

app.py

@@ -265,14 +265,14 @@ class CitingSources(BaseModel):
         ...,
         description="List of sources to cite. Should be an URL of the source."
     )
-def chatbot_interface(message, history, use_web_search, model, temperature, num_calls):
+def chatbot_interface(message, history, use_web_search, model, temperature, num_calls, selected_docs):
     if not message.strip():
         return "", history
 
     history = history + [(message, "")]
 
     try:
-        for response in respond(message, history, model, temperature, num_calls, use_web_search):
+        for response in respond(message, history, model, temperature, num_calls, use_web_search, selected_docs):
             history[-1] = (message, response)
             yield history
     except gr.CancelledError:
@@ -344,10 +344,12 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
                     logging.info(f"Generated Response (first 100 chars): {partial_response[:100]}...")
                     yield partial_response
             else:
-                logging.info("Using Hugging Face API")
+                logging.info("Entering PDF search flow")
                 for partial_response in get_response_from_pdf(message, model, selected_docs, num_calls=num_calls, temperature=temperature):
                     logging.info(f"Generated Response (first 100 chars): {partial_response[:100]}...")
                     yield partial_response
+        
+            logging.info("Finished respond function")
     except Exception as e:
         logging.error(f"Unexpected error in respond function: {str(e)}")
         yield f"An unexpected error occurred: {str(e)}"
@@ -456,15 +458,18 @@ def get_response_from_pdf(query, model, selected_docs, num_calls=3, temperature=
     retriever = database.as_retriever()
     logging.info(f"Retrieving relevant documents for query: {query}")
     try:
-        relevant_docs = retriever.invoke(query)  # Use invoke instead of get_relevant_documents
+        relevant_docs = retriever.invoke(query)
         logging.info(f"Number of relevant documents retrieved: {len(relevant_docs)}")
     except Exception as e:
         logging.error(f"Error retrieving relevant documents: {str(e)}")
         yield f"An error occurred while retrieving relevant documents: {str(e)}"
         return
     
+    # Log the sources of relevant documents
+    logging.info(f"Sources of relevant documents: {[os.path.basename(doc.metadata['source']) for doc in relevant_docs]}")
+    
     # Filter relevant_docs based on selected documents
-    filtered_docs = [doc for doc in relevant_docs if doc.metadata["source"] in selected_docs]
+    filtered_docs = [doc for doc in relevant_docs if os.path.basename(doc.metadata["source"]) in selected_docs]
     logging.info(f"Number of filtered documents: {len(filtered_docs)}")
     
     if not filtered_docs:
@@ -473,7 +478,7 @@ def get_response_from_pdf(query, model, selected_docs, num_calls=3, temperature=
         return
 
     for doc in filtered_docs:
-        logging.info(f"Document source: {doc.metadata['source']}")
+        logging.info(f"Document source: {os.path.basename(doc.metadata['source'])}")
         logging.info(f"Document content preview: {doc.page_content[:100]}...")  # Log first 100 characters of each document
 
     context_str = "\n".join([doc.page_content for doc in filtered_docs])
@@ -549,13 +554,13 @@ document_selector = gr.CheckboxGroup(label="Select documents to query")
 use_web_search = gr.Checkbox(label="Use Web Search", value=True)
 
 demo = gr.ChatInterface(
-    respond,
+    chatbot_interface,
     additional_inputs=[
         gr.Dropdown(choices=MODELS, label="Select Model", value=MODELS[3]),
         gr.Slider(minimum=0.1, maximum=1.0, value=0.2, step=0.1, label="Temperature"),
         gr.Slider(minimum=1, maximum=5, value=1, step=1, label="Number of API Calls"),
         use_web_search,
-        document_selector  # Add the document selector to the chat interface
+        document_selector  # This should now correctly pass the selected documents
     ],
     title="AI-powered Web Search and PDF Chat Assistant",
     description="Chat with your PDFs or use web search to answer questions (Please use toggle under Additional Inputs to swithc between PDF and Web Search, Default Value Web Search)",