changed types

Author: sanderegg

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 Any, Final, cast
+from typing import 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 ProjectID
+from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes import NodeID
 from models_library.projects_nodes_io import LocationID, SimcoreS3FileID
 from models_library.storage_schemas import (
@@ -63,10 +63,11 @@
 from tenacity.retry import retry_if_exception_type
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
-from tests.helpers.utils_file_meta_data import assert_file_meta_data_in_db
 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_plugins = [
     "pytest_simcore.aws_s3_service",
     "pytest_simcore.aws_server",
@@ -289,9 +290,9 @@ async def _link_creator(
             location_id=f"{location_id}",
             file_id=file_id,
         ).with_query(**query_kwargs, user_id=user_id)
-        assert (
-            "file_size" in url.query
-        ), "V2 call to upload file must contain file_size field!"
+        assert "file_size" in url.query, (
+            "V2 call to upload file must contain file_size field!"
+        )
         response = await client.put(f"{url}")
         received_file_upload, error = assert_status(
             response, status.HTTP_200_OK, FileUploadSchema
@@ -639,12 +640,15 @@ async def with_random_project_with_files(
         ...,
         Awaitable[
             tuple[
-                dict[str, Any],
+                ProjectAtDB,
                 dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
             ]
         ],
     ],
-) -> tuple[dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],]:
+) -> tuple[
+    ProjectAtDB,
+    dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
+]:
     return await random_project_with_files(
         file_sizes=(
             TypeAdapter(ByteSize).validate_python("1Mib"),

services/storage/tests/fixtures/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 ProjectID
+from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
@@ -272,9 +272,7 @@ async def random_project_with_files(
 ) -> Callable[
     [int, tuple[ByteSize, ...], tuple[SHA256Str, ...]],
     Awaitable[
-        tuple[
-            dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]]
-        ]
+        tuple[ProjectAtDB, dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]]]
     ],
 ]:
     async def _creator(
@@ -295,9 +293,7 @@ async def _creator(
                 "488f3b57932803bbf644593bd46d95599b1d4da1d63bc020d7ebe6f1c255f7f3"
             ),
         ),
-    ) -> tuple[
-        dict[str, Any], dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]]
-    ]:
+    ) -> tuple[ProjectAtDB, dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]]]:
         assert len(file_sizes) == len(file_checksums)
         project = await create_project(name="random-project")
         src_projects_list: dict[

services/storage/tests/helpers/utils.py

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

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 Any, Literal
+from typing import 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 ProjectID
+from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import LocationID, NodeID, SimcoreS3FileID
 from models_library.storage_schemas import (
     FileMetaDataGet,
@@ -1482,14 +1482,14 @@ async def test_listing_with_project_id_filter(
         [int, tuple[ByteSize, ...]],
         Awaitable[
             tuple[
-                dict[str, Any],
+                ProjectAtDB,
                 dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
             ]
         ],
     ],
     uuid_filter: bool,
 ):
-    project, src_projects_list = await random_project_with_files(
+    src_project, src_projects_list = await random_project_with_files(
         num_nodes=1,
         file_sizes=(ByteSize(1),),
         file_checksums=(TypeAdapter(SHA256Str).validate_python(faker.sha256()),),
@@ -1503,7 +1503,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 = 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

@@ -13,7 +13,7 @@
 import httpx
 from fastapi import FastAPI
 from fastapi_pagination import LimitOffsetPage
-from models_library.api_schemas_storage import FileMetaDataGet
+from models_library.api_schemas_storage import FileMetaDataGet, PathMetaDataGet
 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
@@ -71,7 +71,7 @@ async def test_list_paths_root_folder(
     page_of_files, _ = assert_status(
         response,
         status.HTTP_200_OK,
-        LimitOffsetPage[FileMetaDataGet],
+        LimitOffsetPage[PathMetaDataGet],
         expect_envelope=False,
     )
     assert page_of_files

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 ProjectID
+from models_library.projects import ProjectAtDB, 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
@@ -212,7 +212,7 @@ async def test_copy_folders_from_valid_project_with_one_large_file(
         [int, tuple[ByteSize], tuple[SHA256Str]],
         Awaitable[
             tuple[
-                dict[str, Any],
+                ProjectAtDB,
                 dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | str]]],
             ]
         ],
@@ -228,20 +228,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)
+    dst_project, nodes_map = clone_project_data(src_project.model_dump(mode="json"))
     dst_project = await create_project(**dst_project)
     # copy the project files
     data = await _request_copy_folders(
         initialized_app,
         client,
         user_id,
-        src_project,
+        src_project.model_dump(mode="json"),
         dst_project,
         nodes_map={NodeID(i): NodeID(j) for i, j in nodes_map.items()},
     )
-    assert data == jsonable_encoder(
+    assert data == (
         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(
@@ -257,7 +257,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(
-                        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,
@@ -282,7 +282,7 @@ async def test_copy_folders_from_valid_project(
         ...,
         Awaitable[
             tuple[
-                dict[str, Any],
+                ProjectAtDB,
                 dict[NodeID, dict[SimcoreS3FileID, dict[str, Path | SHA256Str]]],
             ]
         ],
@@ -291,20 +291,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)
+    dst_project, nodes_map = clone_project_data(src_project.model_dump(mode="json"))
     dst_project = await create_project(**dst_project)
     # copy the project files
     data = await _request_copy_folders(
         initialized_app,
         client,
         user_id,
-        src_project,
+        src_project.model_dump(mode="json"),
         dst_project,
         nodes_map={NodeID(i): NodeID(j) for i, j in nodes_map.items()},
     )
-    assert data == jsonable_encoder(
+    assert data == (
         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:
@@ -321,7 +321,7 @@ async def test_copy_folders_from_valid_project(
                 sqlalchemy_async_engine,
                 file_id=TypeAdapter(SimcoreS3FileID).validate_python(
                     f"{src_file_id}".replace(
-                        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,