✨ Refactor repository lifespan management: replace database_lifespan with repository_lifespan for improved clarity

Author: pcrespov

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

@@ -5,7 +5,6 @@
 from fastapi_lifespan_manager import LifespanManager, State
 from servicelib.fastapi.postgres_lifespan import (
     PostgresLifespanState,
-    postgres_database_lifespan,
 )
 from servicelib.fastapi.prometheus_instrumentation import (
     lifespan_prometheus_instrumentation,
@@ -15,7 +14,7 @@
 from ..api.rpc.events import rpc_api_lifespan
 from ..clients.director import director_lifespan
 from ..clients.rabbitmq import rabbitmq_lifespan
-from ..repository.events import database_lifespan
+from ..repository.events import repository_lifespan
 from ..service.function_services import function_services_lifespan
 from .background_tasks import background_task_lifespan
 from .settings import ApplicationSettings
@@ -62,8 +61,7 @@ def create_app_lifespan():
     app_lifespan.add(_main_lifespan)
 
     # - postgres
-    app_lifespan.add(postgres_database_lifespan)
-    app_lifespan.add(database_lifespan)
+    app_lifespan.add(repository_lifespan)
 
     # - rabbitmq
     app_lifespan.add(rabbitmq_lifespan)

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

@@ -2,15 +2,23 @@
 from collections.abc import AsyncIterator
 
 from fastapi import FastAPI
-from fastapi_lifespan_manager import State
-from servicelib.fastapi.postgres_lifespan import PostgresLifespanState
+from fastapi_lifespan_manager import LifespanManager, State
+from servicelib.fastapi.postgres_lifespan import (
+    PostgresLifespanState,
+    postgres_database_lifespan,
+)
 
 from .products import ProductsRepository
 
 _logger = logging.getLogger(__name__)
 
 
-async def database_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]:
+repository_lifespan = LifespanManager()
+repository_lifespan.add(postgres_database_lifespan)
+
+
+@repository_lifespan.add
+async def _database_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]:
     app.state.engine = state[PostgresLifespanState.POSTGRES_ASYNC_ENGINE]
 
     repo = ProductsRepository(db_engine=app.state.engine)

services/catalog/tests/unit/conftest.py

@@ -17,6 +17,8 @@
 import simcore_service_catalog
 import simcore_service_catalog.core.application
 import simcore_service_catalog.core.events
+import simcore_service_catalog.repository
+import simcore_service_catalog.repository.events
 import yaml
 from asgi_lifespan import LifespanManager
 from faker import Faker
@@ -216,11 +218,10 @@ def service_caching_disabled(monkeypatch: pytest.MonkeyPatch) -> None:
 
 
 @pytest.fixture
-def postgres_setup_disabled(mocker: MockerFixture):
+def repository_lifespan_disabled(mocker: MockerFixture):
     mocker.patch.object(
-        simcore_service_catalog.core.events, "postgres_database_lifespan"
+        simcore_service_catalog.repository.events, "repository_lifespan"
     )
-    mocker.patch.object(simcore_service_catalog.core.events, "database_lifespan")
 
 
 @pytest.fixture

services/catalog/tests/unit/test_api_rest.py

@@ -9,7 +9,7 @@
 
 
 def test_sync_client(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,
     director_setup_disabled: None,
@@ -24,7 +24,7 @@ def test_sync_client(
 
 
 async def test_async_client(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,
     director_setup_disabled: None,

services/catalog/tests/unit/test_service_director.py

@@ -33,7 +33,7 @@ def app_environment(
 
 
 async def test_director_client_high_level_api(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     background_tasks_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     expected_director_list_services: list[dict[str, Any]],
@@ -59,7 +59,7 @@ async def test_director_client_high_level_api(
 
 
 async def test_director_client_low_level_api(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     background_tasks_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,

services/catalog/tests/unit/test_service_manifest.py

@@ -32,7 +32,7 @@ def app_environment(
 
 
 async def test_services_manifest_api(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     app: FastAPI,

services/catalog/tests/unit/test_utils_service_extras.py

@@ -17,7 +17,7 @@ def mock_engine(app: FastAPI) -> None:
 
 
 async def test_get_service_extras(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,

services/catalog/tests/unit/test_utils_service_labels.py

@@ -16,7 +16,7 @@ def mock_engine(app: FastAPI) -> None:
 
 
 async def test_get_service_labels(
-    postgres_setup_disabled: None,
+    repository_lifespan_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,