✨ Implement Redis client lifespan management and integrate into application lifecycle

Author: pcrespov

services/catalog/src/simcore_service_catalog/clients/redis.py

@@ -0,0 +1,25 @@
+from collections.abc import AsyncIterator
+from typing import cast
+
+from fastapi import FastAPI
+from fastapi_lifespan_manager import LifespanManager, State
+from servicelib.fastapi.redis_lifespan import (
+    redis_database_lifespan,
+)
+from servicelib.redis import RedisClientSDK
+
+redis_client_lifespan = LifespanManager()
+redis_client_lifespan.add(redis_database_lifespan)
+
+
+@redis_client_lifespan.add
+async def _redis_client_sdk_lifespan(
+    app: FastAPI, state: State
+) -> AsyncIterator[State]:
+    app.state.redis_client_sdk = state["REDIS_CLIENT_SDK"]
+    yield {}
+    del app.state.redis_client_sdk
+
+
+def get_redis_client(app: FastAPI) -> RedisClientSDK:
+    return cast(RedisClientSDK, app.state.redis_client_sdk)

services/catalog/src/simcore_service_catalog/core/events.py

@@ -12,14 +12,14 @@
 )
 from servicelib.fastapi.redis_lifespan import (
     RedisLifespanState,
-    redis_database_lifespan,
 )
 from settings_library.redis import RedisDatabase
 
 from .._meta import APP_FINISHED_BANNER_MSG, APP_NAME, APP_STARTED_BANNER_MSG
 from ..api.rpc.events import rpc_api_lifespan
 from ..clients.director import director_lifespan
 from ..clients.rabbitmq import rabbitmq_lifespan
+from ..clients.redis import redis_client_lifespan
 from ..repository.events import repository_lifespan_manager
 from ..service.function_services import function_services_lifespan
 from .background_tasks import background_task_lifespan
@@ -81,8 +81,9 @@ def create_app_lifespan() -> LifespanManager:
     app_lifespan.add(function_services_lifespan)
 
     # - redis
+    app_lifespan.include(redis_client_lifespan)
+
     # - background task
-    app_lifespan.add(redis_database_lifespan)
     app_lifespan.add(background_task_lifespan)
 
     # - prometheus instrumentation

services/catalog/tests/unit/conftest.py

@@ -227,17 +227,17 @@ def repository_lifespan_disabled(mocker: MockerFixture):
 
 
 @pytest.fixture
-def redis_lifespan_disabled(mocker: MockerFixture):
+def redis_client_lifespan(mocker: MockerFixture):
     mocker.patch.object(
         simcore_service_catalog.core.events,
-        "redis_database_lifespan",
+        "redis_client_lifespan",
         autospec=True,
     )
 
 
 @pytest.fixture
 def background_task_lifespan_disabled(
-    mocker: MockerFixture, redis_lifespan_disabled: None
+    mocker: MockerFixture, redis_client_lifespan: None
 ) -> None:
     class MockedBackgroundTaskContextManager:
         async def __aenter__(self):