Update core/chatbot/retrieval_chatbot.py

core/chatbot/retrieval_chatbot.py

@@ -39,15 +39,15 @@ class RetrievalChatbot(BaseChatbot):
         print("Query: {message}".format(message=message))
         question = self.decomposer.refine(message, None, image_paths)
         print(question)
-        question = question.replace('"', "'").replace("', '", "','").lstrip("['").rstrip("']")
+        question = question.replace('"', "'").replace("\n", "").replace("', '", "','").lstrip("['").rstrip("']")
         sub_questions = question.split("','")
         print("Decomposed your query into subquestions: {sub_questions}".format(sub_questions=sub_questions))
         tasks = []
         time2 = time.time()
         for sub_question in sub_questions:
-            print("="*20)
-            print(f"Subquestion: {sub_question}")            
-            print(f"Retrieving pdf papers for references...\n")
+            # print("="*20)
+            # print(f"Subquestion: {sub_question}")            
+            # print(f"Retrieving pdf papers for references...\n")
             task = asyncio.create_task(self.subquestion_answerer(sub_question, image_paths))
             tasks.append(task)
         results = await asyncio.gather(*tasks)
@@ -87,14 +87,16 @@ class RetrievalChatbot(BaseChatbot):
             return answer
         
     async def subquestion_answerer(self, sub_question: str, image_paths=None, return_logs=False) -> str:
-        time_s = time.time()
         sub_retrieve_reference=""
+        time_s = time.time()
         sub_retrieve = self.retriever.retrieve(sub_question)
         for ref in sub_retrieve:
             sub_retrieve_reference += "Related research: {ref}\n".format(ref=ref)
         sub_answerer_context = "Sub Question References: {sub_retrieve_reference}\nQuestion: {question}\n".format(sub_retrieve_reference=sub_retrieve_reference, question=sub_question)
-        sub_answer = self.answerer.refine(sub_answerer_context, self.memory, image_paths)
+        refine_task = asyncio.create_task(self.answerer.refine_async(sub_answerer_context, self.memory, image_paths))
+        await refine_task
+        sub_answer = refine_task.result()
         time_e = time.time()
-        print(f"Time: {time_e - time_s}")
+        print(f"Time: {time_e-time_s}")
         print(f"Subanswer: {sub_answer}")
         return "Subquestion: {sub_question}\nSubanswer: {sub_answer}\n\n\n".format(sub_question=sub_question, sub_answer=sub_answer)