jack 2 months ago
parent
commit
3b0efc79c5
1 changed files with 8 additions and 6 deletions
  1. 8 6
      app/services/file/impl/r2r_file.py

+ 8 - 6
app/services/file/impl/r2r_file.py

@@ -72,7 +72,8 @@ class R2RFileService(OSSFileService):
     def search_in_files(
         query: str, file_keys: List[str], folder_keys: List[str] = None
     ) -> dict:
-        files = {}
+        files = []
+        # {}
         file_key = {"$in": []}
         document_id = {"$in": []}
         filters = {"$or": []}
@@ -130,13 +131,14 @@ class R2RFileService(OSSFileService):
             return files
 
         for doc in search_results:
+            files.append({"id": doc.id, "text": doc.text, "title": doc.metadata.title})
             # file_key = doc.metadata.file_key
             # file_key = doc.metadata.title if file_key is None else file_key
-            text = doc.text
-            if "text" in files:
-                files["text"] += f"\n\n{text}"
-            else:
-                files["text"] = text
+            # text = doc.text
+            # if "text" in files:
+            #     files["text"] += f"\n\n{text}"
+            # else:
+            #    files["text"] = text
         # print("aaaaaaaaaaaaaa")
         # print(files)
         return files