sqlalchemy 2.0 compatible

Author: sanderegg

packages/postgres-database/src/simcore_postgres_database/migration/versions/06eafd25d004_add_state_type_unknown.py

@@ -6,6 +6,7 @@
 
 """
 
+import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
@@ -26,23 +27,27 @@ def downgrade() -> None:
 
     # Find all tables and columns that use statetype enum
     result = op.get_bind().execute(
-        """
+        sa.DDL(
+            """
         SELECT t.table_name, c.column_name, c.column_default
         FROM information_schema.columns c
         JOIN information_schema.tables t ON c.table_name = t.table_name
         WHERE c.udt_name = 'statetype'
         AND t.table_schema = 'public'
     """
+        )
     )
 
     tables_columns = result.fetchall()
 
     # Update UNKNOWN states to FAILED in all affected tables
     for table_name, column_name, _ in tables_columns:
         op.execute(
-            f"""
+            sa.DDL(
+                f"""
             UPDATE {table_name}
             SET {column_name} = 'FAILED'
             WHERE {column_name} = 'UNKNOWN'
         """
+            )
         )

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_runs.py

@@ -493,17 +493,17 @@ async def list_group_by_collection_run_id(
             total_count = await conn.scalar(count_query)
             items = []
             async for row in await conn.stream(list_query):
-                db_states = [DB_TO_RUNNING_STATE[s] for s in row["states"]]
+                db_states = [DB_TO_RUNNING_STATE[s] for s in row.states]
                 resolved_state = _resolve_grouped_state(db_states)
                 items.append(
                     ComputationCollectionRunRpcGet(
-                        collection_run_id=row["collection_run_id"],
-                        project_ids=row["project_ids"],
+                        collection_run_id=row.collection_run_id,
+                        project_ids=row.project_ids,
                         state=resolved_state,
-                        info={} if row["info"] is None else row["info"],
-                        submitted_at=row["submitted_at"],
-                        started_at=row["started_at"],
-                        ended_at=row["ended_at"],
+                        info={} if row.info is None else row.info,
+                        submitted_at=row.submitted_at,
+                        started_at=row.started_at,
+                        ended_at=row.ended_at,
                     )
                 )
             return cast(int, total_count), items

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_db_repositories_comp_runs.py

@@ -956,8 +956,9 @@ async def test_list_group_by_collection_run_id_with_unknown_returns_unknown(
     )
 
     # Test the function
+    assert "product_name" in run_metadata
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name"),
+        product_name=run_metadata["product_name"],
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -967,7 +968,7 @@ async def test_list_group_by_collection_run_id_with_unknown_returns_unknown(
     assert total_count == 1
     assert len(items) == 1
     collection_item = items[0]
-    assert collection_item.state == RunningState.FAILED
+    assert collection_item.state == RunningState.UNKNOWN
 
 
 async def test_list_group_by_collection_run_id_with_project_filter(