♻️SQLAlchemy migration: simcore-sdk (#7404)

Author: sanderegg

packages/postgres-database/src/simcore_postgres_database/utils_user_preferences.py

@@ -1,17 +1,16 @@
 from typing import Any
 
 import sqlalchemy as sa
-from aiopg.sa.connection import SAConnection
 from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlalchemy.ext.asyncio import AsyncConnection
 
 from .models.user_preferences import (
     user_preferences_frontend,
     user_preferences_user_service,
 )
 
 
-class CouldNotCreateOrUpdateUserPreferenceError(Exception):
-    ...
+class CouldNotCreateOrUpdateUserPreferenceError(Exception): ...
 
 
 class BasePreferencesRepo:
@@ -20,7 +19,7 @@ class BasePreferencesRepo:
     @classmethod
     async def save(
         cls,
-        conn: SAConnection,
+        conn: AsyncConnection,
         *,
         user_id: int,
         product_name: str,
@@ -49,7 +48,7 @@ async def save(
     @classmethod
     async def load(
         cls,
-        conn: SAConnection,
+        conn: AsyncConnection,
         *,
         user_id: int,
         product_name: str,

packages/postgres-database/tests/conftest.py

@@ -38,6 +38,7 @@
     user_to_groups,
     users,
 )
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 
 pytest_plugins = [
@@ -324,18 +325,26 @@ async def _creator(project_uuid: uuid.UUID) -> ProjectNode:
 
 
 @pytest.fixture
-def create_fake_product(
-    connection: aiopg.sa.connection.SAConnection,
-) -> Callable[..., Awaitable[RowProxy]]:
-    async def _creator(product_name: str) -> RowProxy:
-        result = await connection.execute(
-            sa.insert(products)
-            .values(name=product_name, host_regex=".*")
-            .returning(sa.literal_column("*"))
-        )
-        assert result
-        row = await result.first()
-        assert row
+async def create_fake_product(
+    asyncpg_engine: AsyncEngine,
+) -> AsyncIterator[Callable[[str], Awaitable[Row]]]:
+    created_product_names = set()
+
+    async def _creator(product_name: str) -> Row:
+        async with asyncpg_engine.begin() as connection:
+            result = await connection.execute(
+                sa.insert(products)
+                .values(name=product_name, host_regex=".*")
+                .returning(sa.literal_column("*"))
+            )
+            assert result
+            row = result.one()
+        created_product_names.add(row.name)
         return row
 
-    return _creator
+    yield _creator
+
+    async with asyncpg_engine.begin() as conn:
+        await conn.execute(
+            products.delete().where(products.c.name.in_(created_product_names))
+        )

packages/postgres-database/tests/test_utils_groups_extra_properties.py

@@ -21,6 +21,7 @@
     GroupExtraPropertiesRepo,
 )
 from sqlalchemy import literal_column
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
@@ -84,7 +85,7 @@ async def test_get(
     connection: aiopg.sa.connection.SAConnection,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -106,7 +107,7 @@ async def test_get_v2(
     asyncpg_engine: AsyncEngine,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -157,7 +158,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -227,7 +228,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -274,7 +275,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -385,7 +386,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,