fix init of asyncpg

Author: sanderegg

packages/service-library/src/servicelib/db_async_engine.py

@@ -27,17 +27,17 @@ async def connect_to_db(app: FastAPI, settings: PostgresSettings) -> None:
     with log_context(
         _logger, logging.DEBUG, f"connection to db {settings.dsn_with_async_sqlalchemy}"
     ):
+        server_settings = None
+        if settings.POSTGRES_CLIENT_NAME:
+            assert isinstance(settings.POSTGRES_CLIENT_NAME, str)  # nosec
+            server_settings = {
+                "application_name": settings.POSTGRES_CLIENT_NAME,
+            }
         engine = create_async_engine(
             settings.dsn_with_async_sqlalchemy,
             pool_size=settings.POSTGRES_MINSIZE,
             max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
-            connect_args={
-                "server_settings": (
-                    {"application_name": settings.POSTGRES_CLIENT_NAME}
-                    if settings.POSTGRES_CLIENT_NAME
-                    else None
-                )
-            },
+            connect_args={"server_settings": server_settings},
             pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
             future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released
         )

packages/service-library/src/servicelib/db_asyncpg_utils.py

@@ -29,6 +29,7 @@ async def create_async_engine_and_database_ready(
 
     server_settings = None
     if settings.POSTGRES_CLIENT_NAME:
+        assert isinstance(settings.POSTGRES_CLIENT_NAME, str)  # nosec
         server_settings = {
             "application_name": settings.POSTGRES_CLIENT_NAME,
         }
@@ -37,7 +38,7 @@ async def create_async_engine_and_database_ready(
         settings.dsn_with_async_sqlalchemy,
         pool_size=settings.POSTGRES_MINSIZE,
         max_overflow=settings.POSTGRES_MAXSIZE - settings.POSTGRES_MINSIZE,
-        connect_args={"server_settings": server_settings} if server_settings else None,
+        connect_args={"server_settings": server_settings},
         pool_pre_ping=True,  # https://docs.sqlalchemy.org/en/14/core/pooling.html#dealing-with-disconnects
         future=True,  # this uses sqlalchemy 2.0 API, shall be removed when sqlalchemy 2.0 is released
     )