simcore-sdk migrated

Author: sanderegg

services/api-server/src/simcore_service_api_server/services_http/solver_job_outputs.py

@@ -1,12 +1,12 @@
 import logging
 from typing import Any, TypeAlias
 
-import aiopg
 from models_library.projects import ProjectID, ProjectIDStr
 from models_library.projects_nodes_io import BaseFileLink, NodeID, NodeIDStr
 from pydantic import StrictBool, StrictFloat, StrictInt, TypeAdapter
 from simcore_sdk import node_ports_v2
 from simcore_sdk.node_ports_v2 import DBManager, Nodeports
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..exceptions.backend_errors import SolverOutputNotFoundError
 
@@ -19,7 +19,7 @@
 
 
 async def get_solver_output_results(
-    user_id: int, project_uuid: ProjectID, node_uuid: NodeID, db_engine: aiopg.sa.Engine
+    user_id: int, project_uuid: ProjectID, node_uuid: NodeID, db_engine: AsyncEngine
 ) -> dict[str, ResultsTypes]:
     """
     Wraps calls via node_ports to retrieve project's output

services/director-v2/src/simcore_service_director_v2/utils/dask.py

@@ -38,6 +38,7 @@
 )
 from simcore_sdk.node_ports_v2 import FileLinkType, Port, links, port_utils
 from simcore_sdk.node_ports_v2.links import ItemValue as _NPItemValue
+from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..constants import UNDEFINED_DOCKER_LABEL
 from ..core.errors import (
@@ -106,7 +107,10 @@ def parse_dask_job_id(
 
 
 async def create_node_ports(
-    db_engine: Engine, user_id: UserID, project_id: ProjectID, node_id: NodeID
+    db_engine: AsyncEngine,
+    user_id: UserID,
+    project_id: ProjectID,
+    node_id: NodeID,
 ) -> node_ports_v2.Nodeports:
     """
     This function create a nodeports object by fetching the node state from the database
@@ -633,7 +637,7 @@ def check_if_cluster_is_able_to_run_pipeline(
 
 
 async def wrap_client_async_routine(
-    client_coroutine: Coroutine[Any, Any, Any] | Any | None
+    client_coroutine: Coroutine[Any, Any, Any] | Any | None,
 ) -> Any:
     """Dask async behavior does not go well with Pylance as it returns
     a union of types. this wrapper makes both mypy and pylance happy"""

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -16,7 +16,6 @@
 
 import aioboto3
 import aiodocker
-import aiopg.sa
 import httpx
 import pytest
 import sqlalchemy as sa
@@ -79,6 +78,7 @@
 from simcore_service_director_v2.core.settings import AppSettings
 from simcore_service_director_v2.modules import storage as dv2_modules_storage
 from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlalchemy.ext.asyncio import AsyncEngine
 from tenacity import TryAgain
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -292,8 +292,8 @@ def workbench_dynamic_services(
 
 
 @pytest.fixture
-async def db_manager(aiopg_engine: aiopg.sa.engine.Engine) -> DBManager:
-    return DBManager(aiopg_engine)
+async def db_manager(sqlalchemy_async_engine: AsyncEngine) -> DBManager:
+    return DBManager(sqlalchemy_async_engine)
 
 
 def _is_docker_r_clone_plugin_installed() -> bool:
@@ -934,15 +934,15 @@ async def test_nodeports_integration(
     `aioboto` instead of `docker` or `storage-data_manager API`.
     """
     # STEP 1
-    dynamic_services_urls: dict[
-        str, str
-    ] = await _start_and_wait_for_dynamic_services_ready(
-        director_v2_client=async_client,
-        product_name=osparc_product_name,
-        user_id=current_user["id"],
-        workbench_dynamic_services=workbench_dynamic_services,
-        current_study=current_study,
-        catalog_url=services_endpoint["catalog"],
+    dynamic_services_urls: dict[str, str] = (
+        await _start_and_wait_for_dynamic_services_ready(
+            director_v2_client=async_client,
+            product_name=osparc_product_name,
+            user_id=current_user["id"],
+            workbench_dynamic_services=workbench_dynamic_services,
+            current_study=current_study,
+            catalog_url=services_endpoint["catalog"],
+        )
     )
 
     # STEP 2