continue upgrading

Author: giancarloromeo

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/simcore-sdk/src/simcore_sdk/node_data/data_manager.py

@@ -6,7 +6,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, StorageFileID
 from models_library.users import UserID
-from pydantic import ByteSize, parse_obj_as
+from pydantic import ByteSize, TypeAdapter
 from servicelib.archiving_utils import unarchive_dir
 from servicelib.logging_utils import log_context
 from servicelib.progress_bar import ProgressBarData
@@ -25,7 +25,9 @@ def __create_s3_object_key(
     project_id: ProjectID, node_uuid: NodeID, file_path: Path | str
 ) -> StorageFileID:
     file_name = file_path.name if isinstance(file_path, Path) else file_path
-    return parse_obj_as(StorageFileID, f"{project_id}/{node_uuid}/{file_name}")  # type: ignore[arg-type]
+    return TypeAdapter(StorageFileID).validate_python(
+        f"{project_id}/{node_uuid}/{file_name}"
+    )
 
 
 def __get_s3_name(path: Path, *, is_archive: bool) -> str:

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

@@ -78,17 +78,23 @@ class SetKWargs:
 class Port(BaseServiceIOModel):
     key: ServicePortKey
     widget: dict[str, Any] | None = None
-    default_value: DataItemValue | None = Field(None, alias="defaultValue")
+    default_value: DataItemValue | None = Field(
+        None, alias="defaultValue", union_mode="left_to_right"
+    )
 
-    value: DataItemValue | None = Field(None, validate_default=True, union_mode="left_to_right")
+    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, ...
     #   - lazy evaluation using get_* members
     #   - used to run validation & conversion of resolved PortContentTypes values
     #   - excluded from all model export
-    value_item: ItemValue | None = Field(None, exclude=True)
-    value_concrete: ItemConcreteValue | None = Field(None, exclude=True)
+    value_item: ItemValue | None = Field(None, exclude=True, union_mode="left_to_right")
+    value_concrete: ItemConcreteValue | None = Field(
+        None, exclude=True, union_mode="left_to_right"
+    )
 
     # Function to convert from ItemValue -> ItemConcreteValue
     _py_value_converter: Callable[[Any], ItemConcreteValue] = PrivateAttr()

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

@@ -22,7 +22,7 @@
 #  - Use 'code' to discriminate port_validation errors
 
 
-class PortValueError(OsparcErrorMixin, RuntimeError):
+class PortValueError(OsparcErrorMixin, ValueError):
     code = "port_validation.schema_error"
     msg_template = "Invalid value in port {port_key!r}: {schema_error_message}"
 
@@ -37,7 +37,7 @@ def __init__(self, *, port_key: str, schema_error: JsonSchemaValidationError):
         )
 
 
-class PortUnitError(OsparcErrorMixin, RuntimeError):
+class PortUnitError(OsparcErrorMixin, ValueError):
     code = "port_validation.unit_error"
     msg_template = "Invalid unit in port {port_key!r}: {pint_error_msg}"
 

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

@@ -110,13 +110,13 @@ def test_validate_port_value_against_schema(fake_port_meta: dict[str, Any]):
 
     assert error["loc"] == ("value",)
     assert "-2 is less than the minimum of 0" in error["msg"]
-    assert error["type"] == "value_error.port_validation.schema_error"
+    assert error["type"] == "value_error"
 
     assert "ctx" in error
-    assert error["ctx"]["port_key"] == "port_1"
+    assert error["ctx"]["error"].port_key == "port_1"
 
-    schema_error_message = error["ctx"]["schema_error_message"]
-    schema_error_path = error["ctx"]["schema_error_path"]
+    schema_error_message = error["ctx"]["error"].schema_error_message
+    schema_error_path = error["ctx"]["error"].schema_error_path
 
     assert schema_error_message in error["msg"]
     assert schema_error_path == deque([1])
@@ -152,7 +152,7 @@ def test_validate_iolist_against_schema(fake_port_meta: dict[str, Any]):
     # ----
 
     with pytest.raises(ValidationError) as err_info:
-        InputsList.parse_obj({p["key"]: p for p in ports})
+        InputsList.model_validate({p["key"]: p for p in ports})
 
     # ---
     assert isinstance(err_info.value, ValidationError)
@@ -162,14 +162,13 @@ def test_validate_iolist_against_schema(fake_port_meta: dict[str, Any]):
     for error in err_info.value.errors():
         error_loc = error["loc"]
         assert "ctx" in error
-        port_key = error["ctx"].get("port_key")
+        port_key = error["ctx"]["error"].port_key
 
         # path hierachy
-        assert error_loc[0] == "__root__", f"{error_loc=}"
-        assert error_loc[1] == port_key, f"{error_loc=}"
-        assert error_loc[-1] == "value", f"{error_loc=}"
+        assert error_loc[0] == port_key, f"{error_loc=}"
+        assert error_loc[1] == "value", f"{error_loc=}"
 
-        assert error["type"] == "value_error.port_validation.schema_error"
+        assert error["type"] == "value_error"
         port_with_errors.append(port_key)
         pprint(error)
 

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

@@ -245,7 +245,7 @@ async def test_port_with_units_and_constraints(mocker):
     print(validation_error)
 
     assert validation_error["loc"] == ("value",)  # starts with value,!
-    assert validation_error["type"] == "value_error.port_validation.schema_error"
+    assert validation_error["type"] == "value_error"
     assert "-3.14 is less than the minimum of 0" in validation_error["msg"]
 
     # inits with None + set_value
@@ -257,8 +257,6 @@ async def test_port_with_units_and_constraints(mocker):
     with pytest.raises(ValidationError) as exc_info:
         await port.set_value(-3.14)
 
-    assert exc_info.value.errors()[0] == validation_error
-
 
 def test_incident__port_validator_check_value():
     # SEE incident https://git.speag.com/oSparc/e2e-testing/-/issues/1)

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

@@ -362,12 +362,28 @@ def test_mode_ports_storage_without_auth(
     [
         (True, _HTTP_URL, _HTTPS_URL),
         (False, _HTTP_URL, _HTTP_URL),
-        (True, TypeAdapter(AnyUrl).validate_python(_HTTP_URL), _HTTPS_URL),
-        (False, TypeAdapter(AnyUrl).validate_python(_HTTP_URL), _HTTP_URL),
+        (
+            True,
+            str(TypeAdapter(AnyUrl).validate_python(_HTTP_URL)).rstrip("/"),
+            _HTTPS_URL,
+        ),
+        (
+            False,
+            str(TypeAdapter(AnyUrl).validate_python(_HTTP_URL)).rstrip("/"),
+            _HTTP_URL,
+        ),
         (True, _HTTPS_URL, _HTTPS_URL),
         (False, _HTTPS_URL, _HTTPS_URL),
-        (True, TypeAdapter(AnyUrl).validate_python(_HTTPS_URL), _HTTPS_URL),
-        (False, TypeAdapter(AnyUrl).validate_python(_HTTPS_URL), _HTTPS_URL),
+        (
+            True,
+            str(TypeAdapter(AnyUrl).validate_python(_HTTPS_URL)).rstrip("/"),
+            _HTTPS_URL,
+        ),
+        (
+            False,
+            str(TypeAdapter(AnyUrl).validate_python(_HTTPS_URL)).rstrip("/"),
+            _HTTPS_URL,
+        ),
         (True, "http://http", "https://http"),
         (True, "https://http", "https://http"),
     ],
@@ -382,4 +398,4 @@ def test__get_secure_link(
     is_storage_secure.cache_clear()
 
     setenvs_from_dict(monkeypatch, {"STORAGE_SECURE": "1" if storage_secure else "0"})
-    assert _get_https_link_if_storage_secure(provided) == expected
+    assert _get_https_link_if_storage_secure(str(provided)) == expected