asyncpg

Author: sanderegg

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -398,7 +398,7 @@ async def abort_file_upload(
             await self._update_database_from_storage(fmd)
         except S3KeyNotFoundError:
             # the file does not exist, so we delete the entry in the db
-            async with self.engine.connect() as conn:
+            async with self.engine.begin() as conn:
                 await db_file_meta_data.delete(conn, [fmd.file_id])
 
     async def complete_file_upload(
@@ -555,7 +555,7 @@ async def delete_file(
     async def delete_project_simcore_s3(
         self, user_id: UserID, project_id: ProjectID, node_id: NodeID | None = None
     ) -> None:
-        async with self.engine.connect() as conn:
+        async with self.engine.begin() as conn:
             can: AccessRights = await get_project_access_rights(
                 conn, user_id, project_id
             )
@@ -780,7 +780,7 @@ async def create_soft_link(
         target.file_id = link_file_id  # NOTE: api-server relies on this id
         target.is_soft_link = True
 
-        async with self.engine.connect() as conn:
+        async with self.engine.begin() as conn:
             return convert_db_to_model(await db_file_meta_data.insert(conn, target))
 
     async def _clean_pending_upload(
@@ -1041,7 +1041,7 @@ async def _copy_path_s3_s3(
                     bytes_transfered_cb=bytes_transfered_cb,
                 )
             # we are done, let's update the copy with the src
-            async with self.engine.connect() as conn:
+            async with self.engine.begin() as conn:
                 updated_fmd = await self._update_fmd_from_other(
                     conn, fmd=new_fmd, copy_from=src_fmd
                 )

services/storage/tests/conftest.py

@@ -115,7 +115,7 @@ def project_slug_dir(osparc_simcore_root_dir: Path) -> Path:
 async def cleanup_user_projects_file_metadata(sqlalchemy_async_engine: AsyncEngine):
     yield
     # cleanup
-    async with sqlalchemy_async_engine.connect() as conn:
+    async with sqlalchemy_async_engine.begin() as conn:
         await conn.execute(file_meta_data.delete())
         await conn.execute(projects.delete())
         await conn.execute(users.delete())

services/storage/tests/unit/test_dsm_dsmcleaner.py

@@ -284,7 +284,7 @@ async def test_clean_expired_uploads_reverts_to_last_known_version_expired_pendi
     )
 
     # now change the upload_expires_at entry to simulate an expired entry
-    async with sqlalchemy_async_engine.connect() as conn:
+    async with sqlalchemy_async_engine.begin() as conn:
         await conn.execute(
             file_meta_data.update()
             .where(file_meta_data.c.file_id == file_id)
@@ -346,7 +346,7 @@ async def test_clean_expired_uploads_does_not_clean_multipart_upload_on_creation
         sha256_checksum=checksum,
     )
     # we create the entry in the db
-    async with sqlalchemy_async_engine.connect() as conn:
+    async with sqlalchemy_async_engine.begin() as conn:
         await db_file_meta_data.upsert(conn, fmd)
 
         # ensure the database is correctly set up

services/storage/tests/unit/test_dsm_soft_links.py

@@ -43,7 +43,7 @@ async def output_file(
     file.file_size = ByteSize(12)
     file.user_id = user_id
 
-    async with sqlalchemy_async_engine.connect() as conn:
+    async with sqlalchemy_async_engine.begin() as conn:
         stmt = (
             file_meta_data.insert()
             .values(jsonable_encoder(FileMetaDataAtDB.model_validate(file)))