Merge remote-tracking branch 'origin/is4481/upgrade-libs' into is4481/upgrade-services

Author: giancarloromeo

packages/dask-task-models-library/src/dask_task_models_library/container_tasks/io.py

@@ -175,7 +175,7 @@ def from_task_output(
                 msg = f"Could not locate '{output_key}' in {output_data_file}"
                 raise ValueError(msg)
 
-        return cls.parse_obj(data)
+        return cls.model_validate(data)
 
     model_config = ConfigDict(
         json_schema_extra={

packages/dask-task-models-library/tests/container_tasks/test_io.py

@@ -30,7 +30,7 @@ def test_io_models_examples(model_cls, model_cls_examples):
     for name, example in model_cls_examples.items():
         print(name, ":", pformat(example))
 
-        model_instance = model_cls.parse_obj(example)
+        model_instance = model_cls.model_validate(example)
 
         assert model_instance, f"Failed with {name}"
         print(name, ":", model_instance)
@@ -73,7 +73,7 @@ def test_create_task_output_from_task_with_optional_fields_as_required(
         "examples"
     ]:
 
-        task_output_schema = TaskOutputDataSchema.parse_obj(schema_example)
+        task_output_schema = TaskOutputDataSchema.model_validate(schema_example)
         outputs_file_name = _create_fake_outputs(
             task_output_schema, tmp_path, optional_fields_set, faker
         )
@@ -94,7 +94,7 @@ def test_create_task_output_from_task_with_optional_fields_as_required(
 def test_create_task_output_from_task_throws_when_there_are_missing_files(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "required_file_output": {
                 "required": True,
@@ -115,7 +115,7 @@ def test_create_task_output_from_task_throws_when_there_are_missing_files(
 def test_create_task_output_from_task_does_not_throw_when_there_are_optional_missing_files(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "optional_file_output": {
                 "required": False,
@@ -136,7 +136,7 @@ def test_create_task_output_from_task_does_not_throw_when_there_are_optional_mis
 def test_create_task_output_from_task_throws_when_there_are_entries(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "some_output": {
                 "required": True,
@@ -155,7 +155,7 @@ def test_create_task_output_from_task_throws_when_there_are_entries(
 def test_create_task_output_from_task_does_not_throw_when_there_are_optional_entries(
     tmp_path: Path, faker: Faker
 ):
-    task_output_schema = TaskOutputDataSchema.parse_obj(
+    task_output_schema = TaskOutputDataSchema.model_validate(
         {
             "some_output": {
                 "required": False,
@@ -184,6 +184,6 @@ def test_objects_are_compatible_with_dask_requirements(model_cls, model_cls_exam
     for name, example in model_cls_examples.items():
         print(name, ":", pformat(example))
 
-        model_instance = model_cls.parse_obj(example)
+        model_instance = model_cls.model_validate(example)
         reloaded_instance = loads(dumps(model_instance))
         assert reloaded_instance == model_instance

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

@@ -1,3 +1,5 @@
+from typing import Any
+
 from pydantic.errors import PydanticErrorMixin
 
 
@@ -14,8 +16,8 @@ def __new__(cls, *_args, **_kwargs):
             cls.code = cls._get_full_class_name()  # type: ignore[assignment]
         return super().__new__(cls)
 
-    def __init__(self, *_args, **kwargs) -> None:
-        self.__dict__ = kwargs
+    def __init__(self, **ctx: Any) -> None:
+        self.__dict__ = ctx
         super().__init__(message=self._build_message(), code=self.code)
 
     def __str__(self) -> str:

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

@@ -13,6 +13,7 @@
 
 from models_library.basic_types import ConstrainedStr, KeyIDStr
 from pydantic import (
+    AfterValidator,
     AnyUrl,
     BaseModel,
     ConfigDict,
@@ -40,8 +41,9 @@
 LocationName = str
 
 
-class SimcoreS3FileID(ConstrainedStr):
-    pattern: re.Pattern[str] | None = re.compile(SIMCORE_S3_FILE_ID_RE)
+SimcoreS3FileID: TypeAlias = Annotated[
+    str, StringConstraints(pattern=SIMCORE_S3_FILE_ID_RE)
+]
 
 
 class SimcoreS3DirectoryID(ConstrainedStr):
@@ -87,9 +89,7 @@ def from_simcore_s3_object(cls, s3_object: str) -> "SimcoreS3DirectoryID":
         return TypeAdapter(cls).validate_python(f"{parent_path}/")
 
 
-class DatCoreFileID(ConstrainedStr):
-    regex: re.Pattern[str] | None = re.compile(DATCORE_FILE_ID_RE)
-
+DatCoreFileID: TypeAlias = Annotated[str, StringConstraints(pattern=DATCORE_FILE_ID_RE)]
 
 StorageFileID: TypeAlias = SimcoreS3FileID | DatCoreFileID
 
@@ -123,7 +123,9 @@ class PortLink(BaseModel):
 class DownloadLink(BaseModel):
     """I/O port type to hold a generic download link to a file (e.g. S3 pre-signed link, etc)"""
 
-    download_link: Annotated[str, AnyUrl] = Field(..., alias="downloadLink")
+    download_link: Annotated[AnyUrl, AfterValidator(str)] = Field(
+        ..., alias="downloadLink"
+    )
     label: str | None = Field(default=None, description="Display name")
     model_config = ConfigDict(
         extra="forbid",
@@ -145,11 +147,13 @@ class BaseFileLink(BaseModel):
     store: LocationID = Field(
         ...,
         description="The store identifier: 0 for simcore S3, 1 for datcore",
+        validate_default=True,
     )
 
     path: StorageFileID = Field(
         ...,
         description="The path to the file in the storage provider domain",
+        union_mode="left_to_right",
     )
 
     label: str | None = Field(

packages/models-library/src/models_library/utils/nodes.py

@@ -5,7 +5,7 @@
 from copy import deepcopy
 from typing import Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, TypeAdapter
 
 from ..projects import Project
 from ..projects_nodes_io import NodeID, PortLink, UUIDStr
@@ -20,7 +20,7 @@ def project_node_io_payload_cb(
 
     async def node_io_payload_cb(node_id: NodeID) -> dict[str, Any]:
         node_io_payload: dict[str, Any] = {"inputs": None, "outputs": None}
-        node = project.workbench.get(UUIDStr(node_id))
+        node = project.workbench.get(TypeAdapter(UUIDStr).validate_python(node_id))
         if node:
             node_io_payload = {"inputs": node.inputs, "outputs": node.outputs}
 

packages/postgres-database/src/simcore_postgres_database/utils_projects_nodes.py

@@ -83,7 +83,7 @@ async def add(
                 [
                     {
                         "project_uuid": f"{self.project_uuid}",
-                        **node.dict(),
+                        **node.model_dump(),
                     }
                     for node in nodes
                 ]

packages/postgres-database/tests/test_utils_projects_nodes.py

@@ -412,9 +412,9 @@ async def test_get_project_id_from_node_id_raises_if_multiple_projects_with_same
     assert len(project1_nodes) == 1
     project2_nodes = await project2_repo.add(connection, nodes=[shared_node])
     assert len(project2_nodes) == 1
-    assert project1_nodes[0].dict(
+    assert project1_nodes[0].model_dump(
         include=ProjectNodeCreate.get_field_names(exclude={"created", "modified"})
-    ) == project2_nodes[0].dict(
+    ) == project2_nodes[0].model_dump(
         include=ProjectNodeCreate.get_field_names(exclude={"created", "modified"})
     )
     with pytest.raises(ProjectNodesNonUniqueNodeFoundError):

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

@@ -106,9 +106,9 @@ def external_registry_settings(
     if external_envfile_dict:
         config = {
             field: external_envfile_dict.get(field, None)
-            for field in RegistrySettings.__fields__
+            for field in RegistrySettings.model_fields
         }
-        return RegistrySettings.parse_obj(config)
+        return RegistrySettings.model_validate(config)
     return None
 
 

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

@@ -1,17 +1,15 @@
 from typing import Literal
 
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import field_validator, model_validator, ConfigDict, BaseModel, Field
 
 from .httpx_calls_capture_errors import OpenApiSpecError
 
 
 class CapturedParameterSchema(BaseModel):
-    title: str | None
-    type_: Literal["str", "int", "float", "bool"] | None = Field(
-        None, alias="type", optional=True
-    )
+    title: str | None = None
+    type_: Literal["str", "int", "float", "bool"] | None = Field(None, alias="type")
     pattern: str | None
-    format_: Literal["uuid"] | None = Field(None, alias="format", optional=True)
+    format_: Literal["uuid"] | None = Field(None, alias="format")
     exclusiveMinimum: bool | None
     minimum: int | None
     anyOf: list["CapturedParameterSchema"] | None
@@ -22,7 +20,7 @@ class Config:
         validate_always = True
         allow_population_by_field_name = True
 
-    @validator("type_", pre=True)
+    @field_validator("type_", mode="before")
     @classmethod
     def preprocess_type_(cls, val):
         if val == "string":
@@ -33,7 +31,7 @@ def preprocess_type_(cls, val):
             val = "bool"
         return val
 
-    @root_validator(pre=False)
+    @model_validator(mode="after")
     @classmethod
     def check_compatibility(cls, values):
         type_ = values.get("type_")
@@ -100,10 +98,7 @@ class CapturedParameter(BaseModel):
     response_value: str | None = (
         None  # attribute for storing the params value in a concrete response
     )
-
-    class Config:
-        validate_always = True
-        allow_population_by_field_name = True
+    model_config = ConfigDict(validate_default=True, populate_by_name=True)
 
     def __hash__(self):
         return hash(

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

@@ -31,5 +31,5 @@ def minio_s3_settings_envs(
     minio_s3_settings: S3Settings,
     monkeypatch: pytest.MonkeyPatch,
 ) -> EnvVarsDict:
-    changed_envs: EnvVarsDict = minio_s3_settings.dict(exclude_unset=True)
+    changed_envs: EnvVarsDict = minio_s3_settings.model_dump(exclude_unset=True)
     return setenvs_from_dict(monkeypatch, changed_envs)