|
@@ -42,7 +42,7 @@ class FileSearchTool(BaseTool):
|
|
|
"""
|
|
"""
|
|
|
置当前 Retrieval 涉及文件信息
|
|
置当前 Retrieval 涉及文件信息
|
|
|
"""
|
|
"""
|
|
|
- self.loop = asyncio.get_event_loop() # 获取当前事件循环
|
|
|
|
|
|
|
+ # self.loop = asyncio.get_event_loop() # 获取当前事件循环
|
|
|
document_id = []
|
|
document_id = []
|
|
|
file_key = []
|
|
file_key = []
|
|
|
filesinfo = []
|
|
filesinfo = []
|
|
@@ -66,7 +66,7 @@ class FileSearchTool(BaseTool):
|
|
|
print(files)
|
|
print(files)
|
|
|
# r2r接口不提供多条件，否则上面没必要存在
|
|
# r2r接口不提供多条件，否则上面没必要存在
|
|
|
if len(document_id) > 0:
|
|
if len(document_id) > 0:
|
|
|
- filesinfo += self.loop.run_until_complete(
|
|
|
|
|
|
|
+ filesinfo += asyncio.run(
|
|
|
FileService.list_in_files(ids=document_id, offset=0, limit=100)
|
|
FileService.list_in_files(ids=document_id, offset=0, limit=100)
|
|
|
)
|
|
)
|
|
|
for file in filesinfo:
|
|
for file in filesinfo:
|
|
@@ -90,7 +90,7 @@ class FileSearchTool(BaseTool):
|
|
|
folder_fileinfo = []
|
|
folder_fileinfo = []
|
|
|
if asst_folder_ids:
|
|
if asst_folder_ids:
|
|
|
for fid in asst_folder_ids:
|
|
for fid in asst_folder_ids:
|
|
|
- folder_fileinfo += self.loop.run_until_complete(
|
|
|
|
|
|
|
+ folder_fileinfo += asyncio.run(
|
|
|
FileService.list_documents(id=fid, offset=0, limit=100)
|
|
FileService.list_documents(id=fid, offset=0, limit=100)
|
|
|
)
|
|
)
|
|
|
print(folder_fileinfo)
|
|
print(folder_fileinfo)
|
|
@@ -118,7 +118,7 @@ class FileSearchTool(BaseTool):
|
|
|
print(file_key)
|
|
print(file_key)
|
|
|
|
|
|
|
|
# self.loop = asyncio.get_event_loop()
|
|
# self.loop = asyncio.get_event_loop()
|
|
|
- files = self.loop.run_until_complete(
|
|
|
|
|
|
|
+ files = asyncio.run(
|
|
|
FileService.search_in_files(query=query, file_keys=file_keys)
|
|
FileService.search_in_files(query=query, file_keys=file_keys)
|
|
|
)
|
|
)
|
|
|
return files
|
|
return files
|
