reverted some parts

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/helpers/storage_utils.py

@@ -1,11 +1,10 @@
 import logging
 import os
 from pathlib import Path
-from typing import TypedDict
+from typing import Any, TypedDict
 
 import sqlalchemy as sa
 from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectAtDB
 from simcore_postgres_database.storage_models import projects
 from sqlalchemy.ext.asyncio import AsyncEngine
 
@@ -22,13 +21,13 @@ def has_datcore_tokens() -> bool:
 
 async def get_updated_project(
     sqlalchemy_async_engine: AsyncEngine, project_id: str
-) -> ProjectAtDB:
+) -> dict[str, Any]:
     async with sqlalchemy_async_engine.connect() as conn:
         result = await conn.execute(
             sa.select(projects).where(projects.c.uuid == project_id)
         )
         row = result.one()
-        return ProjectAtDB.model_validate(row)
+        return row._asdict()
 
 
 class FileIDDict(TypedDict):

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

@@ -13,7 +13,7 @@
 import sqlalchemy as sa
 from faker import Faker
 from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectAtDB, ProjectID
+from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID, StorageFileID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
@@ -304,7 +304,7 @@ async def random_project_with_files(
     faker: Faker,
 ) -> Callable[
     [int, tuple[ByteSize, ...], tuple[SHA256Str, ...]],
-    Awaitable[tuple[ProjectAtDB, dict[NodeID, dict[SimcoreS3FileID, FileIDDict]]]],
+    Awaitable[tuple[dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, FileIDDict]]]],
 ]:
     async def _creator(
         num_nodes: int = 12,
@@ -324,7 +324,7 @@ async def _creator(
                 "488f3b57932803bbf644593bd46d95599b1d4da1d63bc020d7ebe6f1c255f7f3"
             ),
         ),
-    ) -> tuple[ProjectAtDB, dict[NodeID, dict[SimcoreS3FileID, FileIDDict]]]:
+    ) -> tuple[dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, FileIDDict]]]:
         assert len(file_sizes) == len(file_checksums)
         project = await create_project(name="random-project")
         node_to_files_mapping: dict[NodeID, dict[SimcoreS3FileID, FileIDDict]] = {}

services/storage/tests/conftest.py

@@ -12,7 +12,7 @@
 from collections.abc import AsyncIterator, Awaitable, Callable
 from contextlib import AbstractAsyncContextManager, asynccontextmanager
 from pathlib import Path
-from typing import Final, cast
+from typing import Any, Final, cast
 
 import httpx
 import pytest
@@ -24,7 +24,7 @@
 from fakeredis.aioredis import FakeRedis
 from fastapi import FastAPI
 from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectAtDB, ProjectID
+from models_library.projects import ProjectID
 from models_library.projects_nodes import NodeID
 from models_library.projects_nodes_io import LocationID, SimcoreS3FileID
 from models_library.storage_schemas import (
@@ -642,12 +642,12 @@ async def with_random_project_with_files(
         ...,
         Awaitable[
             tuple[
-                ProjectAtDB,
+                dict[str, Any],
                 dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
             ]
         ],
     ],
-) -> tuple[ProjectAtDB, dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],]:
+) -> tuple[dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],]:
     return await random_project_with_files(
         file_sizes=(
             TypeAdapter(ByteSize).validate_python("1Mib"),

services/storage/tests/unit/test_handlers_files.py

@@ -16,7 +16,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 from random import choice
-from typing import Literal
+from typing import Any, Literal
 from uuid import uuid4
 
 import httpx
@@ -27,7 +27,7 @@
 from faker import Faker
 from fastapi import FastAPI
 from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectAtDB, ProjectID
+from models_library.projects import ProjectID
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
 from models_library.storage_schemas import (
     FileMetaDataGet,
@@ -1484,7 +1484,7 @@ async def test_listing_with_project_id_filter(
         [int, tuple[ByteSize, ...]],
         Awaitable[
             tuple[
-                ProjectAtDB,
+                dict[str, Any],
                 dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
             ]
         ],
@@ -1505,7 +1505,7 @@ async def test_listing_with_project_id_filter(
     node_id = next(iter(src_projects_list.keys()))
     project_files_in_db = set(src_projects_list[node_id])
     assert len(project_files_in_db) > 0
-    project_id = src_project.uuid
+    project_id = src_project["uuid"]
     project_file_name = Path(choice(list(project_files_in_db))).name  # noqa: S311
 
     query = {

services/storage/tests/unit/test_handlers_paths.py

@@ -8,11 +8,11 @@
 
 
 from pathlib import Path
+from typing import Any
 
 import httpx
 from fastapi import FastAPI
 from fastapi_pagination import LimitOffsetPage
-from models_library.projects import ProjectAtDB
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
 from models_library.storage_schemas import FileMetaDataGet, PathMetaDataGet
 from models_library.users import UserID
@@ -55,7 +55,7 @@ async def test_list_paths_root_folder(
     location_id: LocationID,
     user_id: UserID,
     with_random_project_with_files: tuple[
-        ProjectAtDB,
+        dict[str, Any],
         dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
     ],
 ):
@@ -77,6 +77,6 @@ async def test_list_paths_root_folder(
     )
     assert page_of_files
     assert len(page_of_files.items) == 1
-    assert page_of_files.items[0].path == Path(f"{project_in_db.uuid}")
+    assert page_of_files.items[0].path == Path(f"{project_in_db['uuid']}")
     assert page_of_files.items[0].file_meta_data is None
     assert page_of_files.total == 1

services/storage/tests/unit/test_handlers_simcore_s3.py

@@ -20,7 +20,7 @@
 from faker import Faker
 from fastapi import FastAPI
 from models_library.basic_types import SHA256Str
-from models_library.projects import ProjectAtDB, ProjectID
+from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, NodeIDStr, SimcoreS3FileID
 from models_library.storage_schemas import FileMetaDataGet, FoldersBody
 from models_library.users import UserID
@@ -213,7 +213,7 @@ async def test_copy_folders_from_valid_project_with_one_large_file(
         [int, tuple[ByteSize], tuple[SHA256Str]],
         Awaitable[
             tuple[
-                ProjectAtDB,
+                dict[str, Any],
                 dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
             ]
         ],
@@ -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(
@@ -258,7 +258,7 @@ async def test_copy_folders_from_valid_project_with_one_large_file(
                 sqlalchemy_async_engine,
                 file_id=TypeAdapter(SimcoreS3FileID).validate_python(
                     f"{src_file_id}".replace(
-                        f"{src_project.uuid}", dst_project["uuid"]
+                        f"{src_project['uuid']}", dst_project["uuid"]
                     ).replace(f"{src_node_id}", f"{dst_node_id}")
                 ),
                 expected_entry_exists=True,
@@ -283,7 +283,7 @@ async def test_copy_folders_from_valid_project(
         ...,
         Awaitable[
             tuple[
-                ProjectAtDB,
+                dict[str, Any],
                 dict[NodeID, dict[SimcoreS3FileID, FileIDDict]],
             ]
         ],
@@ -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:
@@ -322,7 +322,7 @@ async def test_copy_folders_from_valid_project(
                 sqlalchemy_async_engine,
                 file_id=TypeAdapter(SimcoreS3FileID).validate_python(
                     f"{src_file_id}".replace(
-                        f"{src_project.uuid}", dst_project["uuid"]
+                        f"{src_project['uuid']}", dst_project["uuid"]
                     ).replace(f"{src_node_id}", f"{dst_node_id}")
                 ),
                 expected_entry_exists=True,
@@ -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]]],