Skip to content

Commit aca8cdc

Browse files
committed
✨ Refactor: Rename async engine creation function for clarity and deprecate old function
1 parent adcb425 commit aca8cdc

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

packages/service-library/src/servicelib/aiohttp/db_asyncpg_engine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
)
1616
from sqlalchemy.ext.asyncio import AsyncEngine
1717

18-
from ..db_asyncpg_utils import create_async_engine_and_database_ready
18+
from ..db_asyncpg_utils import create_async_engine_and_wait_for_database_ready
1919
from ..logging_utils import log_context
2020

2121
APP_DB_ASYNC_ENGINE_KEY: Final[str] = f"{__name__ }.AsyncEngine"
@@ -55,7 +55,7 @@ async def connect_to_db(app: web.Application, settings: PostgresSettings) -> Non
5555
"Connecting app[APP_DB_ASYNC_ENGINE_KEY] to postgres with %s",
5656
f"{settings=}",
5757
):
58-
engine = await create_async_engine_and_database_ready(settings)
58+
engine = await create_async_engine_and_wait_for_database_ready(settings)
5959
_set_async_engine_to_app_state(app, engine)
6060

6161
_logger.info(

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import logging
2+
import warnings
23

34
from fastapi import FastAPI
45
from settings_library.postgres import PostgresSettings
@@ -17,6 +18,11 @@
1718

1819
@retry(**PostgresRetryPolicyUponInitialization(_logger).kwargs)
1920
async def connect_to_db(app: FastAPI, settings: PostgresSettings) -> None:
21+
warnings.warn(
22+
"The 'connect_to_db' function is deprecated and will be removed in a future release. "
23+
"Please use 'postgres_lifespan' instead for managing the database connection lifecycle.",
24+
DeprecationWarning,
25+
)
2026
with log_context(
2127
_logger, logging.DEBUG, f"connection to db {settings.dsn_with_async_sqlalchemy}"
2228
):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
@retry(**PostgresRetryPolicyUponInitialization(_logger).kwargs)
17-
async def create_async_engine_and_database_ready(
17+
async def create_async_engine_and_wait_for_database_ready(
1818
settings: PostgresSettings,
1919
) -> AsyncEngine:
2020
"""

packages/service-library/src/servicelib/fastapi/db_asyncpg_engine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
)
88
from sqlalchemy.ext.asyncio import AsyncEngine
99

10-
from ..db_asyncpg_utils import create_async_engine_and_database_ready
10+
from ..db_asyncpg_utils import create_async_engine_and_wait_for_database_ready
1111
from ..logging_utils import log_context
1212

1313
_logger = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ async def connect_to_db(app: FastAPI, settings: PostgresSettings) -> None:
1919
logging.DEBUG,
2020
f"Connecting and migraging {settings.dsn_with_async_sqlalchemy}",
2121
):
22-
engine = await create_async_engine_and_database_ready(settings)
22+
engine = await create_async_engine_and_wait_for_database_ready(settings)
2323

2424
app.state.engine = engine
2525
_logger.debug(

packages/service-library/src/servicelib/fastapi/postgres_lifespan.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from settings_library.postgres import PostgresSettings
88
from sqlalchemy.ext.asyncio import AsyncEngine
99

10-
from ..db_asyncpg_utils import create_async_engine_and_database_ready
10+
from ..db_asyncpg_utils import create_async_engine_and_wait_for_database_ready
1111

1212
_logger = logging.getLogger(__name__)
1313

@@ -30,8 +30,8 @@ async def setup_postgres_database(_, state: State) -> AsyncIterator[State]:
3030
]
3131
assert isinstance(pg_settings, PostgresSettings) # nosec
3232

33-
async_engine: AsyncEngine = await create_async_engine_and_database_ready(
34-
pg_settings
33+
async_engine: AsyncEngine = (
34+
await create_async_engine_and_wait_for_database_ready(pg_settings)
3535
)
3636

3737
yield {PostgresLifespanStateKeys.POSTGRES_ASYNC_ENGINE: async_engine}

services/director-v2/src/simcore_service_director_v2/modules/db/_asyncpg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from fastapi import FastAPI
44
from servicelib.db_asyncpg_utils import (
5-
create_async_engine_and_database_ready,
5+
create_async_engine_and_wait_for_database_ready,
66
)
77
from servicelib.logging_utils import log_context
88
from settings_library.postgres import PostgresSettings
@@ -17,7 +17,7 @@ async def asyncpg_connect_to_db(app: FastAPI, settings: PostgresSettings) -> Non
1717
logging.DEBUG,
1818
f"Connecting and migraging {settings.dsn_with_async_sqlalchemy}",
1919
):
20-
engine = await create_async_engine_and_database_ready(settings)
20+
engine = await create_async_engine_and_wait_for_database_ready(settings)
2121

2222
app.state.asyncpg_engine = engine
2323
_logger.debug(

0 commit comments

Comments
 (0)