|
|
@@ -36,7 +36,7 @@ class FileSearchTool(BaseTool):
|
|
|
"""
|
|
|
置当前 Retrieval 涉及文件信息
|
|
|
"""
|
|
|
- self.loop = asyncio.get_running_loop() # 获取当前事件循环
|
|
|
+ self.loop = asyncio.get_event_loop() # 获取当前事件循环
|
|
|
## 获取文件信息
|
|
|
files = FileService.get_file_list_by_ids(session=session, file_ids=run.file_ids)
|
|
|
# files = FileService.list_in_files(ids=run.file_ids, offset=0, limit=100)
|
|
|
@@ -55,10 +55,9 @@ class FileSearchTool(BaseTool):
|
|
|
folder_fileinfo = []
|
|
|
if asst_folder_ids:
|
|
|
for fid in asst_folder_ids:
|
|
|
- fut = self.loop.create_task(
|
|
|
+ folder_fileinfo += self.loop.run_until_complete(
|
|
|
FileService.list_documents(id=fid, offset=0, limit=100)
|
|
|
)
|
|
|
- folder_fileinfo += self.loop.run_until_complete(fut)
|
|
|
print(folder_fileinfo)
|
|
|
for file in folder_fileinfo:
|
|
|
self.__filenames.append(file.get("title"))
|
|
|
@@ -82,12 +81,16 @@ class FileSearchTool(BaseTool):
|
|
|
file_keys.append(file_key)
|
|
|
|
|
|
print(file_key)
|
|
|
+ try:
|
|
|
+ loop = asyncio.get_running_loop()
|
|
|
+ self.loop = loop
|
|
|
+ except Exception as e:
|
|
|
+ print(e)
|
|
|
|
|
|
# self.loop = asyncio.get_event_loop()
|
|
|
- fut = self.loop.create_task(
|
|
|
+ files = self.loop.run_until_complete(
|
|
|
FileService.search_in_files(query=query, file_keys=file_keys)
|
|
|
)
|
|
|
- files = self.loop.run_until_complete(fut)
|
|
|
return files
|
|
|
|
|
|
def instruction_supplement(self) -> str:
|
