Update app.py

app.py

@@ -404,6 +404,8 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
     logging.info(f"Selected Documents: {selected_docs}")
     logging.info(f"Use Web Search: {use_web_search}")
 
+    response = ""
+
     if use_web_search:
         original_query = message
         rephrased_query = rephrase_query(message, conversation_manager)
@@ -423,9 +425,10 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
 
         if final_summary:
             conversation_manager.add_interaction(original_query, final_summary)
-            yield final_summary
+            response = final_summary
         else:
-            yield "Unable to generate a response. Please try a different query."
+            response = "Unable to generate a response. Please try a different query."
+
     else:
         # Existing PDF search logic
         try:
@@ -438,37 +441,41 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sel
                 relevant_docs = [doc for doc in all_relevant_docs if doc.metadata["source"] in selected_docs]
                 
                 if not relevant_docs:
-                    yield "No relevant information found in the selected documents. Please try selecting different documents or rephrasing your query."
-                    return
-    
-                context_str = "\n".join([doc.page_content for doc in relevant_docs])
-                logging.info(f"Context length: {len(context_str)}")
-            else:
-                context_str = "No documents available."
-                yield "No documents available. Please upload PDF documents to answer questions."
-                return
-            
-            if model.startswith("duckduckgo/"):
-                # Use DuckDuckGo chat with context
-                for partial_response in get_response_from_duckduckgo(message, model, context_str, num_calls, temperature):
-                    yield partial_response
-            elif model == "@cf/meta/llama-3.1-8b-instruct":
-                # Use Cloudflare API
-                for partial_response in get_response_from_cloudflare(prompt="", context=context_str, query=message, num_calls=num_calls, temperature=temperature, search_type="pdf"):
-                    yield partial_response
+                    response = "No relevant information found in the selected documents. Please try selecting different documents or rephrasing your query."
+                else:
+                    context_str = "\n".join([doc.page_content for doc in relevant_docs])
+                    logging.info(f"Context length: {len(context_str)}")
+
+                    if model.startswith("duckduckgo/"):
+                        # Use DuckDuckGo chat with context
+                        for partial_response in get_response_from_duckduckgo(message, model, context_str, num_calls, temperature):
+                            response += partial_response
+                    elif model == "@cf/meta/llama-3.1-8b-instruct":
+                        # Use Cloudflare API
+                        for partial_response in get_response_from_cloudflare(prompt="", context=context_str, query=message, num_calls=num_calls, temperature=temperature, search_type="pdf"):
+                            response += partial_response
+                    else:
+                        # Use Hugging Face API
+                        for partial_response in get_response_from_pdf(message, model, selected_docs, num_calls=num_calls, temperature=temperature):
+                            response += partial_response
             else:
-                # Use Hugging Face API
-                for partial_response in get_response_from_pdf(message, model, selected_docs, num_calls=num_calls, temperature=temperature):
-                    yield partial_response
+                response = "No documents available. Please upload PDF documents to answer questions."
+
         except Exception as e:
             logging.error(f"Error with {model}: {str(e)}")
             if "microsoft/Phi-3-mini-4k-instruct" in model:
                 logging.info("Falling back to Mistral model due to Phi-3 error")
                 fallback_model = "mistralai/Mistral-7B-Instruct-v0.3"
-                yield from respond(message, history, fallback_model, temperature, num_calls, selected_docs)
+                return respond(message, history, fallback_model, temperature, num_calls, use_web_search, selected_docs)
             else:
-                yield f"An error occurred with the {model} model: {str(e)}. Please try again or select a different model."
-        
+                response = f"An error occurred with the {model} model: {str(e)}. Please try again or select a different model."
+
+    # Update the conversation history
+    history.append((message, response))
+    
+    # Yield the updated history
+    yield history
+
 logging.basicConfig(level=logging.DEBUG)
 
 def get_response_from_cloudflare(prompt, context, query, num_calls=3, temperature=0.2, search_type="pdf"):