start adding tests

Author: bisgaard-itis

services/storage/src/simcore_service_storage/api/_worker_tasks/tasks.py

@@ -13,7 +13,11 @@
 from ...models import FileMetaData
 from ._files import complete_upload_file
 from ._paths import compute_path_size, delete_paths
-from ._simcore_s3 import deep_copy_files_from_project, export_data
+from ._simcore_s3 import (
+    deep_copy_files_from_project,
+    export_data,
+    export_data_as_download_link,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -24,6 +28,9 @@ def setup_worker_tasks(app: Celery) -> None:
 
     with log_context(_logger, logging.INFO, msg="worker task registration"):
         register_task(app, export_data, dont_autoretry_for=(AccessRightError,))
+        register_task(
+            app, export_data_as_download_link, dont_autoretry_for=(AccessRightError,)
+        )
         register_task(app, compute_path_size)
         register_task(app, complete_upload_file)
         register_task(app, delete_paths)

services/storage/src/simcore_service_storage/api/rpc/_simcore_s3.py

@@ -1,3 +1,5 @@
+from typing import Literal
+
 from models_library.api_schemas_rpc_async_jobs.async_jobs import (
     AsyncJobFilter,
     AsyncJobGet,
@@ -8,7 +10,11 @@
 from servicelib.celery.task_manager import TaskManager
 from servicelib.rabbitmq import RPCRouter
 
-from .._worker_tasks._simcore_s3 import deep_copy_files_from_project, export_data
+from .._worker_tasks._simcore_s3 import (
+    deep_copy_files_from_project,
+    export_data,
+    export_data_as_download_link,
+)
 
 router = RPCRouter()
 
@@ -38,8 +44,14 @@ async def start_export_data(
     task_manager: TaskManager,
     job_filter: AsyncJobFilter,
     paths_to_export: list[PathToExport],
+    export_as: Literal["path", "download_link"] = "path",
 ) -> AsyncJobGet:
-    task_name = export_data.__name__
+    if export_as == "path":
+        task_name = export_data.__name__
+    elif export_as == "download_link":
+        task_name = export_data_as_download_link.__name__
+    else:
+        raise ValueError(f"Invalid export_as value: {export_as}")
     task_filter = TaskFilter.model_validate(job_filter.model_dump())
     task_uuid = await task_manager.submit_task(
         task_metadata=TaskMetadata(

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

@@ -13,7 +13,7 @@
 from collections.abc import Awaitable, Callable
 from copy import deepcopy
 from pathlib import Path
-from typing import Any
+from typing import Any, Literal
 from unittest.mock import Mock
 
 import httpx
@@ -514,6 +514,7 @@ async def _request_start_export_data(
     user_id: UserID,
     product_name: ProductName,
     paths_to_export: list[PathToExport],
+    export_as: Literal["path", "download_link"],
     *,
     client_timeout: datetime.timedelta = datetime.timedelta(seconds=60),
 ) -> dict[str, Any]:
@@ -526,6 +527,7 @@ async def _request_start_export_data(
             user_id=user_id,
             product_name=product_name,
             paths_to_export=paths_to_export,
+            export_as=export_as,
         )
 
         async for async_job_result in wait_and_get_result(
@@ -572,6 +574,10 @@ def task_progress_spy(mocker: MockerFixture) -> Mock:
     ],
     ids=str,
 )
+@pytest.mark.parametrize(
+    "export_as",
+    ["path", "download_link"],
+)
 async def test_start_export_data(
     initialized_app: FastAPI,
     short_dsm_cleaner_interval: int,
@@ -589,6 +595,7 @@ async def test_start_export_data(
     ],
     project_params: ProjectWithFilesParams,
     task_progress_spy: Mock,
+    export_as: Literal["path", "download_link"],
 ):
     _, src_projects_list = await random_project_with_files(project_params)
 
@@ -606,6 +613,7 @@ async def test_start_export_data(
         user_id,
         product_name,
         paths_to_export=list(nodes_in_project_to_export),
+        export_as=export_as,
     )
 
     assert re.fullmatch(
@@ -618,6 +626,10 @@ async def test_start_export_data(
     assert progress_updates[-1] == 1
 
 
+@pytest.mark.parametrize(
+    "export_as",
+    ["path", "download_link"],
+)
 async def test_start_export_data_access_error(
     initialized_app: FastAPI,
     short_dsm_cleaner_interval: int,
@@ -626,6 +638,7 @@ async def test_start_export_data_access_error(
     user_id: UserID,
     product_name: ProductName,
     faker: Faker,
+    export_as: Literal["path", "download_link"],
 ):
     path_to_export = TypeAdapter(PathToExport).validate_python(
         f"{faker.uuid4()}/{faker.uuid4()}/{faker.file_name()}"
@@ -637,6 +650,7 @@ async def test_start_export_data_access_error(
             product_name,
             paths_to_export=[path_to_export],
             client_timeout=datetime.timedelta(seconds=60),
+            export_as=export_as,
         )
 
     assert isinstance(exc.value, JobError)