mypy is happy

Author: sanderegg

services/storage/src/simcore_service_storage/models.py

@@ -40,7 +40,6 @@
     field_validator,
     model_validator,
     validate_call,
-    validator,
 )
 
 
@@ -223,7 +222,7 @@ class SearchFilesQueryParams(StorageQueryParamsBase):
     )
     offset: int = Field(default=0, ge=0, description="Page offset")
 
-    _empty_is_none = validator("startswith", allow_reuse=True, pre=True)(
+    _empty_is_none = field_validator("startswith", mode="before")(
         empty_str_to_none_pre_validator
     )
 

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -20,7 +20,12 @@
     S3MetaData,
     UploadedBytesTransferredCallback,
 )
-from models_library.api_schemas_storage import LinkType, S3BucketName, UploadedPart
+from models_library.api_schemas_storage import (
+    UNDEFINED_SIZE_TYPE,
+    LinkType,
+    S3BucketName,
+    UploadedPart,
+)
 from models_library.basic_types import SHA256Str
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import (
@@ -371,7 +376,7 @@ async def abort_file_upload(
                 raise FileAccessRightError(access_right="write/delete", file_id=file_id)
 
             fmd: FileMetaDataAtDB = await db_file_meta_data.get(
-                conn, parse_obj_as(SimcoreS3FileID, file_id)
+                conn, TypeAdapter(SimcoreS3FileID).validate_python(file_id)
             )
         if is_valid_managed_multipart_upload(fmd.upload_id):
             assert fmd.upload_id  # nosec
@@ -620,7 +625,9 @@ async def deep_copy_project_simcore_s3(
                 f"{len(src_project_files)} files",
                 log_duration=True,
             ):
-                sizes_and_num_files: list[tuple[ByteSize, int]] = await limited_gather(
+                sizes_and_num_files: list[
+                    tuple[ByteSize | UNDEFINED_SIZE_TYPE, int]
+                ] = await limited_gather(
                     *[self._get_size_and_num_files(fmd) for fmd in src_project_files],
                     limit=_MAX_PARALLEL_S3_CALLS,
                 )
@@ -693,7 +700,7 @@ async def deep_copy_project_simcore_s3(
 
     async def _get_size_and_num_files(
         self, fmd: FileMetaDataAtDB
-    ) -> tuple[ByteSize, int]:
+    ) -> tuple[ByteSize | UNDEFINED_SIZE_TYPE, int]:
         if not fmd.is_directory:
             return fmd.file_size, 1
 
@@ -977,7 +984,7 @@ async def _copy_file_datcore_s3(
         with tempfile.TemporaryDirectory() as tmpdir:
             local_file_path = Path(tmpdir) / filename
             # Downloads DATCore -> local
-            await download_to_file_or_raise(session, dc_link, local_file_path)
+            await download_to_file_or_raise(session, f"{dc_link}", local_file_path)
 
             # copying will happen using aioboto3, therefore multipart might happen
             async with self.engine.acquire() as conn:

services/storage/src/simcore_service_storage/simcore_s3_dsm_utils.py

@@ -1,6 +1,5 @@
 from contextlib import suppress
 from pathlib import Path
-from typing import cast
 
 from aiopg.sa.connection import SAConnection
 from aws_library.s3 import S3MetaData, SimcoreS3API
@@ -10,7 +9,7 @@
     SimcoreS3FileID,
     StorageFileID,
 )
-from pydantic import ByteSize, NonNegativeInt, parse_obj_as
+from pydantic import ByteSize, NonNegativeInt, TypeAdapter
 from servicelib.utils import ensure_ends_with
 
 from . import db_file_meta_data
@@ -56,16 +55,16 @@ async def expand_directory(
                 location_id=fmd.location_id,
                 location=fmd.location,
                 bucket_name=fmd.bucket_name,
-                object_name=cast(SimcoreS3FileID, x.object_key),
+                object_name=x.object_key,
                 user_id=fmd.user_id,
                 # NOTE: to ensure users have a consistent experience the
                 # `created_at` field is inherited from the last_modified
                 # coming from S3. This way if a file is created 1 month after the
                 # creation of the directory, the file's creation date
                 # will not be 1 month in the passed.
                 created_at=x.last_modified,
-                file_id=cast(SimcoreS3FileID, x.object_key),
-                file_size=parse_obj_as(ByteSize, x.size),
+                file_id=x.object_key,
+                file_size=TypeAdapter(ByteSize).validate_python(x.size),
                 last_modified=x.last_modified,
                 entity_tag=x.e_tag,
                 is_soft_link=False,
@@ -100,7 +99,7 @@ async def _get_fmd(
     ) -> FileMetaDataAtDB | None:
         with suppress(FileMetaDataNotFoundError):
             return await db_file_meta_data.get(
-                conn, parse_obj_as(SimcoreS3FileID, s3_file_id)
+                conn, TypeAdapter(SimcoreS3FileID).validate_python(s3_file_id)
             )
         return None
 
@@ -114,7 +113,9 @@ async def _get_fmd(
         # could not extract a directory name from the provided path
         return None
 
-    directory_file_id = parse_obj_as(SimcoreS3FileID, directory_file_id_str)
+    directory_file_id = TypeAdapter(SimcoreS3FileID).validate_python(
+        directory_file_id_str
+    )
     directory_file_id_fmd = await _get_fmd(conn, directory_file_id)
 
     return directory_file_id if directory_file_id_fmd else None

services/storage/tests/conftest.py

@@ -353,7 +353,7 @@ async def _uploader(
             file, file_upload_link
         )
         # complete the upload
-        complete_url = URL(file_upload_link.links.complete_upload).relative()
+        complete_url = URL(f"{file_upload_link.links.complete_upload}").relative()
         with log_context(logging.INFO, f"completing upload of {file=}"):
             response = await client.post(
                 f"{complete_url}",
@@ -364,7 +364,7 @@ async def _uploader(
             assert not error
             assert data
             file_upload_complete_response = FileUploadCompleteResponse.parse_obj(data)
-            state_url = URL(file_upload_complete_response.links.state).relative()
+            state_url = URL(f"{file_upload_complete_response.links.state}").relative()
 
             completion_etag = None
             async for attempt in AsyncRetrying(