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