Update app.py

app.py

@@ -634,21 +634,15 @@ Answer with just "YES" if web search would be helpful, or "NO" if the available
             search_results = self.search.call(question)
             
             # Combine all contexts
-            full_context = f"""
-Question: {question}
-
-Search Results: {search_results}
-
-{attachment_context}
-
-{url_context}
-"""
+            full_context = f"""Question: {question} Search Results: {search_results} {attachment_context}{url_context}"""
             
-            answer_prompt = f"""Based on the search results and additional context provided, answer this question comprehensively and accurately:
-
-{full_context}
-
-Provide a clear, well-structured answer:"""
+            answer_prompt = f"""\no_think You are a general AI assistant. I will ask you a question. 
+            Based on the context sections below, provide an answer to the question. 
+            If the search results don't fully answer the question, you can supplement with your general knowledge. 
+            Your ANSWER should be a number OR as few words as possible OR a comma separated list of numbers and/or strings. 
+            If you are asked for a number, don't use comma to write your number neither use units such as $ or percent sign unless specified otherwise. 
+            If you are asked for a string, don't use articles, neither abbreviations (e.g. for cities), and write the digits in plain text unless specified otherwise.
+           {full_context} """
             
             return self._chat_completion(answer_prompt, max_tokens=800, temperature=0.3)
             
@@ -662,19 +656,15 @@ Provide a clear, well-structured answer:"""
         Answer the question using only the LLM and available context.
         """
         try:
-            full_context = f"""
-Question: {question}
-
-{attachment_context}
-
-{url_context}
-"""
+            full_context = f"""Question: {question} {attachment_context} {url_context}"""
             
-            answer_prompt = f"""Answer this question based on your knowledge and the provided context:
-
-{full_context}
-
-Provide a clear, comprehensive answer:"""
+            answer_prompt = f"""\no_think You are a general AI assistant. I will ask you a question. 
+            Based on the context sections below, provide an answer to the question. 
+            If the search results don't fully answer the question, you can supplement with your general knowledge. 
+            Your ANSWER should be a number OR as few words as possible OR a comma separated list of numbers and/or strings. 
+            If you are asked for a number, don't use comma to write your number neither use units such as $ or percent sign unless specified otherwise. 
+            If you are asked for a string, don't use articles, neither abbreviations (e.g. for cities), and write the digits in plain text unless specified otherwise.
+           {full_context} """
             
             return self._chat_completion(answer_prompt, max_tokens=800, temperature=0.3)