refine

Author: giancarloromeo

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -80,7 +80,7 @@
 from .s3 import get_s3_client
 from .s3_utils import S3TransferDataCB, update_task_progress
 from .settings import Settings
-from .simcore_s3_dsm_utils import expand_directory, get_directory_file_id, get_fmd
+from .simcore_s3_dsm_utils import expand_directory, get_directory_file_id, try_get_fmd
 from .utils import (
     convert_db_to_model,
     download_to_file_or_raise,
@@ -530,17 +530,12 @@ async def delete_file(
         )
 
         async with self.engine.acquire() as conn:
-            file_fmd = await get_fmd(conn, file_id)
-            if file_fmd:
+            if await try_get_fmd(conn, file_id):
                 await db_file_meta_data.delete(conn, [file_id])
-
-            enclosing_dir_file_id = await get_directory_file_id(conn, file_id)
-            if enclosing_dir_file_id:
-                enclosing_dir_fmd = await db_file_meta_data.get(
-                    conn, enclosing_dir_file_id
-                )
-                enclosing_dir_fmd.file_size = UNDEFINED_SIZE
-                await db_file_meta_data.upsert(conn, enclosing_dir_fmd)
+            if parent_dir_file_id := await get_directory_file_id(conn, file_id):
+                parent_dir_fmd = await db_file_meta_data.get(conn, parent_dir_file_id)
+                parent_dir_fmd.file_size = UNDEFINED_SIZE
+                await db_file_meta_data.upsert(conn, parent_dir_fmd)
 
     async def delete_project_simcore_s3(
         self, user_id: UserID, project_id: ProjectID, node_id: NodeID | None = None

services/storage/src/simcore_service_storage/simcore_s3_dsm_utils.py

@@ -78,7 +78,7 @@ async def expand_directory(
     return result
 
 
-async def get_fmd(
+async def try_get_fmd(
     conn: SAConnection, s3_file_id: StorageFileID
 ) -> FileMetaDataAtDB | None:
     with suppress(FileMetaDataNotFoundError):
@@ -104,7 +104,7 @@ async def get_directory_file_id(
     in the `file_meta_data` table
     """
 
-    provided_file_id_fmd = await get_fmd(conn, file_id)
+    provided_file_id_fmd = await try_get_fmd(conn, file_id)
     if provided_file_id_fmd:
         # file_meta_data exists it is not a directory
         return None
@@ -117,6 +117,6 @@ async def get_directory_file_id(
     directory_file_id = TypeAdapter(SimcoreS3FileID).validate_python(
         directory_file_id_str
     )
-    directory_file_id_fmd = await get_fmd(conn, directory_file_id)
+    directory_file_id_fmd = await try_get_fmd(conn, directory_file_id)
 
     return directory_file_id if directory_file_id_fmd else None