ensure same parent is in palce

Author: Andrei Neagu

services/storage/src/simcore_service_storage/exceptions/errors.py

@@ -1,8 +1,7 @@
 from common_library.errors_classes import OsparcErrorMixin
 
 
-class StorageRuntimeError(OsparcErrorMixin, RuntimeError):
-    ...
+class StorageRuntimeError(OsparcErrorMixin, RuntimeError): ...
 
 
 class ConfigurationError(StorageRuntimeError):
@@ -45,3 +44,7 @@ class InvalidFileIdentifierError(AccessLayerError):
 
 class DatCoreCredentialsMissingError(StorageRuntimeError):
     msg_template: str = "DatCore credentials are incomplete. TIP: Check your settings"
+
+
+class SelectionNotAllowedError(StorageRuntimeError):
+    msg_template: str = "Selection='{selection}' must share the same parent folder"

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -61,6 +61,7 @@
     LinkAlreadyExistsError,
     ProjectAccessRightError,
     ProjectNotFoundError,
+    SelectionNotAllowedError,
 )
 from .models import (
     DatasetMetaData,
@@ -85,6 +86,7 @@
     compute_file_id_prefix,
     create_and_upload_export,
     create_random_export_name,
+    ensure_same_paret_in_user_selection,
     expand_directory,
     get_accessible_project_ids,
     get_directory_file_id,
@@ -1252,6 +1254,10 @@ async def create_s3_export(
     ) -> StorageFileID:
         source_object_keys: set[tuple[UserSelection, StorageFileID]] = set()
 
+        # ensure all selected items have the same parent
+        if not ensure_same_paret_in_user_selection(object_keys):
+            raise SelectionNotAllowedError(selection=object_keys)
+
         # check access rights
         for object_key in object_keys:
             project_id = None

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

@@ -145,6 +145,11 @@ def create_random_export_name(user_id: UserID) -> StorageFileID:
     )
 
 
+def ensure_same_paret_in_user_selection(object_keys: list[S3ObjectKey]) -> bool:
+    parents = [Path(x).parent for x in object_keys]
+    return len(set(parents)) <= 1
+
+
 UserSelection: TypeAlias = str
 
 

services/storage/tests/unit/test_simcore_s3_dsm_utils.py

@@ -6,6 +6,7 @@
     UserSelection,
     _strip_parent,
     compute_file_id_prefix,
+    ensure_same_paret_in_user_selection,
 )
 
 
@@ -46,3 +47,27 @@ def test__strip_parent(selection: Path, s3_object: Path, expected: str):
         _strip_parent(UserSelection(f"{selection}"), S3ObjectKey(f"{s3_object}"))
         == expected
     )
+
+
+@pytest.mark.parametrize(
+    "user_slection, expected",
+    [
+        ([], True),
+        (["folder"], True),
+        (["folder", "folder"], True),
+        (["", ""], True),
+        ([""], True),
+        ([_FOLDERS_PATH / "a", _FOLDERS_PATH / "b"], True),
+        (["a.txt", "b.txt"], True),
+        (["a/a.txt"], True),
+        # not same parent
+        (["firsta/file", "second/file"], False),
+        (["a/a.txt", "a.txt", "c.txt", "a/d.txt"], False),
+    ],
+)
+def test_ensure_same_paret_in_user_selection(
+    user_slection: list[S3ObjectKey | Path], expected: bool
+):
+    assert (
+        ensure_same_paret_in_user_selection([f"{x}" for x in user_slection]) == expected
+    )