|
|
@@ -36,8 +36,8 @@ class FileSearchTool(BaseTool):
|
|
|
置当前 Retrieval 涉及文件信息
|
|
|
"""
|
|
|
## 获取文件信息
|
|
|
- # 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)
|
|
|
+ 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)
|
|
|
|
|
|
loop = asyncio.get_event_loop() # 获取当前事件循环
|
|
|
db_asst = loop.run_until_complete(
|
|
|
@@ -54,9 +54,15 @@ class FileSearchTool(BaseTool):
|
|
|
.get("folder_ids")
|
|
|
)
|
|
|
print(asst_folder_ids)
|
|
|
+ folder_fileinfo = []
|
|
|
if asst_folder_ids:
|
|
|
for fid in asst_folder_ids:
|
|
|
- files += FileService.list_documents(id=fid, offset=0, limit=100)
|
|
|
+ folder_fileinfo += FileService.list_documents(
|
|
|
+ id=fid, offset=0, limit=100
|
|
|
+ )
|
|
|
+ for file in folder_fileinfo:
|
|
|
+ self.__filenames.append(file.title)
|
|
|
+ self.__keys.append(file.get("metadata").get("file_key"))
|
|
|
|
|
|
# pre-cache data to prevent thread conflicts that may occur later on.
|
|
|
print(
|
|
|
@@ -64,8 +70,8 @@ class FileSearchTool(BaseTool):
|
|
|
)
|
|
|
print(files)
|
|
|
for file in files:
|
|
|
- self.__filenames.append(file.title)
|
|
|
- self.__keys.append(file.get("metadata").get("file_key"))
|
|
|
+ self.__filenames.append(file.filename)
|
|
|
+ self.__keys.append(file.key)
|
|
|
print(self.__keys)
|
|
|
|
|
|
def run(self, indexes: List[int], query: str) -> dict:
|
