fixed tests

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_webserver/storage.py

@@ -7,10 +7,8 @@
     DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
     MAX_NUMBER_OF_PATHS_PER_PAGE,
 )
-from ..projects_nodes_io import LocationID, StorageFileID
-from ..rest_pagination import (
-    CursorQueryParameters,
-)
+from ..projects_nodes_io import LocationID
+from ..rest_pagination import CursorQueryParameters
 from ._base import InputSchema
 
 
@@ -40,4 +38,4 @@ class BatchDeletePathsBodyParams(InputSchema):
 
 
 class DataExportPost(InputSchema):
-    paths: list[StorageFileID]
+    paths: list[str]

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/simcore_s3.py

@@ -4,7 +4,6 @@
 )
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
-from models_library.projects_nodes_io import StorageFileID
 from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.users import UserID
 from pydantic import TypeAdapter
@@ -36,7 +35,7 @@ async def start_data_export(
     *,
     user_id: UserID,
     product_name: str,
-    paths_to_export: list[StorageFileID],
+    paths_to_export: list[str],
 ) -> tuple[AsyncJobGet, AsyncJobNameData]:
     job_id_data = AsyncJobNameData(user_id=user_id, product_name=product_name)
     async_job_rpc_get = await submit(

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

@@ -15,7 +15,7 @@
 from ...dsm import get_dsm_provider
 from ...modules.celery.models import TaskID, TaskId
 from ...modules.celery.utils import get_celery_worker, get_fastapi_app
-from ...simcore_s3_dsm import SimcoreS3DataManager
+from ...simcore_s3_dsm import S3ObjectKey, SimcoreS3DataManager
 from ...utils.progress_utils import get_tqdm_progress, set_tqdm_absolute_progress
 
 _logger = logging.getLogger(__name__)
@@ -66,7 +66,7 @@ async def data_export(
     task_id: TaskID,
     *,
     user_id: UserID,
-    paths_to_export: list[StorageFileID],
+    paths_to_export: list[S3ObjectKey],
 ) -> StorageFileID:
     _logger.info("Exporting (for user='%s') selection: %s", user_id, paths_to_export)
 

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

@@ -1,10 +1,10 @@
+from aws_library.s3._models import S3ObjectKey
 from fastapi import FastAPI
 from models_library.api_schemas_rpc_async_jobs.async_jobs import (
     AsyncJobGet,
     AsyncJobNameData,
 )
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
-from models_library.projects_nodes_io import StorageFileID
 from servicelib.rabbitmq import RPCRouter
 
 from ...modules.celery import get_celery_client
@@ -31,7 +31,7 @@ async def copy_folders_from_project(
 
 @router.expose()
 async def start_data_export(
-    app: FastAPI, job_id_data: AsyncJobNameData, paths_to_export: list[StorageFileID]
+    app: FastAPI, job_id_data: AsyncJobNameData, paths_to_export: list[S3ObjectKey]
 ) -> AsyncJobGet:
     task_uuid = await get_celery_client(app).send_task(
         data_export.__name__,

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -17,6 +17,7 @@
     UploadedBytesTransferredCallback,
     UploadID,
 )
+from aws_library.s3._models import S3ObjectKey
 from fastapi import FastAPI
 from models_library.api_schemas_storage.storage_schemas import (
     UNDEFINED_SIZE,
@@ -1243,7 +1244,7 @@ async def _create_fmd_for_upload(
     async def create_s3_export(
         self,
         user_id: UserID,
-        object_keys: list[StorageFileID],
+        object_keys: list[S3ObjectKey],
         *,
         progress_bar: ProgressBarData | None,
     ) -> StorageFileID:

services/storage/tests/unit/test_simcore_s3_dsm.py

@@ -9,6 +9,7 @@
 from typing import Any
 
 import pytest
+from aws_library.s3._models import S3ObjectKey
 from faker import Faker
 from models_library.basic_types import SHA256Str
 from models_library.progress_bar import ProgressReport
@@ -194,7 +195,7 @@ async def paths_for_export(
 
 def _get_folder_and_files_selection(
     paths_for_export: set[SimcoreS3FileID],
-) -> list[SimcoreS3FileID]:
+) -> list[S3ObjectKey]:
     # select 10 % of files
 
     random_files: list[SimcoreS3FileID] = [
@@ -203,7 +204,7 @@ def _get_folder_and_files_selection(
     ]
 
     all_containing_folders: set[SimcoreS3FileID] = {
-        TypeAdapter(SimcoreS3FileID).validate_python(f"{Path(f).parent}")
+        TypeAdapter(S3ObjectKey).validate_python(f"{Path(f).parent}")
         for f in random_files
     }