refactoring

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/simcore_storage_data_models.py

@@ -7,7 +7,7 @@
 from contextlib import asynccontextmanager
 from pathlib import Path
 from random import choice, randint
-from typing import Any, cast
+from typing import Any, TypedDict, cast
 
 import pytest
 import sqlalchemy as sa
@@ -259,6 +259,11 @@ async def _creator(
     return _creator
 
 
+class FileIDDict(TypedDict):
+    path: Path
+    sha256_checksum: SHA256Str
+
+
 async def _upload_file_and_update_project(
     project_id: ProjectID,
     node_id: NodeID,

services/storage/tests/conftest.py

@@ -70,6 +70,7 @@
 from types_aiobotocore_s3 import S3Client
 from yarl import URL
 
+from tests.fixtures.data_models import FileIDDict
 from tests.helpers.utils_file_meta_data import assert_file_meta_data_in_db
 
 pytest_plugins = [

services/storage/tests/unit/test_handlers_files.py

@@ -68,8 +68,6 @@
 from types_aiobotocore_s3 import S3Client
 from yarl import URL
 
-from tests.helpers.utils_file_meta_data import assert_file_meta_data_in_db
-
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]
 

services/storage/tests/unit/test_handlers_paths.py

@@ -19,6 +19,7 @@
 from pytest_simcore.helpers.fastapi import url_from_operation_id
 from pytest_simcore.helpers.httpx_assert_checks import assert_status
 from servicelib.aiohttp import status
+from tests.fixtures.data_models import FileIDDict
 
 pytest_simcore_core_services_selection = ["postgres"]
 pytest_simcore_ops_services_selection = ["adminer"]
@@ -55,7 +56,7 @@ async def test_list_paths_root_folder(
     user_id: UserID,
     with_random_project_with_files: tuple[
         ProjectAtDB,
-        dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
+        dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
     ],
 ):
     project_in_db, list_of_files = with_random_project_with_files

services/storage/tests/unit/test_handlers_simcore_s3.py

@@ -229,20 +229,20 @@ async def test_copy_folders_from_valid_project_with_one_large_file(
         (sha256_checksum,),
     )
     # 2. create a dst project without files
-    dst_project, nodes_map = clone_project_data(src_project.model_dump(mode="json"))
+    dst_project, nodes_map = clone_project_data(src_project)
     dst_project = await create_project(**dst_project)
     # copy the project files
     data = await _request_copy_folders(
         initialized_app,
         client,
         user_id,
-        src_project.model_dump(mode="json"),
+        src_project,
         dst_project,
         nodes_map={NodeID(i): NodeID(j) for i, j in nodes_map.items()},
     )
-    assert data == (
+    assert data == jsonable_encoder(
         await get_updated_project(sqlalchemy_async_engine, dst_project["uuid"])
-    ).model_dump(mode="json")
+    )
     # check that file meta data was effectively copied
     for src_node_id in src_projects_list:
         dst_node_id = nodes_map.get(
@@ -292,20 +292,20 @@ async def test_copy_folders_from_valid_project(
     # 1. create a src project with some files
     src_project, src_projects_list = await random_project_with_files()
     # 2. create a dst project without files
-    dst_project, nodes_map = clone_project_data(src_project.model_dump(mode="json"))
+    dst_project, nodes_map = clone_project_data(src_project)
     dst_project = await create_project(**dst_project)
     # copy the project files
     data = await _request_copy_folders(
         initialized_app,
         client,
         user_id,
-        src_project.model_dump(mode="json"),
+        src_project,
         dst_project,
         nodes_map={NodeID(i): NodeID(j) for i, j in nodes_map.items()},
     )
-    assert data == (
+    assert data == jsonable_encoder(
         await get_updated_project(sqlalchemy_async_engine, dst_project["uuid"])
-    ).model_dump(mode="json")
+    )
 
     # check that file meta data was effectively copied
     for src_node_id in src_projects_list:
@@ -337,21 +337,21 @@ async def test_copy_folders_from_valid_project(
 
 async def _create_and_delete_folders_from_project(
     user_id: UserID,
-    project: ProjectAtDB,
+    project: dict[str, Any],
     initialized_app: FastAPI,
     client: httpx.AsyncClient,
     project_db_creator: Callable,
     check_list_files: bool,
 ) -> None:
-    destination_project, nodes_map = clone_project_data(project.model_dump(mode="json"))
+    destination_project, nodes_map = clone_project_data(project)
     await project_db_creator(**destination_project)
 
     # creating a copy
     data = await _request_copy_folders(
         initialized_app,
         client,
         user_id,
-        project.model_dump(mode="json"),
+        project,
         destination_project,
         nodes_map={NodeID(i): NodeID(j) for i, j in nodes_map.items()},
     )
@@ -430,7 +430,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[
-        ProjectAtDB,
+        dict[str, Any],
         dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
     ],
     mock_datcore_download,
@@ -454,7 +454,7 @@ async def test_create_and_delete_folders_from_project_burst(
     client: httpx.AsyncClient,
     user_id: UserID,
     with_random_project_with_files: tuple[
-        ProjectAtDB,
+        dict[str, Any],
         dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
     ],
     create_project: Callable[..., Awaitable[dict[str, Any]]],