all tests are passing?

Author: sanderegg

packages/models-library/src/models_library/api_schemas_storage.py

@@ -8,7 +8,7 @@
 
 from datetime import datetime
 from enum import Enum
-from typing import Annotated, Any, Literal, TypeAlias
+from typing import Annotated, Any, Literal, Self, TypeAlias
 from uuid import UUID
 
 from pydantic import (
@@ -316,19 +316,18 @@ class FoldersBody(BaseModel):
     nodes_map: dict[NodeID, NodeID] = Field(default_factory=dict)
 
     @model_validator(mode="after")
-    @classmethod
-    def ensure_consistent_entries(cls, values):
-        source_node_keys = (NodeID(n) for n in values["source"].get("workbench", {}))
-        if set(source_node_keys) != set(values["nodes_map"].keys()):
+    def ensure_consistent_entries(self) -> Self:
+        source_node_keys = (NodeID(n) for n in self.source.get("workbench", {}))
+        if set(source_node_keys) != set(self.nodes_map.keys()):
             msg = "source project nodes do not fit with nodes_map entries"
             raise ValueError(msg)
         destination_node_keys = (
-            NodeID(n) for n in values["destination"].get("workbench", {})
+            NodeID(n) for n in self.destination.get("workbench", {})
         )
-        if set(destination_node_keys) != set(values["nodes_map"].values()):
+        if set(destination_node_keys) != set(self.nodes_map.values()):
             msg = "destination project nodes do not fit with nodes_map values"
             raise ValueError(msg)
-        return values
+        return self
 
 
 class SoftCopyBody(BaseModel):

packages/settings-library/src/settings_library/node_ports.py

@@ -1,5 +1,5 @@
 from datetime import timedelta
-from typing import Final
+from typing import Final, Self
 
 from pydantic import Field, NonNegativeInt, PositiveInt, SecretStr, model_validator
 
@@ -22,14 +22,13 @@ def auth_required(self) -> bool:
         return self.STORAGE_USERNAME is not None and self.STORAGE_PASSWORD is not None
 
     @model_validator(mode="after")
-    @classmethod
-    def _validate_auth_fields(cls, values):
-        username = values.STORAGE_USERNAME
-        password = values.STORAGE_PASSWORD
+    def _validate_auth_fields(self) -> Self:
+        username = self.STORAGE_USERNAME
+        password = self.STORAGE_PASSWORD
         if (username is None) != (password is None):
             msg = f"Both {username=} and {password=} must be either set or unset!"
             raise ValueError(msg)
-        return values
+        return self
 
 
 class NodePortsSettings(BaseCustomSettings):

scripts/release/monitor_release/settings.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import Final
+from typing import Final, Self
 
 from dotenv import load_dotenv
 from pydantic import BaseModel, Field, HttpUrl, TypeAdapter, model_validator
@@ -47,7 +47,7 @@ class ReleaseSettings(BaseSettings):
     model_config = SettingsConfigDict(extra="ignore")
 
     @model_validator(mode="after")
-    def deduce_portainer_url(self):
+    def deduce_portainer_url(self) -> Self:
         self.portainer_url = TypeAdapter(HttpUrl).validate_python(
             f"https://{self.PORTAINER_DOMAIN}"
         )

services/storage/tests/unit/test_utils.py

@@ -14,6 +14,7 @@
 import pytest
 from aiohttp import ClientSession
 from faker import Faker
+from models_library.api_schemas_storage import UNDEFINED_SIZE_TYPE
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
 from pydantic import ByteSize, HttpUrl, TypeAdapter
@@ -46,24 +47,30 @@ async def test_download_files(tmp_path: Path, httpbin_base_url: HttpUrl):
     [
         (-1, None, None, None, False),
         (0, None, None, None, False),
-        (random.randint(1, 1000000), None, None, None, False),
+        (random.randint(1, 1000000), None, None, None, False),  # noqa: S311
         (-1, "some_valid_entity_tag", None, None, False),
         (0, "some_valid_entity_tag", None, None, False),
         (
-            random.randint(1, 1000000),
+            random.randint(1, 1000000),  # noqa: S311
             "some_valid_entity_tag",
             "som_upload_id",
             None,
             False,
         ),
         (
-            random.randint(1, 1000000),
+            random.randint(1, 1000000),  # noqa: S311
             "some_valid_entity_tag",
             None,
             datetime.datetime.now(datetime.UTC),
             False,
         ),
-        (random.randint(1, 1000000), "some_valid_entity_tag", None, None, True),
+        (
+            random.randint(1, 1000000),  # noqa: S311
+            "some_valid_entity_tag",
+            None,
+            None,
+            True,
+        ),
     ],
 )
 def test_file_entry_valid(
@@ -84,7 +91,9 @@ def test_file_entry_valid(
         location_name=SimcoreS3DataManager.get_location_name(),
         sha256_checksum=None,
     )
-    fmd.file_size = TypeAdapter(ByteSize).validate_python(file_size)
+    fmd.file_size = TypeAdapter(UNDEFINED_SIZE_TYPE | ByteSize).validate_python(
+        file_size
+    )
     fmd.entity_tag = entity_tag
     fmd.upload_id = upload_id
     fmd.upload_expires_at = upload_expires_at