| 
														
															@@ -126,17 +126,17 @@ class R2RFileService(OSSFileService): 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if not search_results: 
														 | 
														
														 | 
														
															         if not search_results: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             return files 
														 | 
														
														 | 
														
															             return files 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        """ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         for doc in search_results: 
														 | 
														
														 | 
														
															         for doc in search_results: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            file_key = doc.metadata.file_key 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            file_key = doc.metadata.title if file_key is None else file_key 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            # file_key = doc.metadata.file_key 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            # file_key = doc.metadata.title if file_key is None else file_key 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             text = doc.text 
														 | 
														
														 | 
														
															             text = doc.text 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            if file_key in files and files[file_key]: 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                files[file_key] += f"\n\n{text}" 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            if files["text"]: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                files["text"] += f"\n\n{text}" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             else: 
														 | 
														
														 | 
														
															             else: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                files[file_key] = doc.text 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        """ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        return search_results 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                files["text"] = doc.text 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        return files 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     @staticmethod 
														 | 
														
														 | 
														
															     @staticmethod 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     def list_in_files( 
														 | 
														
														 | 
														
															     def list_in_files( 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -183,18 +183,18 @@ class R2RFileService(OSSFileService): 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if len(ids) > 0: 
														 | 
														
														 | 
														
															         if len(ids) > 0: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             r2r.init_sync() 
														 | 
														
														 | 
														
															             r2r.init_sync() 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             list_results = r2r.list_chunks(ids=ids) 
														 | 
														
														 | 
														
															             list_results = r2r.list_chunks(ids=ids) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             files = {} 
														 | 
														
														 | 
														
															             files = {} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            """ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             for doc in list_results: 
														 | 
														
														 | 
														
															             for doc in list_results: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                file_key = doc.metadata.file_key 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                file_key = doc.metadata.title if file_key is None else file_key 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                # file_key = doc.metadata.file_key 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                # file_key = doc.metadata.title if file_key is None else file_key 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 text = doc.text 
														 | 
														
														 | 
														
															                 text = doc.text 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                if file_key in files and files[file_key]: 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    files[file_key] += f"\n\n{text}" 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                if files["text"]: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    files["text"] += f"\n\n{text}" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 else: 
														 | 
														
														 | 
														
															                 else: 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                    files[file_key] = doc.text 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            """ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            return list_results 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    files["text"] = doc.text 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            return files 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return {} 
														 | 
														
														 | 
														
															         return {} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															     # TODO 删除s3&r2r文件 
														 | 
														
														 | 
														
															     # TODO 删除s3&r2r文件 
														 |