Merge branch 'pydantic_v2_migration_do_not_squash_updates' into is4481/upgrade-director-v2-service

Author: giancarloromeo

packages/common-library/tests/test_pydantic_validators.py

@@ -3,7 +3,7 @@
 
 import pytest
 from common_library.pydantic_validators import (
-    validate_legacy_timedelta_str,
+    _validate_legacy_timedelta_str,
     validate_numeric_string_as_timedelta,
 )
 from faker import Faker
@@ -16,7 +16,7 @@ def test_validate_legacy_timedelta(monkeypatch: pytest.MonkeyPatch, faker: Faker
     class Settings(BaseSettings):
         APP_NAME: str
         REQUEST_TIMEOUT: Annotated[
-            timedelta, BeforeValidator(validate_legacy_timedelta_str)
+            timedelta, BeforeValidator(_validate_legacy_timedelta_str)
         ] = Field(default=timedelta(hours=1))
 
         model_config = SettingsConfigDict()

packages/models-library/src/models_library/api_schemas_directorv2/clusters.py

@@ -112,7 +112,7 @@ class ClusterDetailsGet(ClusterDetails):
 
 
 class ClusterCreate(BaseCluster):
-    owner: GroupID | None
+    owner: GroupID | None = None  # type: ignore[assignment]
     authentication: ExternalClusterAuthentication
     access_rights: dict[GroupID, ClusterAccessRights] = Field(
         alias="accessRights", default_factory=dict

packages/models-library/src/models_library/api_schemas_directorv2/comp_tasks.py

@@ -5,6 +5,7 @@
     AnyHttpUrl,
     AnyUrl,
     BaseModel,
+    ConfigDict,
     Field,
     ValidationInfo,
     field_validator,
@@ -26,6 +27,17 @@ class ComputationGet(ComputationTask):
         None, description="the link where to stop the task"
     )
 
+    model_config = ConfigDict(
+        json_schema_extra={
+            "examples": [
+                x | {"url": "http://url.local"}  # type:ignore[operator]
+                for x in ComputationTask.model_config[  # type:ignore[index,union-attr]
+                    "json_schema_extra"
+                ]["examples"]
+            ]
+        }
+    )
+
 
 class ComputationCreate(BaseModel):
     user_id: UserID

packages/models-library/src/models_library/api_schemas_dynamic_sidecar/telemetry.py

@@ -8,8 +8,7 @@
     Field,
     NonNegativeFloat,
     NonNegativeInt,
-    root_validator,
-    validator,
+    model_validator,
 )
 
 from ..projects_nodes_io import NodeID
@@ -56,29 +55,13 @@ class DiskUsage(BaseModel):
     free: ByteSize = Field(description="remaining space")
 
     total: ByteSize = Field(description="total space = free + used")
-    used_percent: NonNegativeFloat = Field(
+    used_percent: float = Field(
         ge=0.00,
         le=100.00,
         description="Percent of used space relative to the total space",
     )
 
-    @validator("free")
-    @classmethod
-    def _free_positive(cls, v: float) -> float:
-        if v < 0:
-            msg = f"free={v} cannot be a negative value"
-            raise ValueError(msg)
-        return v
-
-    @validator("used")
-    @classmethod
-    def _used_positive(cls, v: float) -> float:
-        if v < 0:
-            msg = f"used={v} cannot be a negative value"
-            raise ValueError(msg)
-        return v
-
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     @classmethod
     def _check_total(cls, values: dict[str, Any]) -> dict[str, Any]:
         total = values["total"]

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

@@ -311,12 +311,12 @@ class FileUploadCompleteFutureResponse(BaseModel):
 
 
 class FoldersBody(BaseModel):
-    source: dict[str, Any] = Field(default_factory=dict)
-    destination: dict[str, Any] = Field(default_factory=dict)
-    nodes_map: dict[NodeID, NodeID] = Field(default_factory=dict)
+    source: Annotated[dict[str, Any], Field(default_factory=dict)]
+    destination: Annotated[dict[str, Any], Field(default_factory=dict)]
+    nodes_map: Annotated[dict[NodeID, NodeID], Field(default_factory=dict)]
 
     @model_validator(mode="after")
-    def ensure_consistent_entries(self) -> Self:
+    def ensure_consistent_entries(self: 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"

packages/models-library/src/models_library/api_schemas_webserver/product.py

@@ -1,7 +1,15 @@
 from datetime import datetime
 from typing import Annotated, TypeAlias
 
-from pydantic import ConfigDict, Field, HttpUrl, NonNegativeInt, PositiveInt
+from pydantic import (
+    ConfigDict,
+    Field,
+    HttpUrl,
+    NonNegativeFloat,
+    NonNegativeInt,
+    PlainSerializer,
+    PositiveInt,
+)
 
 from ..basic_types import IDStr, NonNegativeDecimal
 from ..emails import LowerCaseEmailStr
@@ -11,7 +19,10 @@
 
 class GetCreditPrice(OutputSchema):
     product_name: str
-    usd_per_credit: NonNegativeDecimal | None = Field(
+    usd_per_credit: Annotated[
+        NonNegativeDecimal,
+        PlainSerializer(float, return_type=NonNegativeFloat, when_used="json"),
+    ] | None = Field(
         ...,
         description="Price of a credit in USD. "
         "If None, then this product's price is UNDEFINED",

packages/models-library/src/models_library/api_schemas_webserver/projects.py

@@ -107,7 +107,9 @@ class ProjectReplace(InputSchema):
     uuid: ProjectID
     name: ShortTruncatedStr
     description: LongTruncatedStr
-    thumbnail: Annotated[HttpUrl | None, BeforeValidator(empty_str_to_none_pre_validator)] = Field(default=None)
+    thumbnail: Annotated[
+        HttpUrl | None, BeforeValidator(empty_str_to_none_pre_validator)
+    ] = Field(default=None)
     creation_date: DateTimeStr
     last_change_date: DateTimeStr
     workbench: NodesDict
@@ -127,13 +129,15 @@ class ProjectReplace(InputSchema):
 class ProjectPatch(InputSchema):
     name: ShortTruncatedStr | None = Field(default=None)
     description: LongTruncatedStr | None = Field(default=None)
-    thumbnail: Annotated[HttpUrl | None, BeforeValidator(empty_str_to_none_pre_validator)] = Field(default=None)
+    thumbnail: Annotated[
+        HttpUrl | None, BeforeValidator(empty_str_to_none_pre_validator)
+    ] = Field(default=None)
     access_rights: dict[GroupIDStr, AccessRights] | None = Field(default=None)
     classifiers: list[ClassifierID] | None = Field(default=None)
     dev: dict | None = Field(default=None)
     ui: StudyUI | None = Field(default=None)
     quality: dict[str, Any] | None = Field(default=None)
-    
+
 
 __all__: tuple[str, ...] = (
     "EmptyModel",

packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py

@@ -1,7 +1,8 @@
 from datetime import datetime
 from decimal import Decimal
+from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, PlainSerializer
 
 from ..projects import ProjectID
 from ..projects_nodes_io import NodeID
@@ -49,7 +50,9 @@ class PricingUnitGet(OutputSchema):
     pricing_unit_id: PricingUnitId
     unit_name: str
     unit_extra_info: UnitExtraInfo
-    current_cost_per_unit: Decimal
+    current_cost_per_unit: Annotated[
+        Decimal, PlainSerializer(float, return_type=float, when_used="json")
+    ]
     default: bool
 
 

packages/models-library/src/models_library/api_schemas_webserver/wallets.py

@@ -2,7 +2,14 @@
 from decimal import Decimal
 from typing import Annotated, Literal, TypeAlias
 
-from pydantic import ConfigDict, Field, HttpUrl, PlainSerializer, ValidationInfo, field_validator
+from pydantic import (
+    ConfigDict,
+    Field,
+    HttpUrl,
+    PlainSerializer,
+    ValidationInfo,
+    field_validator,
+)
 
 from ..basic_types import AmountDecimal, IDStr, NonNegativeDecimal
 from ..users import GroupID
@@ -20,10 +27,7 @@ class WalletGet(OutputSchema):
     created: datetime
     modified: datetime
 
-    model_config = ConfigDict(
-        from_attributes=True,
-        frozen=False
-    )
+    model_config = ConfigDict(from_attributes=True, frozen=False)
 
 
 class WalletGetWithAvailableCredits(WalletGet):
@@ -163,7 +167,7 @@ class PaymentMethodGet(OutputSchema):
                     "autoRecharge": "False",
                 },
             ],
-        }
+        },
     )
 
 

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

@@ -12,8 +12,8 @@ class ProgressStructuredMessage(BaseModel):
     description: IDStr
     current: float
     total: int
-    unit: str | None
-    sub: "ProgressStructuredMessage | None"
+    unit: str | None = None
+    sub: "ProgressStructuredMessage | None" = None
 
     model_config = ConfigDict(
         json_schema_extra={