jack 1 miesiąc temu
rodzic
commit
f6ee2a7718

+ 3 - 1
app/core/tools/file_search_tool.py

@@ -75,11 +75,13 @@ class FileSearchTool(BaseTool):
 
     def run(self, indexes: List[int], query: str) -> dict:
         file_keys = []
-        print(self.__keys)
+
         for index in indexes:
             file_key = self.__keys[index]
             file_keys.append(file_key)
 
+        print(file_key)
+        self.loop = asyncio.get_event_loop()
         files = self.loop.run_until_complete(
             FileService.search_in_files(query=query, file_keys=file_keys)
         )

+ 7 - 0
app/services/file/impl/r2r_file.py

@@ -77,6 +77,7 @@ class R2RFileService(OSSFileService):
         file_key = {"$in": []}
         document_id = {"$in": []}
         filters = {"$or": []}
+
         for key in file_keys:
             if len(key) == 36:
                 document_id["$in"].append(key)
@@ -101,6 +102,8 @@ class R2RFileService(OSSFileService):
             ]
         }
         """
+        if len(filters["$or"]) < 2:
+            filters = filters["$or"][0]
         print("filtersfiltersfiltersfiltersfiltersfiltersfiltersfiltersfiltersfilters")
         print(filters)
         """
@@ -109,6 +112,10 @@ class R2RFileService(OSSFileService):
         search_results = loop.run_until_complete(r2r.search(query, filters=filters))
         asyncio.run(r2r.init())
         search_results = asyncio.run(r2r.search(query, filters=filters))
+        
+        search_results = loop.run_until_complete(
+            r2r.search(query, filters={"file_key": {"$in": file_keys}})
+        )
         """
         await r2r.init()
         search_results = await r2r.search(query, filters=filters)