✨ Refactor service lifespan management: rename repository_lifespan to repository_lifespan_manager for improved clarity

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/rpc/_services.py

@@ -210,17 +210,17 @@ async def batch_get_my_services(
 ) -> list[MyServiceGet]:
     assert app.state.engine  # nosec
 
-    services = await services.batch_get_my_services(
+    services_batch = await services.batch_get_my_services(
         repo=ServicesRepository(app.state.engine),
         groups_repo=GroupsRepository(app.state.engine),
         product_name=product_name,
         user_id=user_id,
         ids=ids,
     )
 
-    assert [(sv.key, sv.release.version) for sv in services] == ids  # nosec
+    assert [(sv.key, sv.release.version) for sv in services_batch] == ids  # nosec
 
-    return services
+    return services_batch
 
 
 @router.expose(reraise_if_error_type=(ValidationError,))

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

@@ -14,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 repository_lifespan
+from ..repository.events import repository_lifespan_manager
 from ..service.function_services import function_services_lifespan
 from .background_tasks import background_task_lifespan
 from .settings import ApplicationSettings
@@ -61,7 +61,7 @@ def create_app_lifespan():
     app_lifespan.add(_main_lifespan)
 
     # - postgres
-    app_lifespan.add(repository_lifespan)
+    app_lifespan.include(repository_lifespan_manager)
 
     # - rabbitmq
     app_lifespan.add(rabbitmq_lifespan)

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

@@ -13,11 +13,11 @@
 _logger = logging.getLogger(__name__)
 
 
-repository_lifespan = LifespanManager()
-repository_lifespan.add(postgres_database_lifespan)
+repository_lifespan_manager = LifespanManager()
+repository_lifespan_manager.add(postgres_database_lifespan)
 
 
-@repository_lifespan.add
+@repository_lifespan_manager.add
 async def _database_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]:
     app.state.engine = state[PostgresLifespanState.POSTGRES_ASYNC_ENGINE]
 

services/catalog/tests/unit/conftest.py

@@ -220,7 +220,9 @@ def service_caching_disabled(monkeypatch: pytest.MonkeyPatch) -> None:
 @pytest.fixture
 def repository_lifespan_disabled(mocker: MockerFixture):
     mocker.patch.object(
-        simcore_service_catalog.repository.events, "repository_lifespan"
+        simcore_service_catalog.core.events,
+        "repository_lifespan_manager",
+        autospec=True,
     )
 
 
@@ -244,6 +246,7 @@ async def __aexit__(self, exc_type, exc_value, traceback):
     mocker.patch.object(
         simcore_service_catalog.core.events,
         "background_task_lifespan",
+        autospec=True,
         return_value=MockedBackgroundTaskContextManager(),
     )
 
@@ -256,8 +259,12 @@ async def __aexit__(self, exc_type, exc_value, traceback):
 @pytest.fixture
 def rabbitmq_and_rpc_setup_disabled(mocker: MockerFixture):
     # The following services are affected if rabbitmq is not in place
-    mocker.patch.object(simcore_service_catalog.core.events, "rabbitmq_lifespan")
-    mocker.patch.object(simcore_service_catalog.core.events, "rpc_api_lifespan")
+    mocker.patch.object(
+        simcore_service_catalog.core.events, "rabbitmq_lifespan", autospec=True
+    )
+    mocker.patch.object(
+        simcore_service_catalog.core.events, "rpc_api_lifespan", autospec=True
+    )
 
 
 @pytest.fixture
@@ -274,7 +281,9 @@ async def rpc_client(
 
 @pytest.fixture
 def director_setup_disabled(mocker: MockerFixture) -> None:
-    mocker.patch.object(simcore_service_catalog.core.events, "director_lifespan")
+    mocker.patch.object(
+        simcore_service_catalog.core.events, "director_lifespan", autospec=True
+    )
 
 
 @pytest.fixture