extract util

Author: giancarloromeo

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -80,7 +80,11 @@
 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
+from .simcore_s3_dsm_utils import (
+    compute_file_id_prefix,
+    expand_directory,
+    get_directory_file_id,
+)
 from .utils import (
     convert_db_to_model,
     download_to_file_or_raise,
@@ -517,11 +521,6 @@ async def delete_file(
         # Only use this in those circumstances where a collaborator requires to delete a file (the current
         # permissions model will not allow him to do so, even though this is a legitimate action)
         # SEE https://github.com/ITISFoundation/osparc-simcore/issues/5159
-        def _get_subpath(path: str, levels: int):
-            components = path.strip("/").split("/")
-            subpath = "/".join(components[:levels])
-            return "/" + subpath if subpath else "/"
-
         async with self.engine.acquire() as conn:
             if enforce_access_rights:
                 can: AccessRights = await get_file_access_rights(conn, user_id, file_id)
@@ -544,7 +543,7 @@ def _get_subpath(path: str, levels: int):
                 user_or_project_filter=UserOrProjectFilter(
                     user_id=user_id, project_ids=[]
                 ),
-                file_id_prefix=_get_subpath(file_id, 2),
+                file_id_prefix=compute_file_id_prefix(file_id, 2),
                 partial_file_id=None,
                 is_directory=True,
                 sha256_checksum=None,

services/storage/src/simcore_service_storage/simcore_s3_dsm_utils.py

@@ -119,3 +119,9 @@ async def _get_fmd(
     directory_file_id_fmd = await _get_fmd(conn, directory_file_id)
 
     return directory_file_id if directory_file_id_fmd else None
+
+
+def compute_file_id_prefix(file_id: str, levels: int):
+    components = file_id.strip("/").split("/")
+    subpath = "/".join(components[:levels])
+    return "/" + subpath if subpath else "/"

services/storage/tests/unit/test_simcore_s3_dsm_utils.py

@@ -0,0 +1,21 @@
+import pytest
+from simcore_service_storage.simcore_s3_dsm_utils import compute_file_id_prefix
+
+
+@pytest.mark.parametrize(
+    "file_id, levels, expected",
+    [
+        (
+            "b21a3b80-d578-4b33-a224-e24ee2e4966a/42b9cc07-60f5-4d29-a063-176d1467901c/my/amazing/sub/folder/with/a/file.bin",
+            2,
+            "b21a3b80-d578-4b33-a224-e24ee2e4966a/42b9cc07-60f5-4d29-a063-176d1467901c/my",
+        ),
+        (
+            "api/42b9cc07-60f5-4d29-a063-176d1467901c/my/amazing/sub/folder/with/a/file.bin",
+            2,
+            "api/42b9cc07-60f5-4d29-a063-176d1467901c/my",
+        ),
+    ],
+)
+def test_compute_file_id_prefix(file_id, levels, expected):
+    assert compute_file_id_prefix(file_id, levels) == expected