fix int test

Author: giancarloromeo

packages/simcore-sdk/tests/integration/test_node_ports_v2_nodeports2.py

@@ -28,6 +28,7 @@
     SimcoreS3FileID,
 )
 from models_library.services_types import ServicePortKey
+from pydantic import TypeAdapter
 from servicelib.progress_bar import ProgressBarData
 from settings_library.r_clone import RCloneSettings
 from simcore_sdk import node_ports_v2
@@ -224,7 +225,7 @@ async def test_port_value_accessors(
     item_pytype: type,
     option_r_clone_settings: RCloneSettings | None,
 ):  # pylint: disable=W0613, W0621
-    item_key = ServicePortKey("some_key")
+    item_key = TypeAdapter(ServicePortKey).validate_python("some_key")
     config_dict, _, _ = create_special_configuration(
         inputs=[(item_key, item_type, item_value)],
         outputs=[(item_key, item_type, None)],
@@ -299,17 +300,26 @@ async def test_port_file_accessors(
     )
     await check_config_valid(PORTS, config_dict)
     assert (
-        await (await PORTS.outputs)[ServicePortKey("out_34")].get() is None
+        await (await PORTS.outputs)[
+            TypeAdapter(ServicePortKey).validate_python("out_34")
+        ].get()
+        is None
     )  # check emptyness
     with pytest.raises(exceptions.S3InvalidPathError):
-        await (await PORTS.inputs)[ServicePortKey("in_1")].get()
+        await (await PORTS.inputs)[
+            TypeAdapter(ServicePortKey).validate_python("in_1")
+        ].get()
 
     # this triggers an upload to S3 + configuration change
-    await (await PORTS.outputs)[ServicePortKey("out_34")].set(item_value)
+    await (await PORTS.outputs)[
+        TypeAdapter(ServicePortKey).validate_python("out_34")
+    ].set(item_value)
     # this is the link to S3 storage
-    value = (await PORTS.outputs)[ServicePortKey("out_34")].value
+    value = (await PORTS.outputs)[
+        TypeAdapter(ServicePortKey).validate_python("out_34")
+    ].value
     assert isinstance(value, DownloadLink | PortLink | BaseFileLink)
-    received_file_link = value.dict(by_alias=True, exclude_unset=True)
+    received_file_link = value.model_dump(by_alias=True, exclude_unset=True)
     assert received_file_link["store"] == s3_simcore_location
     assert (
         received_file_link["path"]
@@ -322,12 +332,21 @@ async def test_port_file_accessors(
 
     # this triggers a download from S3 to a location in /tempdir/simcorefiles/item_key
     assert isinstance(
-        await (await PORTS.outputs)[ServicePortKey("out_34")].get(), item_pytype
+        await (await PORTS.outputs)[
+            TypeAdapter(ServicePortKey).validate_python("out_34")
+        ].get(),
+        item_pytype,
     )
-    downloaded_file = await (await PORTS.outputs)[ServicePortKey("out_34")].get()
+    downloaded_file = await (await PORTS.outputs)[
+        TypeAdapter(ServicePortKey).validate_python("out_34")
+    ].get()
     assert isinstance(downloaded_file, Path)
     assert downloaded_file.exists()
-    assert str(await (await PORTS.outputs)[ServicePortKey("out_34")].get()).startswith(
+    assert str(
+        await (await PORTS.outputs)[
+            TypeAdapter(ServicePortKey).validate_python("out_34")
+        ].get()
+    ).startswith(
         str(
             Path(
                 tempfile.gettempdir(),
@@ -472,9 +491,16 @@ async def test_get_value_from_previous_node(
     )
 
     await check_config_valid(PORTS, config_dict)
-    input_value = await (await PORTS.inputs)[ServicePortKey("in_15")].get()
+    input_value = await (await PORTS.inputs)[
+        TypeAdapter(ServicePortKey).validate_python("in_15")
+    ].get()
     assert isinstance(input_value, item_pytype)
-    assert await (await PORTS.inputs)[ServicePortKey("in_15")].get() == item_value
+    assert (
+        await (await PORTS.inputs)[
+            TypeAdapter(ServicePortKey).validate_python("in_15")
+        ].get()
+        == item_value
+    )
 
 
 @pytest.mark.parametrize(
@@ -516,7 +542,9 @@ async def test_get_file_from_previous_node(
         r_clone_settings=option_r_clone_settings,
     )
     await check_config_valid(PORTS, config_dict)
-    file_path = await (await PORTS.inputs)[ServicePortKey("in_15")].get()
+    file_path = await (await PORTS.inputs)[
+        TypeAdapter(ServicePortKey).validate_python("in_15")
+    ].get()
     assert isinstance(file_path, item_pytype)
     assert file_path == Path(
         tempfile.gettempdir(),
@@ -577,7 +605,9 @@ async def test_get_file_from_previous_node_with_mapping_of_same_key_name(
         postgres_db, project_id, this_node_uuid, config_dict
     )  # pylint: disable=E1101
     await check_config_valid(PORTS, config_dict)
-    file_path = await (await PORTS.inputs)[ServicePortKey("in_15")].get()
+    file_path = await (await PORTS.inputs)[
+        TypeAdapter(ServicePortKey).validate_python("in_15")
+    ].get()
     assert isinstance(file_path, item_pytype)
     assert file_path == Path(
         tempfile.gettempdir(),
@@ -637,7 +667,9 @@ async def test_file_mapping(
         postgres_db, project_id, node_uuid, config_dict
     )  # pylint: disable=E1101
     await check_config_valid(PORTS, config_dict)
-    file_path = await (await PORTS.inputs)[ServicePortKey("in_1")].get()
+    file_path = await (await PORTS.inputs)[
+        TypeAdapter(ServicePortKey).validate_python("in_1")
+    ].get()
     assert isinstance(file_path, item_pytype)
     assert file_path == Path(
         tempfile.gettempdir(),
@@ -648,7 +680,9 @@ async def test_file_mapping(
     )
 
     # let's get it a second time to see if replacing works
-    file_path = await (await PORTS.inputs)[ServicePortKey("in_1")].get()
+    file_path = await (await PORTS.inputs)[
+        TypeAdapter(ServicePortKey).validate_python("in_1")
+    ].get()
     assert isinstance(file_path, item_pytype)
     assert file_path == Path(
         tempfile.gettempdir(),
@@ -665,9 +699,11 @@ async def test_file_mapping(
     assert isinstance(file_path, Path)
     await PORTS.set_file_by_keymap(file_path)
     file_id = create_valid_file_uuid("out_1", file_path)
-    value = (await PORTS.outputs)[ServicePortKey("out_1")].value
+    value = (await PORTS.outputs)[
+        TypeAdapter(ServicePortKey).validate_python("out_1")
+    ].value
     assert isinstance(value, DownloadLink | PortLink | BaseFileLink)
-    received_file_link = value.dict(by_alias=True, exclude_unset=True)
+    received_file_link = value.model_dump(by_alias=True, exclude_unset=True)
     assert received_file_link["store"] == s3_simcore_location
     assert received_file_link["path"] == file_id
     # received a new eTag
@@ -720,15 +756,19 @@ async def test_regression_concurrent_port_update_fails(
 
     # when writing in serial these are expected to work
     for item_key, _, _ in outputs:
-        await (await PORTS.outputs)[ServicePortKey(item_key)].set(int_item_value)
-        assert (await PORTS.outputs)[ServicePortKey(item_key)].value == int_item_value
+        await (await PORTS.outputs)[
+            TypeAdapter(ServicePortKey).validate_python(item_key)
+        ].set(int_item_value)
+        assert (await PORTS.outputs)[
+            TypeAdapter(ServicePortKey).validate_python(item_key)
+        ].value == int_item_value
 
     # when writing in parallel and reading back,
     # they fail, with enough concurrency
     async def _upload_create_task(item_key: str) -> None:
-        await (await PORTS.outputs)[ServicePortKey(item_key)].set(
-            parallel_int_item_value
-        )
+        await (await PORTS.outputs)[
+            TypeAdapter(ServicePortKey).validate_python(item_key)
+        ].set(parallel_int_item_value)
 
     # updating in parallel creates a race condition
     results = await gather(
@@ -741,7 +781,7 @@ async def _upload_create_task(item_key: str) -> None:
     with pytest.raises(AssertionError) as exc_info:  # noqa: PT012
         for item_key, _, _ in outputs:
             assert (await PORTS.outputs)[
-                ServicePortKey(item_key)
+                TypeAdapter(ServicePortKey).validate_python(item_key)
             ].value == parallel_int_item_value
 
     assert exc_info.value.args[0].startswith(
@@ -773,7 +813,7 @@ async def test_batch_update_inputs_outputs(
     async with ProgressBarData(num_steps=2, description=faker.pystr()) as progress_bar:
         await PORTS.set_multiple(
             {
-                ServicePortKey(port.key): (k, None)
+                TypeAdapter(ServicePortKey).validate_python(port.key): (k, None)
                 for k, port in enumerate((await PORTS.outputs).values())
             },
             progress_bar=progress_bar,
@@ -782,7 +822,7 @@ async def test_batch_update_inputs_outputs(
         assert progress_bar._current_steps == pytest.approx(1)  # noqa: SLF001
         await PORTS.set_multiple(
             {
-                ServicePortKey(port.key): (k, None)
+                TypeAdapter(ServicePortKey).validate_python(port.key): (k, None)
                 for k, port in enumerate((await PORTS.inputs).values(), start=1000)
             },
             progress_bar=progress_bar,
@@ -793,18 +833,38 @@ async def test_batch_update_inputs_outputs(
     ports_inputs = await PORTS.inputs
     for k, asd in enumerate(outputs):
         item_key, _, _ = asd
-        assert ports_outputs[ServicePortKey(item_key)].value == k
-        assert await ports_outputs[ServicePortKey(item_key)].get() == k
+        assert (
+            ports_outputs[TypeAdapter(ServicePortKey).validate_python(item_key)].value
+            == k
+        )
+        assert (
+            await ports_outputs[
+                TypeAdapter(ServicePortKey).validate_python(item_key)
+            ].get()
+            == k
+        )
 
     for k, asd in enumerate(inputs, start=1000):
         item_key, _, _ = asd
-        assert ports_inputs[ServicePortKey(item_key)].value == k
-        assert await ports_inputs[ServicePortKey(item_key)].get() == k
+        assert (
+            ports_inputs[TypeAdapter(ServicePortKey).validate_python(item_key)].value
+            == k
+        )
+        assert (
+            await ports_inputs[
+                TypeAdapter(ServicePortKey).validate_python(item_key)
+            ].get()
+            == k
+        )
 
     # test missing key raises error
     async with ProgressBarData(num_steps=1, description=faker.pystr()) as progress_bar:
         with pytest.raises(UnboundPortError):
             await PORTS.set_multiple(
-                {ServicePortKey("missing_key_in_both"): (123132, None)},
+                {
+                    TypeAdapter(ServicePortKey).validate_python(
+                        "missing_key_in_both"
+                    ): (123132, None)
+                },
                 progress_bar=progress_bar,
             )