use asyncpg

Author: sanderegg

services/api-server/src/simcore_service_api_server/api/dependencies/database.py

@@ -5,7 +5,9 @@
 from aiopg.sa import Engine
 from fastapi import Depends
 from fastapi.requests import Request
+from sqlalchemy.ext.asyncio import AsyncEngine
 
+from ...db.events import get_asyncpg_engine
 from ...db.repositories import BaseRepository
 
 logger = logging.getLogger(__name__)
@@ -15,6 +17,10 @@ def get_db_engine(request: Request) -> Engine:
     return cast(Engine, request.app.state.engine)
 
 
+def get_db_asyncpg_engine(request: Request) -> AsyncEngine:
+    return get_asyncpg_engine(request.app)
+
+
 def get_repository(repo_type: type[BaseRepository]) -> Callable:
     async def _get_repo(
         engine: Annotated[Engine, Depends(get_db_engine)],

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs_getters.py

@@ -18,6 +18,7 @@
 from pydantic.types import PositiveInt
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from servicelib.logging_utils import log_context
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ...exceptions.custom_errors import InsufficientCreditsError, MissingWalletError
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
@@ -237,6 +238,7 @@ async def get_job_outputs(
     job_id: JobID,
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     db_engine: Annotated[Engine, Depends(get_db_engine)],
+    async_pg_engine: Annotated[AsyncEngine, Depends(get_db_asyncpg_engine)],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
     storage_client: Annotated[StorageApi, Depends(get_api_client(StorageApi))],
 ):
@@ -263,7 +265,7 @@ async def get_job_outputs(
         user_id=user_id,
         project_uuid=job_id,
         node_uuid=UUID(node_ids[0]),
-        db_engine=db_engine,
+        db_engine=async_pg_engine,
     )
 
     results: dict[str, ArgumentTypes] = {}

services/api-server/src/simcore_service_api_server/db/events.py

@@ -12,6 +12,7 @@
     raise_if_migration_not_ready,
 )
 from simcore_postgres_database.utils_aiosqlalchemy import get_pg_engine_stateinfo
+from sqlalchemy.ext.asyncio import AsyncEngine
 from tenacity import retry
 
 from .._meta import PROJECT_NAME
@@ -81,5 +82,5 @@ async def asyncpg_close_db_connection(app: FastAPI) -> None:
             await engine.dispose()
 
 
-def get_asyncpg_engine(app: FastAPI):
+def get_asyncpg_engine(app: FastAPI) -> AsyncEngine:
     return app.state.asyncpg_engine