refactor

Author: Andrei Neagu

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

@@ -9,8 +9,8 @@
 )
 from servicelib.rabbitmq import RabbitMQClient
 
-from ...services.postgres import PostgresHealth
-from .dependencies import get_postgres_health, get_rabbitmq_client
+from ...services.postgres import PostgresLiveness
+from .dependencies import get_postgres_liveness, get_rabbitmq_client
 
 router = APIRouter()
 
@@ -22,12 +22,12 @@ class HealthCheckError(RuntimeError):
 @router.get("/", response_model=HealthCheckGet)
 async def check_service_health(
     rabbitmq_client: Annotated[RabbitMQClient, Depends(get_rabbitmq_client)],
-    postgres_health: Annotated[PostgresHealth, Depends(get_postgres_health)],
+    postgres_liveness: Annotated[PostgresLiveness, Depends(get_postgres_liveness)],
 ):
     if not rabbitmq_client.healthy:
         raise HealthCheckError(RABBITMQ_CLIENT_UNHEALTHY_MSG)
 
-    if not postgres_health.is_responsive:
+    if not postgres_liveness.is_responsive:
         raise HealthCheckError(POSRGRES_DATABASE_UNHEALTHY_MSG)
 
     return HealthCheckGet(timestamp=f"{__name__}@{arrow.utcnow().datetime.isoformat()}")

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

@@ -5,8 +5,8 @@
 from fastapi import Depends, FastAPI, Request
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
-from ...services.postgres import PostgresHealth
-from ...services.postgres import get_postgres_health as get_postgress_db_health
+from ...services.postgres import PostgresLiveness
+from ...services.postgres import get_postgres_liveness as get_postgress_db_liveness
 
 
 def get_application(request: Request) -> FastAPI:
@@ -20,7 +20,7 @@ def get_rabbitmq_client(
     return app.state.rabbitmq_rpc_server
 
 
-def get_postgres_health(
+def get_postgres_liveness(
     app: Annotated[FastAPI, Depends(get_application)],
-) -> PostgresHealth:
-    return get_postgress_db_health(app)
+) -> PostgresLiveness:
+    return get_postgress_db_liveness(app)

services/notifications/src/simcore_service_notifications/services/postgres/__init__.py

@@ -6,16 +6,15 @@
 from servicelib.fastapi.postgres_lifespan import PostgresLifespanState
 from servicelib.logging_utils import log_context
 
-from ...core.settings import ApplicationSettings
-from ._health import PostgresHealth
+from ._liveness import PostgresLiveness
 
 _logger = logging.getLogger(__name__)
 
 
 async def postgres_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]:
     app.state.engine = state[PostgresLifespanState.POSTGRES_ASYNC_ENGINE]
 
-    app.state.postgres_health = PostgresHealth(app)
+    app.state.postgres_health = PostgresLiveness(app)
 
     with log_context(_logger, logging.INFO, msg="setup postgres health"):
         await app.state.postgres_health.setup()
@@ -26,9 +25,9 @@ async def postgres_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]:
         await app.state.postgres_health.teardown()
 
 
-def get_postgres_health(app: FastAPI) -> PostgresHealth:
-    assert isinstance(app.state.postgres_health, PostgresHealth)  # nosec
+def get_postgres_liveness(app: FastAPI) -> PostgresLiveness:
+    assert isinstance(app.state.postgres_health, PostgresLiveness)  # nosec
     return app.state.postgres_health
 
 
-__all__: tuple[str, ...] = ("PostgresHealth",)
+__all__: tuple[str, ...] = ("PostgresLiveness",)

services/notifications/src/simcore_service_notifications/services/postgres/_health.py renamed to services/notifications/src/simcore_service_notifications/services/postgres/_liveness.py

@@ -13,7 +13,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class PostgresHealth:
+class PostgresLiveness:
     def __init__(self, app: FastAPI) -> None:
         self.app = app