fix tests

Author: giancarloromeo

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

@@ -130,6 +130,7 @@ class LongTruncatedStr(ConstrainedStr):
 IdInt: TypeAlias = PositiveInt
 PrimaryKeyInt: TypeAlias = PositiveInt
 
+AnyUrl = Annotated[str, pydantic.AnyUrl]
 
 AnyHttpUrl = Annotated[str, pydantic.AnyHttpUrl]
 

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

@@ -11,9 +11,8 @@
 from typing import Annotated, TypeAlias
 from uuid import UUID
 
-from models_library.basic_types import ConstrainedStr, KeyIDStr
+from models_library.basic_types import AnyUrl, ConstrainedStr, KeyIDStr
 from pydantic import (
-    AnyUrl,
     BaseModel,
     ConfigDict,
     Field,

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

@@ -1,7 +1,7 @@
 from typing import Any, NamedTuple, TypeAlias, cast
 
+from models_library.errors_classes import OsparcErrorMixin
 from pydantic import StrictBool, StrictFloat, StrictInt
-from pydantic.errors import PydanticErrorMixin
 
 from .json_serialization import json_dumps, json_loads
 from .string_substitution import (
@@ -15,7 +15,7 @@
 SubstitutionValue: TypeAlias = StrictBool | StrictInt | StrictFloat | str
 
 
-class IdentifierSubstitutionError(PydanticErrorMixin, KeyError):
+class IdentifierSubstitutionError(OsparcErrorMixin, KeyError):
     msg_template: str = (
         "Was not able to substitute identifier "
         "'{name}'. It was not found in: {substitutions}"

packages/models-library/tests/test_utils_nodes.py

@@ -14,7 +14,6 @@
     SimcoreS3FileID,
 )
 from models_library.utils.nodes import compute_node_hash
-from pydantic import AnyUrl, parse_obj_as
 
 
 @pytest.fixture()
@@ -45,9 +44,7 @@ def node_id() -> NodeID:
                     "input_bool": True,
                     "input_string": "string",
                     "input_downloadlink": DownloadLink(
-                        downloadLink=parse_obj_as(
-                            AnyUrl, "http://httpbin.org/image/jpeg"
-                        )
+                        downloadLink="http://httpbin.org/image/jpeg"
                     ),
                     "input_simcorelink": SimCoreFileLink(
                         store=0,

packages/models-library/tests/test_utils_pydantic_tools_extension.py

@@ -14,15 +14,20 @@ class MyModel(BaseModel):
 
 
 def test_schema():
-    assert MyModel.schema() == {
+    assert MyModel.model_json_schema() == {
         "title": "MyModel",
         "type": "object",
         "properties": {
             "a": {"title": "A", "type": "integer"},
-            "b": {"title": "B", "type": "integer"},
+            "b": {"anyOf": [{"type": "integer"}, {"type": "null"}], "title": "B"},
             "c": {"title": "C", "default": 42, "type": "integer"},
-            "d": {"title": "D", "type": "integer"},
+            "d": {
+                "anyOf": [{"type": "integer"}, {"type": "null"}],
+                "default": None,
+                "title": "D",
+            },
             "e": {
+                "default": None,
                 "title": "E",
                 "type": "integer",
                 "description": "optional non-nullable",

packages/models-library/tests/test_utils_service_io.py

@@ -40,7 +40,7 @@ def service_port(request: pytest.FixtureRequest) -> ServiceInput | ServiceOutput
 
 
 def test_get_schema_from_port(service_port: ServiceInput | ServiceOutput):
-    print(service_port.json(indent=2))
+    print(service_port.model_dump_json(indent=2))
 
     # get
     schema = get_service_io_json_schema(service_port)