run bump-pydantic

Author: giancarloromeo

services/datcore-adapter/src/simcore_service_datcore_adapter/core/settings.py

@@ -1,7 +1,7 @@
 from functools import cached_property
 
 from models_library.basic_types import BootModeEnum, LogLevel
-from pydantic import Field, parse_obj_as, validator
+from pydantic import AliasChoices, Field, TypeAdapter, field_validator
 from pydantic.networks import AnyUrl
 from settings_library.base import BaseCustomSettings
 from settings_library.utils_logging import MixinLoggingSettings
@@ -10,7 +10,9 @@
 class PennsieveSettings(BaseCustomSettings):
     PENNSIEVE_ENABLED: bool = True
 
-    PENNSIEVE_API_URL: AnyUrl = parse_obj_as(AnyUrl, "https://api.pennsieve.io")
+    PENNSIEVE_API_URL: AnyUrl = TypeAdapter(AnyUrl).validate_python(
+        "https://api.pennsieve.io"
+    )
     PENNSIEVE_API_GENERAL_TIMEOUT: float = 20.0
     PENNSIEVE_HEALTCHCHECK_TIMEOUT: float = 1.0
 
@@ -21,22 +23,24 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
 
     LOG_LEVEL: LogLevel = Field(
         LogLevel.INFO.value,
-        env=[
+        validation_alias=AliasChoices(
             "DATCORE_ADAPTER_LOGLEVEL",
             "DATCORE_ADAPTER_LOG_LEVEL",
             "LOG_LEVEL",
             "LOGLEVEL",
-        ],
+        ),
     )
 
-    PENNSIEVE: PennsieveSettings = Field(auto_default_from_env=True)
+    PENNSIEVE: PennsieveSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         False,
-        env=[
+        validation_alias=AliasChoices(
             "DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED",
             "LOG_FORMAT_LOCAL_DEV_ENABLED",
-        ],
+        ),
         description="Enables local development log format. WARNING: make sure it is disabled if you want to have structured logs!",
     )
     DATCORE_ADAPTER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True
@@ -50,7 +54,7 @@ def debug(self) -> bool:
             BootModeEnum.LOCAL,
         ]
 
-    @validator("LOG_LEVEL", pre=True)
+    @field_validator("LOG_LEVEL", mode="before")
     @classmethod
     def _validate_loglevel(cls, value) -> str:
         return cls.validate_log_level(value)