aligning

Author: sanderegg

services/storage/tests/unit/test_handlers_paths.py

@@ -8,12 +8,12 @@
 
 
 from pathlib import Path
-from typing import Any
 
 import httpx
 from fastapi import FastAPI
 from fastapi_pagination import LimitOffsetPage
 from models_library.api_schemas_storage import FileMetaDataGet, PathMetaDataGet
+from models_library.projects import ProjectAtDB
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
 from models_library.users import UserID
 from pytest_simcore.helpers.fastapi import url_from_operation_id
@@ -54,7 +54,7 @@ async def test_list_paths_root_folder(
     location_id: LocationID,
     user_id: UserID,
     with_random_project_with_files: tuple[
-        dict[str, Any],
+        ProjectAtDB,
         dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
     ],
 ):

services/storage/tests/unit/test_handlers_simcore_s3.py

@@ -336,21 +336,21 @@ async def test_copy_folders_from_valid_project(
 
 async def _create_and_delete_folders_from_project(
     user_id: UserID,
-    project: dict[str, Any],
+    project: ProjectAtDB,
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
     project_db_creator: Callable,
     check_list_files: bool,
 ) -> None:
-    destination_project, nodes_map = clone_project_data(project)
+    destination_project, nodes_map = clone_project_data(project.model_dump(mode="json"))
     await project_db_creator(**destination_project)
 
     # creating a copy
     data = await _request_copy_folders(
         initialized_app,
         client,
         user_id,
-        project,
+        project.model_dump(mode="json"),
         destination_project,
         nodes_map={NodeID(i): NodeID(j) for i, j in nodes_map.items()},
     )
@@ -429,7 +429,7 @@ async def test_create_and_delete_folders_from_project(
     user_id: UserID,
     create_project: Callable[..., Awaitable[dict[str, Any]]],
     with_random_project_with_files: tuple[
-        dict[str, Any],
+        ProjectAtDB,
         dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
     ],
     mock_datcore_download,
@@ -453,7 +453,7 @@ async def test_create_and_delete_folders_from_project_burst(
     client: httpx.AsyncClient,
     user_id: UserID,
     with_random_project_with_files: tuple[
-        dict[str, Any],
+        ProjectAtDB,
         dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
     ],
     create_project: Callable[..., Awaitable[dict[str, Any]]],