|
@@ -126,17 +126,17 @@ class R2RFileService(OSSFileService):
|
|
|
|
|
|
if not search_results:
|
|
|
return files
|
|
|
- """
|
|
|
+
|
|
|
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
|
|
|
- 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:
|
|
|
- files[file_key] = doc.text
|
|
|
- """
|
|
|
- return search_results
|
|
|
+ files["text"] = doc.text
|
|
|
+
|
|
|
+ return files
|
|
|
|
|
|
@staticmethod
|
|
|
def list_in_files(
|
|
@@ -183,18 +183,18 @@ class R2RFileService(OSSFileService):
|
|
|
if len(ids) > 0:
|
|
|
r2r.init_sync()
|
|
|
list_results = r2r.list_chunks(ids=ids)
|
|
|
+
|
|
|
files = {}
|
|
|
- """
|
|
|
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
|
|
|
- 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:
|
|
|
- files[file_key] = doc.text
|
|
|
- """
|
|
|
- return list_results
|
|
|
+ files["text"] = doc.text
|
|
|
+
|
|
|
+ return files
|
|
|
return {}
|
|
|
|
|
|
# TODO 删除s3&r2r文件
|