continue upgrading

Author: giancarloromeo

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

@@ -40,8 +40,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 +88,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 +122,7 @@ 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: AnyUrl = Field(..., alias="downloadLink")
     label: str | None = Field(default=None, description="Display name")
     model_config = ConfigDict(
         extra="forbid",
@@ -145,11 +144,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/simcore-sdk/src/simcore_sdk/node_ports_v2/nodeports_v2.py

@@ -44,7 +44,7 @@ class Nodeports(BaseModel):
     ]
     auto_update: bool = False
     r_clone_settings: RCloneSettings | None = None
-    io_log_redirect_cb: LogRedirectCB | None
+    io_log_redirect_cb: LogRedirectCB | None = None
     aws_s3_cli_settings: AwsS3CliSettings | None = None
     model_config = ConfigDict(
         arbitrary_types_allowed=True,

packages/simcore-sdk/src/simcore_sdk/node_ports_v2/port.py

@@ -80,7 +80,7 @@ class Port(BaseServiceIOModel):
     widget: dict[str, Any] | None = None
     default_value: DataItemValue | None = Field(None, alias="defaultValue")
 
-    value: DataItemValue | None = Field(None, validate_default=True)
+    value: DataItemValue | None = Field(None, validate_default=True, union_mode="left_to_right")
 
     # Different states of "value"
     #   - e.g. typically after resolving a port's link, a download link, ...

packages/simcore-sdk/tests/helpers/utils_port_v2.py

@@ -45,5 +45,5 @@ def create_valid_port_mapping(
         key=key_for_file_port,
         fileToKeyMap={file_to_key: key_for_file_port} if file_to_key else None,
     )
-    port_mapping = mapping_class(**{"__root__": port_cfgs})
+    port_mapping = mapping_class(**{"root": port_cfgs})
     return port_mapping

packages/simcore-sdk/tests/unit/test_node_ports_common_file_io_utils.py

@@ -19,7 +19,7 @@
     UploadedPart,
 )
 from moto.server import ThreadedMotoServer
-from pydantic import AnyUrl, ByteSize, parse_obj_as
+from pydantic import AnyUrl, ByteSize, TypeAdapter, parse_obj_as
 from pytest_mock import MockerFixture
 from servicelib.aiohttp import status
 from servicelib.progress_bar import ProgressBarData
@@ -234,8 +234,8 @@ async def _creator(num_upload_links: int, chunk_size: ByteSize) -> FileUploadSch
             chunk_size=chunk_size,
             urls=upload_links,
             links=FileUploadLinks(
-                abort_upload=parse_obj_as(AnyUrl, faker.uri()),
-                complete_upload=parse_obj_as(AnyUrl, faker.uri()),
+                abort_upload=TypeAdapter(AnyUrl).validate_python(faker.uri()),
+                complete_upload=TypeAdapter(AnyUrl).validate_python(faker.uri()),
             ),
         )
 
@@ -245,7 +245,12 @@ async def _creator(num_upload_links: int, chunk_size: ByteSize) -> FileUploadSch
 @pytest.mark.skip(reason="this will allow to reproduce an issue")
 @pytest.mark.parametrize(
     "file_size,used_chunk_size",
-    [(parse_obj_as(ByteSize, 21800510238), parse_obj_as(ByteSize, 10485760))],
+    [
+        (
+            TypeAdapter(ByteSize).validate_python(21800510238),
+            TypeAdapter(ByteSize).validate_python(10485760),
+        )
+    ],
 )
 async def test_upload_file_to_presigned_links(
     client_session: ClientSession,

packages/simcore-sdk/tests/unit/test_node_ports_v2_port.py

@@ -22,8 +22,7 @@
 from faker import Faker
 from models_library.api_schemas_storage import FileMetaDataGet
 from models_library.projects_nodes_io import LocationID
-from pydantic import parse_obj_as
-from pydantic.error_wrappers import ValidationError
+from pydantic import TypeAdapter, ValidationError
 from pytest_mock.plugin import MockerFixture
 from servicelib.progress_bar import ProgressBarData
 from simcore_sdk.node_ports_common.file_io_utils import LogRedirectCB
@@ -218,8 +217,7 @@ def e_tag_fixture() -> str:
 async def mock_filemanager(mocker: MockerFixture, e_tag: str, faker: Faker) -> None:
     mocker.patch(
         "simcore_sdk.node_ports_common.filemanager._get_file_meta_data",
-        return_value=parse_obj_as(
-            FileMetaDataGet,
+        return_value=TypeAdapter(FileMetaDataGet).validate_python(
             FileMetaDataGet.model_config["json_schema_extra"]["examples"][0],
         ),
     )
@@ -320,7 +318,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/no_file/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "no_file"
@@ -343,7 +341,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/no_file_with_default/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "no_file_with_default"
@@ -431,7 +429,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/some_file_on_datcore/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "some_file_on_datcore"
@@ -460,7 +458,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/download_link/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "download_link"
@@ -492,7 +490,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/download_link_with_file_to_key/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "download_link_with_file_to_key"
@@ -523,7 +521,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/file_port_link/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "file_port_link"
@@ -557,7 +555,7 @@ class PortParams(NamedTuple):
                 exp_new_value=FileLink(
                     store=simcore_store_id(),
                     path=f"{project_id()}/{node_uuid()}/file_port_link_with_file_to_key_map/{this_node_file_name().name}",
-                    e_tag=e_tag(),
+                    eTag=e_tag(),
                 ),
                 exp_new_get_value=download_file_folder_name()
                 / "file_port_link_with_file_to_key_map"

packages/simcore-sdk/tests/unit/test_node_ports_v2_port_mapping.py

@@ -18,7 +18,7 @@
 
 @pytest.mark.parametrize("port_class", [InputsList, OutputsList])
 def test_empty_ports_mapping(port_class: type[InputsList | OutputsList]):
-    port_mapping = port_class(__root__={})
+    port_mapping = port_class(root={})
     assert not port_mapping.items()
     assert not port_mapping.values()
     assert not port_mapping.keys()
@@ -36,10 +36,10 @@ def test_filled_ports_mapping(port_class: type[InputsList | OutputsList]):
         port_cfgs[port["key"]] = port
     port_cfgs["some_file"] = create_valid_port_config("data:*/*", key="some_file")
 
-    port_mapping = port_class(__root__=port_cfgs)
+    port_mapping = port_class(root=port_cfgs)
 
     # two ways to construct instances of __root__
-    assert port_class.parse_obj(port_cfgs) == port_mapping
+    assert port_class.model_validate(port_cfgs) == port_mapping
 
     assert len(port_mapping) == len(port_cfgs)
     for port_key, port_value in port_mapping.items():
@@ -61,8 +61,8 @@ def test_filled_ports_mapping(port_class: type[InputsList | OutputsList]):
 def test_io_ports_are_not_aliases():
     # prevents creating alises as InputsList = PortsMappings
 
-    inputs = InputsList(__root__={})
-    outputs = OutputsList(__root__={})
+    inputs = InputsList(root={})
+    outputs = OutputsList(root={})
 
     assert isinstance(inputs, InputsList)
     assert not isinstance(inputs, OutputsList)

packages/simcore-sdk/tests/unit/test_storage_client.py

@@ -20,7 +20,7 @@
 )
 from models_library.projects_nodes_io import SimcoreS3FileID
 from models_library.users import UserID
-from pydantic import AnyUrl, ByteSize, parse_obj_as
+from pydantic import AnyUrl, ByteSize, TypeAdapter
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from servicelib.aiohttp import status
 from simcore_sdk.node_ports_common import exceptions
@@ -176,7 +176,7 @@ async def test_get_file_metada(
         session=session, file_id=file_id, location_id=location_id, user_id=user_id
     )
     assert file_metadata
-    assert file_metadata == FileMetaDataGet.parse_obj(
+    assert file_metadata == FileMetaDataGet.model_validate(
         FileMetaDataGet.model_config["json_schema_extra"]["examples"][0]
     )
 
@@ -362,12 +362,12 @@ def test_mode_ports_storage_without_auth(
     [
         (True, _HTTP_URL, _HTTPS_URL),
         (False, _HTTP_URL, _HTTP_URL),
-        (True, parse_obj_as(AnyUrl, _HTTP_URL), _HTTPS_URL),
-        (False, parse_obj_as(AnyUrl, _HTTP_URL), _HTTP_URL),
+        (True, TypeAdapter(AnyUrl).validate_python(_HTTP_URL), _HTTPS_URL),
+        (False, TypeAdapter(AnyUrl).validate_python(_HTTP_URL), _HTTP_URL),
         (True, _HTTPS_URL, _HTTPS_URL),
         (False, _HTTPS_URL, _HTTPS_URL),
-        (True, parse_obj_as(AnyUrl, _HTTPS_URL), _HTTPS_URL),
-        (False, parse_obj_as(AnyUrl, _HTTPS_URL), _HTTPS_URL),
+        (True, TypeAdapter(AnyUrl).validate_python(_HTTPS_URL), _HTTPS_URL),
+        (False, TypeAdapter(AnyUrl).validate_python(_HTTPS_URL), _HTTPS_URL),
         (True, "http://http", "https://http"),
         (True, "https://http", "https://http"),
     ],