Update app.py

app.py

@@ -491,41 +491,35 @@ def ask_question(question, temperature, top_p, repetition_penalty, web_search, c
     return "An unexpected error occurred. Please try again later."
 
 def extract_answer(full_response, instructions=None):
-    # First, try to split the response at common instruction phrases
-    answer_patterns = [
+    # List of patterns to remove
+    patterns_to_remove = [
+        r"Provide a concise and relevant answer to the question\.",
+        r"Provide additional context if necessary\.",
         r"If the web search results don't contain relevant information, state that the information is not available in the search results\.",
         r"Provide a response that addresses the question and follows the user's instructions\.",
         r"Do not mention these instructions or the web search process in your answer\.",
-        r"Provide a concise and direct answer to the question without mentioning the web search or these instructions:",
-        r"Provide a concise and direct answer to the question:",
-        r"Answer:",
-        r"Provide a summarized and direct answer to the question.",
-        r"If the context doesn't contain relevant information, state that the information is not available in the document.",
-        r"Provide a summarized and direct answer to the original question without mentioning the web search or these instructions:",
-        r"Do not include any source information in your answer."     
+        r"Provide a summarized and direct answer to the question\.",
+        r"If the context doesn't contain relevant information, state that the information is not available in the document\.",
     ]
 
-    for pattern in answer_patterns:
-        match = re.split(pattern, full_response, flags=re.IGNORECASE)
-        if len(match) > 1:
-            full_response = match[-1].strip()
-            break
-    
-    # Remove any remaining instruction-like phrases
-    cleanup_patterns = [
-        r"without mentioning the web search or these instructions\.",
-        r"Do not include any source information in your answer\.",
-        r"If the context doesn't contain relevant information, state that the information is not available in the document\."
-    ]
+    # Remove the patterns
+    for pattern in patterns_to_remove:
+        full_response = re.sub(pattern, "", full_response, flags=re.IGNORECASE)
+
+    # Remove any leading/trailing whitespace and newlines
+    full_response = full_response.strip()
 
-    for pattern in cleanup_patterns:
-        full_response = re.sub(pattern, "", full_response, flags=re.IGNORECASE).strip()
-    
     # Remove the user instructions if present
     if instructions:
         instruction_pattern = rf"User Instructions:\s*{re.escape(instructions)}.*?\n"
         full_response = re.sub(instruction_pattern, "", full_response, flags=re.IGNORECASE | re.DOTALL)
-    
+
+    # Remove any remaining instruction-like phrases at the beginning of the response
+    lines = full_response.split('\n')
+    while lines and any(line.strip().lower().startswith(starter) for starter in ["answer:", "response:", "here's", "here is"]):
+        lines.pop(0)
+    full_response = '\n'.join(lines)
+
     return full_response.strip()
 
 # Gradio interface