jack пре 1 недеља
родитељ
комит
83da81f591
2 измењених фајлова са 16 додато и 16 уклоњено
  1. 12 12
      app/providers/r2r.py
  2. 4 4
      app/services/file/impl/r2r_file.py

+ 12 - 12
app/providers/r2r.py

@@ -136,24 +136,24 @@ class R2R:
     async def _check_login(self):
         if not self.auth_enabled:
             return
-        # if self.client.access_token and verify_jwt_expiration(self.client.access_token):
-        #    return
-        # else:
-        return await self.init()
+        if self.client.access_token and verify_jwt_expiration(self.client.access_token):
+            return self.client
+        else:
+            return await self.init()
 
     def _check_login_sync(self):
         print("access_tokenaccess_tokenaccess_tokenaccess_token")
         # print(client_sync)
         if not self.auth_enabled:
             return
-        # try:
-        #    if self.client_sync.access_token and verify_jwt_expiration(
-        #        self.client_sync.access_token
-        #     ):
-        #         print(self.client_sync.access_token)
-        #         return
-        # except Exception as e:
-        #     print(e)
+        try:
+            if self.client_sync.access_token and verify_jwt_expiration(
+                self.client_sync.access_token
+            ):
+                print(self.client_sync.access_token)
+                return self.client_sync
+        except Exception as e:
+            print(e)
         return self.init_sync()
 
 

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

@@ -123,7 +123,7 @@ class R2RFileService(OSSFileService):
         )
         """
         r2r = R2R()
-        r2r.init_sync()
+        # r2r.init_sync()
         search_results = r2r.search(query, filters=filters)
 
         if not search_results:
@@ -157,7 +157,7 @@ class R2RFileService(OSSFileService):
         list_results = asyncio.run(r2r.list(ids=ids, offset=offset, limit=limit))
         """
         r2r = R2R()
-        r2r.init_sync()
+        # r2r.init_sync()
         list_results = r2r.list(ids=ids, offset=offset, limit=limit)
         return list_results
 
@@ -179,7 +179,7 @@ class R2RFileService(OSSFileService):
         )
         """
         r2r = R2R()
-        r2r.init_sync()
+        # r2r.init_sync()
         list_results = r2r.list_documents(id=id, offset=offset, limit=limit)
         return list_results
 
@@ -187,7 +187,7 @@ class R2RFileService(OSSFileService):
     def list_chunks(ids: list[str]) -> dict:
         if len(ids) > 0:
             r2r = R2R()
-            r2r.init_sync()
+            # r2r.init_sync()
             list_results = r2r.list_chunks(ids=ids)
 
             files = {}