jack 1 ヶ月 前
コミット
2f49a19d8f
1 ファイル変更9 行追加2 行削除
  1. 9 2
      app/services/file/impl/r2r_file.py

+ 9 - 2
app/services/file/impl/r2r_file.py

@@ -73,9 +73,16 @@ class R2RFileService(OSSFileService):
         query: str, file_keys: List[str], folder_keys: List[str] = None
     ) -> dict:
         files = {}
-        filters = {"file_key": {"$in": file_keys}}
+        filters = {
+            "$or": [
+                {"file_key": {"$in": file_keys}},
+                {"document_id": {"$in": file_keys}},
+            ]
+        }
         if folder_keys:
-            filters = {"$or": [filters, {"collection_ids": {"$in": folder_keys}}]}
+            filters = filters["$or"].append(
+                {"collection_ids": {"$in": folder_keys}}
+            )  ## {"$or": [filters, {"collection_ids": {"$in": folder_keys}}]}
         ##filters["collection_ids"] = {"$overlap": folder_keys}
         ## {"$and": {"$document_id": ..., "collection_ids": ...}}
         """