changed types

Author: Andrei Neagu

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

@@ -1,7 +1,7 @@
 from pathlib import Path
-from typing import Annotated, Any
+from typing import Annotated
 
-from pydantic import BaseModel, BeforeValidator, Field
+from pydantic import BaseModel, Field
 
 from ..api_schemas_storage.storage_schemas import (
     DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
@@ -37,17 +37,7 @@ class BatchDeletePathsBodyParams(InputSchema):
     paths: set[Path]
 
 
-def _ensure_valid_path(value: Any) -> str:
-    try:
-        Path(value)
-    except Exception as e:
-        msg = f"Provided {value=} is nto a valid path"
-        raise ValueError(msg) from e
-
-    return value
-
-
-PathToExport = Annotated[str, BeforeValidator(_ensure_valid_path)]
+PathToExport = Path
 
 
 class DataExportPost(InputSchema):

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

@@ -5,6 +5,7 @@
 from aws_library.s3._models import S3ObjectKey
 from celery import Task  # type: ignore[import-untyped]
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
+from models_library.api_schemas_webserver.storage import PathToExport
 from models_library.progress_bar import ProgressReport
 from models_library.projects_nodes_io import StorageFileID
 from models_library.users import UserID
@@ -65,7 +66,7 @@ async def export_data(
     task_id: TaskID,
     *,
     user_id: UserID,
-    paths_to_export: list[S3ObjectKey],
+    paths_to_export: list[PathToExport],
 ) -> StorageFileID:
     """
     AccessRightError: in case user can't access project
@@ -80,8 +81,8 @@ async def export_data(
         )
         assert isinstance(dsm, SimcoreS3DataManager)  # nosec
 
-        paths_to_export = [
-            TypeAdapter(S3ObjectKey).validate_python(path_to_export)
+        object_keys = [
+            TypeAdapter(S3ObjectKey).validate_python(f"{path_to_export}")
             for path_to_export in paths_to_export
         ]
 
@@ -96,5 +97,5 @@ async def _progress_cb(report: ProgressReport) -> None:
             progress_report_cb=_progress_cb,
         ) as progress_bar:
             return await dsm.create_s3_export(
-                user_id, paths_to_export, progress_bar=progress_bar
+                user_id, object_keys, progress_bar=progress_bar
             )

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.api_schemas_webserver.storage import PathToExport
 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_export_data(
-    app: FastAPI, job_id_data: AsyncJobNameData, paths_to_export: list[S3ObjectKey]
+    app: FastAPI, job_id_data: AsyncJobNameData, paths_to_export: list[PathToExport]
 ) -> AsyncJobGet:
     task_uuid = await get_celery_client(app).send_task(
         export_data.__name__,