continue fixing

Author: giancarloromeo

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

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, ConfigDict, field_validator
+from pydantic import BaseModel, ConfigDict, ValidationInfo, field_validator
 from typing_extensions import TypedDict
 
 from .basic_types import EnvVarKey
@@ -17,8 +17,8 @@ class BootOption(BaseModel):
 
     @field_validator("items")
     @classmethod
-    def ensure_default_included(cls, v, values):
-        default = values["default"]
+    def ensure_default_included(cls, v, info: ValidationInfo):
+        default = info.data["default"]
         if default not in v:
             msg = f"Expected default={default} to be present a key of items={v}"
             raise ValueError(msg)

packages/models-library/tests/test_services.py

@@ -182,7 +182,7 @@ def _find_pattern_entry(obj: dict[str, Any], key: str) -> Any:
 
 
 def test_boot_option_wrong_default() -> None:
-    for example in [deepcopy(x) for x in BootOption.Config.schema_extra["examples"]]:
+    for example in [deepcopy(x) for x in BootOption.model_config["json_schema_extra"]["examples"]]:
         with pytest.raises(ValueError):
             example["default"] = "__undefined__"
             assert BootOption(**example)
@@ -201,11 +201,12 @@ def test_service_docker_data_labels_convesion():
     # we want labels to look like io.simcore.a_label_property
     convension_breaking_fields: set[tuple[str, str]] = set()
 
-    fiedls_with_aliases: list[tuple[str, str]] = [
-        (x.name, x.alias) for x in ServiceMetaDataPublished.__fields__.values()
+    fields_with_aliases: list[tuple[str, str]] = [
+        (name, info.alias) for name, info in ServiceMetaDataPublished.model_fields.items()
+        if info.alias is not None
     ]
 
-    for name, alias in fiedls_with_aliases:
+    for name, alias in fields_with_aliases:
         if alias in FIELD_NAME_EXCEPTIONS:
             continue
         # check dashes and uppercase