upgrade-redis

Author: JKL98ISR

backend/deepchecks_monitoring/utils/redis_proxy.py

@@ -33,6 +33,14 @@ def __init__(self, settings: RedisSettings):
         self.settings = settings
         self.client = None
 
+    @classmethod
+    async def _get_redis_client(cls, settings: RedisSettings):
+        try:
+            client = RedisCluster.from_url(settings.redis_uri)
+            await client.ping()
+        except redis_exceptions_tuple:  # pylint: disable=catching-non-exception
+            client = Redis.from_url(settings.redis_uri)
+
     async def init_conn_async(self):
         """Connect to Redis."""
         @retry(
@@ -42,11 +50,7 @@ async def init_conn_async(self):
             reraise=True
         )
         async def connect_to_redis():
-            try:
-                self.client = RedisCluster.from_url(self.settings.redis_uri)
-                await self.client.ping()
-            except redis_exceptions_tuple:  # pylint: disable=catching-non-exception
-                self.client = Redis.from_url(self.settings.redis_uri)
+            self.client = await self._get_redis_client(self.settings)
         await connect_to_redis()
 
     def __getattr__(self, name):
@@ -68,4 +72,4 @@ def wrapped(*args, **kwargs):
 
             return wrapped
         else:
-            return attr
+            return attr

backend/tests/conftest.py

@@ -217,21 +217,24 @@ def mock_get_features_control(self, user):  # pylint: disable=unused-argument
 
 @pytest_asyncio.fixture(scope="function")
 async def resources_provider(settings, features_control_mock, async_redis):
+    async def _get_redis_client(*_):
+        async_redis.connection_pool.reset()
+        return async_redis
     patch.object(ResourcesProvider, "get_features_control", features_control_mock).start()
-    patch.object(RedisProxy, "_connect", lambda *_: (async_redis.connection_pool.reset() or async_redis)).start()
+    patch.object(RedisProxy, "_get_redis_client", _get_redis_client).start()
     yield ResourcesProvider(settings)
 
 
-@pytest_asyncio.fixture(scope="function")
+@ pytest_asyncio.fixture(scope="function")
 async def application(
     resources_provider: ResourcesProvider,
     settings: Settings
 ) -> FastAPI:
     """Create application instance."""
     return create_application(
-        resources_provider=resources_provider,
-        settings=settings,
-        log_level="ERROR"
+        resources_provider = resources_provider,
+        settings = settings,
+        log_level = "ERROR"
     )