Update core/chatbot/retrieval_chatbot.py

core/chatbot/retrieval_chatbot.py

@@ -104,19 +104,10 @@ class RetrievalChatbot(BaseChatbot):
     async def subquestion_answerer(self, sub_question: str, image_paths=None, return_logs=False) -> str:
         sub_retrieve_reference=""
         time_s = time.time()
-        # sub_retrieve, titles = self.retriever.retrieve(sub_question)
-        if len(sub_question) >= 2:
-            sub_retrieve_english, titles_english = self.retriever.retrieve(sub_question[0])
-            sub_retrieve_chinese, titles_chinese = self.retriever.retrieve(sub_question[1])
-        else:
-            sub_retrieve_english, titles_english = self.retriever.retrieve(sub_question[0])
-            sub_retrieve_chinese, titles_chinese = [], []
-        # print("英文检索结果: ", sub_retrieve_english)
-        # print("中文检索结果: ", sub_retrieve_chinese)
-        sub_retrieve=sub_retrieve_english+sub_retrieve_chinese
+        sub_retrieve, titles = 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[0])
+        sub_answerer_context = "Sub Question References: {sub_retrieve_reference}\nQuestion: {question}\n".format(sub_retrieve_reference=sub_retrieve_reference, question=sub_question)
         refine_task = asyncio.create_task(self.answerer.refine_async(sub_answerer_context, self.memory, image_paths))
         await refine_task
         sub_answer = refine_task.result()
@@ -125,5 +116,5 @@ class RetrievalChatbot(BaseChatbot):
         print(f"Subanswer: {sub_answer}")
         return {
             "answer": "Subquestion: {sub_question}\nSubanswer: {sub_answer}\n\n\n".format(sub_question=sub_question, sub_answer=sub_answer), 
-            "titles": titles_english + titles_chinese
+            "titles": titles
         }