update

app/core/tools/file_search_tool.py

@@ -61,7 +61,7 @@ class FileSearchTool(BaseTool):
                 print(folder_fileinfo)
                 for file in folder_fileinfo:
                     self.__filenames.append(file.get("title"))
-                    self.__keys.append(file.get("metadata").get("file_key"))
+                    self.__keys.append(file.get("id"))
 
         # pre-cache data to prevent thread conflicts that may occur later on.
         print(

app/services/file/impl/r2r_file.py

@@ -39,6 +39,7 @@ class R2RFileService(OSSFileService):
         file_extension = Path(file.filename).suffix
         file_key = f"{uuid.uuid4()}{file_extension}"
         print(file_key)
+        fileinfo = {"document_id": file_key}
         # file_key = f"{uuid.uuid4()}-{file.filename}"
         with tempfile.NamedTemporaryFile(
             suffix="_" + file.filename, delete=True
@@ -51,13 +52,16 @@ class R2RFileService(OSSFileService):
 
             # storage.save_from_path(filename=file_key, local_file_path=tmp_file_path)
             await r2r.init()
-            await r2r.ingest_file(
+            fileinfo = await r2r.ingest_file(
                 file_path=tmp_file_path,
                 metadata={"file_key": file_key, "title": file.filename},
             )
         # 存储
         db_file = File(
-            purpose=purpose, filename=file.filename, bytes=file.size, key=file_key
+            purpose=purpose,
+            filename=file.filename,
+            bytes=file.size,
+            key=fileinfo.document_id,
         )
         session.add(db_file)
         await session.commit()