|
@@ -127,15 +127,13 @@ class R2RFileService(OSSFileService):
|
|
|
return files
|
|
|
|
|
|
for doc in search_results:
|
|
|
- file_key = doc.get("metadata").get("file_key")
|
|
|
- file_key = (
|
|
|
- doc.get("metadata").get("title") if file_key is None else file_key
|
|
|
- )
|
|
|
- text = doc.get("text")
|
|
|
+ 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}"
|
|
|
else:
|
|
|
- files[file_key] = doc.get("text")
|
|
|
+ files[file_key] = doc.text
|
|
|
|
|
|
return files
|
|
|
|
|
@@ -186,15 +184,13 @@ class R2RFileService(OSSFileService):
|
|
|
list_results = r2r.list_chunks(ids=ids)
|
|
|
files = {}
|
|
|
for doc in list_results:
|
|
|
- file_key = doc.get("metadata").get("file_key")
|
|
|
- file_key = (
|
|
|
- doc.get("metadata").get("title") if file_key is None else file_key
|
|
|
- )
|
|
|
- text = doc.get("text")
|
|
|
+ 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}"
|
|
|
else:
|
|
|
- files[file_key] = doc.get("text")
|
|
|
+ files[file_key] = doc.text
|
|
|
return list_results
|
|
|
return {}
|
|
|
|