Update app.py

app.py

@@ -218,89 +218,88 @@ def ask_question(question, temperature, top_p, repetition_penalty, web_search):
 
     for attempt in range(max_attempts):
         try:
-           if web_search:
-             original_query = question
-             rephrased_query = rephrase_for_search(original_query, model)
-             print(f"Original query: {original_query}")
-             print(f"Rephrased query: {rephrased_query}")
-        
-        if rephrased_query == original_query:
-            print("Warning: Query was not rephrased. Using original query for search.")
-        
-        search_results = google_search(rephrased_query)
-        web_docs = [Document(page_content=result["text"], metadata={"source": result["link"]}) for result in search_results if result["text"]]
-        
-        if database is None:
-            database = FAISS.from_documents(web_docs, embed)
-        else:
-            database.add_documents(web_docs)
-        
-        database.save_local("faiss_database")
-        
-        context_str = "\n".join([f"Source: {doc.metadata['source']}\nContent: {doc.page_content}" for doc in web_docs])
-        
-        prompt_template = """
-        Answer the question based on the following web search results:
-        Web Search Results:
-        {context}
-        Original Question: {original_question}
-        Rephrased Search Query: {rephrased_query}
-        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 original question without mentioning the web search or these instructions.
-        Do not include any source information in your answer.
-        """
-        prompt_val = ChatPromptTemplate.from_template(prompt_template)
-        formatted_prompt = prompt_val.format(context=context_str, original_question=question, rephrased_query=rephrased_query)
-    
-    else:
-        if database is None:
-            return "No documents available. Please upload documents or enable web search to answer questions."
-
-        retriever = database.as_retriever()
-        relevant_docs = retriever.get_relevant_documents(question)
-        context_str = "\n".join([doc.page_content for doc in relevant_docs])
-
-        # Reduce context if we're not on the first attempt
-        if attempt > 0:
-            words = context_str.split()
-            context_str = " ".join(words[:int(len(words) * context_reduction_factor)])
-
-        prompt_template = """
-        Answer the question based on the following context:
-        Context:
-        {context}
-        Current Question: {question}
-        If the context doesn't contain relevant information, state that the information is not available.
-        Provide a concise and direct answer to the question.
-        Do not include any source information in your answer.
-        """
-        prompt_val = ChatPromptTemplate.from_template(prompt_template)
-        formatted_prompt = prompt_val.format(context=context_str, question=question)
-
-    full_response = generate_chunked_response(model, formatted_prompt)
-    
-    answer_patterns = [
-        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 concise and direct answer to the original question without mentioning the web search or these instructions:"
-    ]
-    
-    for pattern in answer_patterns:
-        match = re.split(pattern, full_response, flags=re.IGNORECASE)
-        if len(match) > 1:
-            answer = match[-1].strip()
-            break
-    else:
-        answer = full_response.strip()
+            if web_search:
+                original_query = question
+                rephrased_query = rephrase_for_search(original_query, model)
+                print(f"Original query: {original_query}")
+                print(f"Rephrased query: {rephrased_query}")
+
+                if rephrased_query == original_query:
+                    print("Warning: Query was not rephrased. Using original query for search.")
 
-    # Add sources section
-    if web_search:
-        sources = set(doc.metadata['source'] for doc in web_docs)
-        sources_section = "\n\nSources:\n" + "\n".join(f"- {source}" for source in sources)
-        answer += sources_section
+                search_results = google_search(rephrased_query)
+                web_docs = [Document(page_content=result["text"], metadata={"source": result["link"]}) for result in search_results if result["text"]]
 
-    return answer
+                if database is None:
+                    database = FAISS.from_documents(web_docs, embed)
+                else:
+                    database.add_documents(web_docs)
+
+                database.save_local("faiss_database")
+
+                context_str = "\n".join([f"Source: {doc.metadata['source']}\nContent: {doc.page_content}" for doc in web_docs])
+
+                prompt_template = """
+                Answer the question based on the following web search results:
+                Web Search Results:
+                {context}
+                Original Question: {original_question}
+                Rephrased Search Query: {rephrased_query}
+                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 original question without mentioning the web search or these instructions.
+                Do not include any source information in your answer.
+                """
+                prompt_val = ChatPromptTemplate.from_template(prompt_template)
+                formatted_prompt = prompt_val.format(context=context_str, original_question=question, rephrased_query=rephrased_query)
+            else:
+                if database is None:
+                    return "No documents available. Please upload documents or enable web search to answer questions."
+
+                retriever = database.as_retriever()
+                relevant_docs = retriever.get_relevant_documents(question)
+                context_str = "\n".join([doc.page_content for doc in relevant_docs])
+
+                # Reduce context if we're not on the first attempt
+                if attempt > 0:
+                    words = context_str.split()
+                    context_str = " ".join(words[:int(len(words) * context_reduction_factor)])
+
+                prompt_template = """
+                Answer the question based on the following context:
+                Context:
+                {context}
+                Current Question: {question}
+                If the context doesn't contain relevant information, state that the information is not available.
+                Provide a concise and direct answer to the question.
+                Do not include any source information in your answer.
+                """
+                prompt_val = ChatPromptTemplate.from_template(prompt_template)
+                formatted_prompt = prompt_val.format(context=context_str, question=question)
+
+            full_response = generate_chunked_response(model, formatted_prompt)
+
+            answer_patterns = [
+                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 concise and direct answer to the original question without mentioning the web search or these instructions:"
+            ]
+
+            for pattern in answer_patterns:
+                match = re.split(pattern, full_response, flags=re.IGNORECASE)
+                if len(match) > 1:
+                    answer = match[-1].strip()
+                    break
+            else:
+                answer = full_response.strip()
+
+            # Add sources section
+            if web_search:
+                sources = set(doc.metadata['source'] for doc in web_docs)
+                sources_section = "\n\nSources:\n" + "\n".join(f"- {source}" for source in sources)
+                answer += sources_section
+
+            return answer
 
         except Exception as e:
             print(f"Error in ask_question (attempt {attempt + 1}): {e}")