migrate to lifespan from setup

Author: Andrei Neagu

services/notifications/src/simcore_service_notifications/api/rest/routes.py

@@ -7,7 +7,7 @@
 from . import _health
 
 
-def setup_rest_api(app: FastAPI):
+def initialize_rest_api(app: FastAPI) -> None:
     app.include_router(_health.router)
 
     app.add_exception_handler(Exception, handle_errors_as_500)

services/notifications/src/simcore_service_notifications/api/rpc/routes.py

@@ -1,4 +1,7 @@
+from collections.abc import AsyncIterator
+
 from fastapi import FastAPI
+from fastapi_lifespan_manager import State
 from models_library.api_schemas_notifications import NOTIFICATIONS_RPC_NAMESPACE
 from servicelib.rabbitmq import RPCRouter
 
@@ -9,11 +12,10 @@
 ]
 
 
-def setup_rpc_api_routes(app: FastAPI) -> None:
-    async def startup() -> None:
-        rpc_server = get_rabbitmq_rpc_server(app)
+async def lifespan_rpc_api_routes(app: FastAPI) -> AsyncIterator[State]:
+    rpc_server = get_rabbitmq_rpc_server(app)
 
-        for router in ROUTERS:
-            await rpc_server.register_router(router, NOTIFICATIONS_RPC_NAMESPACE, app)
+    for router in ROUTERS:
+        await rpc_server.register_router(router, NOTIFICATIONS_RPC_NAMESPACE, app)
 
-    app.add_event_handler("startup", startup)
+    yield {}

services/notifications/src/simcore_service_notifications/core/application.py

@@ -1,6 +1,9 @@
 import logging
+from collections.abc import AsyncIterator
 
 from fastapi import FastAPI
+from fastapi_lifespan_manager import State
+from servicelib.fastapi.lifespan_utils import LifespanGenerator, combine_lifespans
 from servicelib.fastapi.openapi import (
     get_common_oas_options,
     override_fastapi_openapi_method,
@@ -16,15 +19,15 @@
     SUMMARY,
     VERSION,
 )
-from ..api.rest.routes import setup_rest_api
-from ..api.rpc.routes import setup_rpc_api_routes
-from ..services.rabbitmq import setup_rabbitmq
+from ..api.rest.routes import initialize_rest_api
+from ..api.rpc.routes import lifespan_rpc_api_routes
+from ..services.rabbitmq import lifespan_rabbitmq
 from .settings import ApplicationSettings
 
-logger = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)
 
 
-def _setup_logger(settings: ApplicationSettings):
+def _initialise_logger(settings: ApplicationSettings):
     # SEE https://github.com/ITISFoundation/osparc-simcore/issues/3148
     logging.basicConfig(level=settings.LOG_LEVEL.value)  # NOSONAR
     logging.root.setLevel(settings.LOG_LEVEL.value)
@@ -35,10 +38,23 @@ def _setup_logger(settings: ApplicationSettings):
     )
 
 
+async def _lifespan_banner(app: FastAPI) -> AsyncIterator[State]:
+    _ = app
+    print(APP_STARTED_BANNER_MSG, flush=True)  # noqa: T201
+    yield {}
+    print(APP_FINISHED_BANNER_MSG, flush=True)  # noqa: T201
+
+
 def create_app() -> FastAPI:
     settings = ApplicationSettings.create_from_envs()
-    _setup_logger(settings)
-    logger.debug(settings.model_dump_json(indent=2))
+    _logger.debug(settings.model_dump_json(indent=2))
+
+    _initialise_logger(settings)
+
+    lifespans: list[LifespanGenerator] = [
+        lifespan_rabbitmq,
+        lifespan_rpc_api_routes,
+    ]
 
     assert settings.SC_BOOT_MODE  # nosec
     app = FastAPI(
@@ -47,25 +63,15 @@ def create_app() -> FastAPI:
         description=SUMMARY,
         version=f"{VERSION}",
         openapi_url=f"/api/{API_VTAG}/openapi.json",
+        lifespan=combine_lifespans(*lifespans, _lifespan_banner),
         **get_common_oas_options(is_devel_mode=settings.SC_BOOT_MODE.is_devel_mode()),
     )
     override_fastapi_openapi_method(app)
     app.state.settings = settings
 
-    setup_rabbitmq(app)
-    setup_rest_api(app)
-    setup_rpc_api_routes(app)
+    initialize_rest_api(app)
 
     if settings.NOTIFICATIONS_TRACING:
         initialize_tracing(app, settings.NOTIFICATIONS_TRACING, APP_NAME)
 
-    async def _on_startup() -> None:
-        print(APP_STARTED_BANNER_MSG, flush=True)  # noqa: T201
-
-    async def _on_shutdown() -> None:
-        print(APP_FINISHED_BANNER_MSG, flush=True)  # noqa: T201
-
-    app.add_event_handler("startup", _on_startup)
-    app.add_event_handler("shutdown", _on_shutdown)
-
     return app

services/notifications/src/simcore_service_notifications/services/rabbitmq.py

@@ -1,27 +1,25 @@
+from collections.abc import AsyncIterator
 from typing import cast
 
 from fastapi import FastAPI
+from fastapi_lifespan_manager import State
 from servicelib.rabbitmq import RabbitMQRPCClient, wait_till_rabbitmq_responsive
 from settings_library.rabbit import RabbitSettings
 
 
-def setup_rabbitmq(app: FastAPI) -> None:
+async def lifespan_rabbitmq(app: FastAPI) -> AsyncIterator[State]:
     settings: RabbitSettings = app.state.settings.NOTIFICATIONS_RABBITMQ
     app.state.rabbitmq_rpc_server = None
 
-    async def _on_startup() -> None:
-        await wait_till_rabbitmq_responsive(settings.dsn)
+    await wait_till_rabbitmq_responsive(settings.dsn)
 
-        app.state.rabbitmq_rpc_server = await RabbitMQRPCClient.create(
-            client_name="dynamic_scheduler_rpc_server", settings=settings
-        )
+    app.state.rabbitmq_rpc_server = await RabbitMQRPCClient.create(
+        client_name="dynamic_scheduler_rpc_server", settings=settings
+    )
 
-    async def _on_shutdown() -> None:
-        if app.state.rabbitmq_rpc_server:
-            await app.state.rabbitmq_rpc_server.close()
+    yield {}
 
-    app.add_event_handler("startup", _on_startup)
-    app.add_event_handler("shutdown", _on_shutdown)
+    await app.state.rabbitmq_rpc_server.close()
 
 
 def get_rabbitmq_rpc_server(app: FastAPI) -> RabbitMQRPCClient: