continue fixing

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/application_settings_utils.py

@@ -10,6 +10,7 @@
 from typing import Any
 
 from aiohttp import web
+from common_library.pydantic_fields_extension import get_type, is_nullable
 from pydantic.types import SecretStr
 from servicelib.aiohttp.typing_extension import Handler
 
@@ -200,10 +201,10 @@ def convert_to_environ_vars(  # noqa: C901, PLR0915, PLR0912
     def _set_if_disabled(field_name, section):
         # Assumes that by default is enabled
         enabled = section.get("enabled", True)
-        field = ApplicationSettings.__fields__[field_name]
+        field = ApplicationSettings.model_fields[field_name]
         if not enabled:
-            envs[field_name] = "null" if field.allow_none else "0"
-        elif field.type_ == bool:
+            envs[field_name] = "null" if is_nullable(field) else "0"
+        elif get_type(field) == bool:
             envs[field_name] = "1"
 
     if main := cfg.get("main"):

services/web/server/src/simcore_service_webserver/payments/settings.py

@@ -9,6 +9,7 @@
     PositiveInt,
     SecretStr,
     TypeAdapter,
+    ValidationInfo,
     field_validator,
 )
 from settings_library.base import BaseCustomSettings
@@ -101,8 +102,8 @@ def _payments_cannot_be_faken_in_production(cls, v):
 
     @field_validator("PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT")
     @classmethod
-    def _monthly_limit_greater_than_top_up(cls, v, values):
-        top_up = values["PAYMENTS_AUTORECHARGE_DEFAULT_TOP_UP_AMOUNT"]
+    def _monthly_limit_greater_than_top_up(cls, v, info: ValidationInfo):
+        top_up = info.data["PAYMENTS_AUTORECHARGE_DEFAULT_TOP_UP_AMOUNT"]
         if v < 2 * top_up:
             msg = "PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT (={v}) should be at least twice PAYMENTS_AUTORECHARGE_DEFAULT_TOP_UP_AMOUNT ({top_up})"
             raise ValueError(msg)