rename

Author: Andrei Neagu

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -86,7 +86,7 @@
     compute_file_id_prefix,
     create_and_upload_export,
     create_random_export_name,
-    ensure_same_parent_in_user_selection,
+    ensure_user_selection_from_same_base_directory,
     expand_directory,
     get_accessible_project_ids,
     get_directory_file_id,
@@ -1255,7 +1255,7 @@ async def create_s3_export(
         source_object_keys: set[tuple[UserSelectionStr, StorageFileID]] = set()
 
         # ensure all selected items have the same parent
-        if not ensure_same_parent_in_user_selection(object_keys):
+        if not ensure_user_selection_from_same_base_directory(object_keys):
             raise SelectionNotAllowedError(selection=object_keys)
 
         # check access rights

services/storage/src/simcore_service_storage/utils/simcore_s3_dsm_utils.py

@@ -145,7 +145,9 @@ def create_random_export_name(user_id: UserID) -> StorageFileID:
     )
 
 
-def ensure_same_parent_in_user_selection(object_keys: list[S3ObjectKey]) -> bool:
+def ensure_user_selection_from_same_base_directory(
+    object_keys: list[S3ObjectKey],
+) -> bool:
     parents = [Path(x).parent for x in object_keys]
     return len(set(parents)) <= 1
 

services/storage/tests/unit/test_simcore_s3_dsm_utils.py

@@ -6,7 +6,7 @@
     UserSelectionStr,
     _base_path_parent,
     compute_file_id_prefix,
-    ensure_same_parent_in_user_selection,
+    ensure_user_selection_from_same_base_directory,
 )
 
 
@@ -66,10 +66,10 @@ def test__base_path_parent(selection: Path | str, s3_object: Path, expected: str
         (["a/a.txt", "a.txt", "c.txt", "a/d.txt"], False),
     ],
 )
-def test_ensure_same_parent_in_user_selection(
+def test_ensure_user_selection_from_same_base_directory(
     user_selection: list[S3ObjectKey | Path], expected: bool
 ):
     assert (
-        ensure_same_parent_in_user_selection([f"{x}" for x in user_selection])
+        ensure_user_selection_from_same_base_directory([f"{x}" for x in user_selection])
         == expected
     )