⬆️♻️ Fix/test models (#6758)

Author: pcrespov

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

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, Extra
+from pydantic import BaseModel, ConfigDict
 
 
 class RequestParameters(BaseModel):
@@ -15,5 +15,4 @@ def as_params(self, **export_options) -> dict[str, str]:
 class StrictRequestParameters(RequestParameters):
     """Use a base class for context, path and query parameters"""
 
-    class Config:
-        extra = Extra.forbid  # strict
+    model_config = ConfigDict(extra="forbid")

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

@@ -72,7 +72,8 @@ class _OrderBy(OrderBy):
                     }
                 ]
             },
-            validate_assignment=True,  # Necessary to run _check_ordering_field_and_map in defaults and assignments
+            # Necessary to run _check_ordering_field_and_map in defaults and assignments
+            validate_assignment=True,
             validate_default=True,
         )
 
@@ -91,9 +92,9 @@ def _check_ordering_field_and_map(cls, v):
 
     assert "json_schema_extra" in _OrderBy.model_config  # nosec
     assert isinstance(_OrderBy.model_config["json_schema_extra"], dict)  # nosec
-    assert isinstance(
+    assert isinstance(  # nosec
         _OrderBy.model_config["json_schema_extra"]["examples"], list
-    )  # nosec
+    )
     order_by_example = _OrderBy.model_config["json_schema_extra"]["examples"][0]
     order_by_example_json = json_dumps(order_by_example)
     assert _OrderBy.model_validate(order_by_example), "Example is invalid"  # nosec

packages/models-library/tests/test_rest_ordering.py

@@ -106,7 +106,7 @@ def test_ordering_query_model_class__fails_with_invalid_direction():
 
     error = err_info.value.errors()[0]
 
-    assert error["type"] == "type_error.enum"
+    assert error["type"] == "enum"
     assert error["loc"] == ("order_by", "direction")
 
 
@@ -137,7 +137,7 @@ def test_ordering_query_model_class__defaults():
 
     error = err_info.value.errors()[0]
     assert error["loc"] == ("order_by", "field")
-    assert error["type"] == "value_error.missing"
+    assert error["type"] == "missing"
 
 
 def test_ordering_query_model_with_map():