Update app.py

app.py

@@ -241,10 +241,8 @@ def ask_question(question, temperature, top_p, repetition_penalty, web_search):
         web_docs = [Document(page_content=result["text"], metadata={"source": result["link"]}) for result in search_results if result["text"]]
         
         if database is None:
-            # Create the database with web search results if it doesn't exist
             database = FAISS.from_documents(web_docs, embed)
         else:
-            # Add web search results to the existing database
             database.add_documents(web_docs)
         
         database.save_local("faiss_database")
@@ -257,7 +255,7 @@ def ask_question(question, temperature, top_p, repetition_penalty, web_search):
         {context}
         Current Question: {question}
         If the web search results don't contain relevant information, state that the information is not available in the search results.
-        Provide a concise and direct answer to the question without mentioning the web search or these instructions:
+        Provide a concise and direct answer to the question:
         """
         prompt_val = ChatPromptTemplate.from_template(prompt_template)
         formatted_prompt = prompt_val.format(context=context_str, question=question)
@@ -277,12 +275,20 @@ def ask_question(question, temperature, top_p, repetition_penalty, web_search):
         prompt_val = ChatPromptTemplate.from_template(prompt)
         formatted_prompt = prompt_val.format(history=history_str, context=context_str, question=question)
 
-    answer = generate_chunked_response(model, formatted_prompt)
-    answer = re.split(r'Question:|Current Question:', answer)[-1].strip()
-
-    # Remove any remaining prompt instructions from the answer
-    answer_lines = answer.split('\n')
-    answer = '\n'.join(line for line in answer_lines if not line.startswith('If') and not line.startswith('Provide'))
+    full_response = generate_chunked_response(model, formatted_prompt)
+    
+    # Filter out the prompt and extract only the answer
+    answer_pattern = r"(?:Answer:|Provide a concise and direct answer to the question:)([\s\S]*)"
+    match = re.search(answer_pattern, full_response, re.IGNORECASE)
+    
+    if match:
+        answer = match.group(1).strip()
+    else:
+        # If no match is found, use the entire response but remove any instructions
+        answer = re.sub(r"(?i)If the .+?instructions:", "", full_response).strip()
+    
+    # Remove any numbered list formatting
+    answer = re.sub(r'^\s*\d+\.\s*', '', answer, flags=re.MULTILINE)
 
     if not web_search:
         memory_database[question] = answer