jack 1 Minggu lalu
induk
melakukan
f148289caf
2 mengubah file dengan 8 tambahan dan 9 penghapusan
  1. 2 3
      app/providers/r2r.py
  2. 6 6
      app/services/file/impl/r2r_file.py

+ 2 - 3
app/providers/r2r.py

@@ -155,9 +155,8 @@ class R2R:
 
 
 # 创建 R2R 实例
-r2r = R2R()
 
 
 # 在您的应用程序启动时调用 initialize_r2r()
-async def initialize_r2r():
-    await r2r.init()
+# async def initialize_r2r():
+#    await r2r.init()

+ 6 - 6
app/services/file/impl/r2r_file.py

@@ -8,7 +8,7 @@ from fastapi import UploadFile
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.models import File
-from app.providers.r2r import r2r
+from app.providers.r2r import R2R
 from app.providers.storage import storage
 from app.services.file.impl.oss_file import OSSFileService
 
@@ -49,7 +49,7 @@ class R2RFileService(OSSFileService):
                     await f.write(content)
 
             # storage.save_from_path(filename=file_key, local_file_path=tmp_file_path)
-            await r2r.init()
+            r2r = await R2R().init()
             fileinfo = await r2r.ingest_file(
                 file_path=tmp_file_path,
                 metadata={"file_key": file_key, "title": file.filename},
@@ -121,7 +121,7 @@ class R2RFileService(OSSFileService):
             r2r.search(query, filters={"file_key": {"$in": file_keys}})
         )
         """
-        # r2r.init_sync()
+        r2r = R2R().init_sync()
         search_results = r2r.search(query, filters=filters)
 
         if not search_results:
@@ -154,7 +154,7 @@ class R2RFileService(OSSFileService):
         asyncio.run(r2r.init())
         list_results = asyncio.run(r2r.list(ids=ids, offset=offset, limit=limit))
         """
-        # r2r.init_sync()
+        r2r = R2R().init_sync()
         list_results = r2r.list(ids=ids, offset=offset, limit=limit)
         return list_results
 
@@ -175,14 +175,14 @@ class R2RFileService(OSSFileService):
             r2r.list_documents(id=id, offset=offset, limit=limit)
         )
         """
-        # r2r.init_sync()
+        r2r = R2R().init_sync()
         list_results = r2r.list_documents(id=id, offset=offset, limit=limit)
         return list_results
 
     @staticmethod
     def list_chunks(ids: list[str]) -> dict:
         if len(ids) > 0:
-            # r2r.init_sync()
+            r2r = R2R().init_sync()
             list_results = r2r.list_chunks(ids=ids)
 
             files = {}