lindsay-qu
commited on
Commit
•
e5adec2
1
Parent(s):
f621f52
Update core/chatbot/retrieval_chatbot.py
Browse files
core/chatbot/retrieval_chatbot.py
CHANGED
@@ -104,19 +104,10 @@ class RetrievalChatbot(BaseChatbot):
|
|
104 |
async def subquestion_answerer(self, sub_question: str, image_paths=None, return_logs=False) -> str:
|
105 |
sub_retrieve_reference=""
|
106 |
time_s = time.time()
|
107 |
-
|
108 |
-
if len(sub_question) >= 2:
|
109 |
-
sub_retrieve_english, titles_english = self.retriever.retrieve(sub_question[0])
|
110 |
-
sub_retrieve_chinese, titles_chinese = self.retriever.retrieve(sub_question[1])
|
111 |
-
else:
|
112 |
-
sub_retrieve_english, titles_english = self.retriever.retrieve(sub_question[0])
|
113 |
-
sub_retrieve_chinese, titles_chinese = [], []
|
114 |
-
# print("英文检索结果: ", sub_retrieve_english)
|
115 |
-
# print("中文检索结果: ", sub_retrieve_chinese)
|
116 |
-
sub_retrieve=sub_retrieve_english+sub_retrieve_chinese
|
117 |
for ref in sub_retrieve:
|
118 |
sub_retrieve_reference += "Related research: {ref}\n".format(ref=ref)
|
119 |
-
sub_answerer_context = "Sub Question References: {sub_retrieve_reference}\nQuestion: {question}\n".format(sub_retrieve_reference=sub_retrieve_reference, question=sub_question
|
120 |
refine_task = asyncio.create_task(self.answerer.refine_async(sub_answerer_context, self.memory, image_paths))
|
121 |
await refine_task
|
122 |
sub_answer = refine_task.result()
|
@@ -125,5 +116,5 @@ class RetrievalChatbot(BaseChatbot):
|
|
125 |
print(f"Subanswer: {sub_answer}")
|
126 |
return {
|
127 |
"answer": "Subquestion: {sub_question}\nSubanswer: {sub_answer}\n\n\n".format(sub_question=sub_question, sub_answer=sub_answer),
|
128 |
-
"titles":
|
129 |
}
|
|
|
104 |
async def subquestion_answerer(self, sub_question: str, image_paths=None, return_logs=False) -> str:
|
105 |
sub_retrieve_reference=""
|
106 |
time_s = time.time()
|
107 |
+
sub_retrieve, titles = self.retriever.retrieve(sub_question)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
108 |
for ref in sub_retrieve:
|
109 |
sub_retrieve_reference += "Related research: {ref}\n".format(ref=ref)
|
110 |
+
sub_answerer_context = "Sub Question References: {sub_retrieve_reference}\nQuestion: {question}\n".format(sub_retrieve_reference=sub_retrieve_reference, question=sub_question)
|
111 |
refine_task = asyncio.create_task(self.answerer.refine_async(sub_answerer_context, self.memory, image_paths))
|
112 |
await refine_task
|
113 |
sub_answer = refine_task.result()
|
|
|
116 |
print(f"Subanswer: {sub_answer}")
|
117 |
return {
|
118 |
"answer": "Subquestion: {sub_question}\nSubanswer: {sub_answer}\n\n\n".format(sub_question=sub_question, sub_answer=sub_answer),
|
119 |
+
"titles": titles
|
120 |
}
|