run bump-pydantic

Author: giancarloromeo

services/clusters-keeper/src/simcore_service_clusters_keeper/core/settings.py

@@ -1,6 +1,6 @@
 import datetime
 from functools import cached_property
-from typing import Any, ClassVar, Final, Literal, cast
+from typing import Final, Literal, cast
 
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2Tags
 from fastapi import FastAPI
@@ -12,14 +12,16 @@
 )
 from models_library.clusters import InternalClusterAuthentication
 from pydantic import (
+    AliasChoices,
     Field,
     NonNegativeFloat,
     NonNegativeInt,
     PositiveInt,
     SecretStr,
-    parse_obj_as,
-    validator,
+    TypeAdapter,
+    field_validator,
 )
+from pytest_simcore.helpers.dict_tools import ConfigDict
 from settings_library.base import BaseCustomSettings
 from settings_library.docker_registry import RegistrySettings
 from settings_library.ec2 import EC2Settings
@@ -34,10 +36,9 @@
 
 
 class ClustersKeeperEC2Settings(EC2Settings):
-    class Config(EC2Settings.Config):
-        env_prefix = CLUSTERS_KEEPER_ENV_PREFIX
-
-        schema_extra: ClassVar[dict[str, Any]] = {  # type: ignore[misc]
+    model_config = ConfigDict(
+        env_prefix=CLUSTERS_KEEPER_ENV_PREFIX,
+        json_schema_extra={
             "examples": [
                 {
                     f"{CLUSTERS_KEEPER_ENV_PREFIX}EC2_ACCESS_KEY_ID": "my_access_key_id",
@@ -46,7 +47,8 @@ class Config(EC2Settings.Config):
                     f"{CLUSTERS_KEEPER_ENV_PREFIX}EC2_SECRET_ACCESS_KEY": "my_secret_access_key",
                 }
             ],
-        }
+        },
+    )
 
 
 class WorkersEC2InstancesSettings(BaseCustomSettings):
@@ -77,7 +79,7 @@ class WorkersEC2InstancesSettings(BaseCustomSettings):
     # NAME PREFIX is not exposed since we override it anyway
     WORKERS_EC2_INSTANCES_SECURITY_GROUP_IDS: list[str] = Field(
         ...,
-        min_items=1,
+        min_length=1,
         description="A security group acts as a virtual firewall for your EC2 instances to control incoming and outgoing traffic"
         " (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-security-groups.html), "
         " this is required to start a new EC2 instance",
@@ -108,14 +110,14 @@ class WorkersEC2InstancesSettings(BaseCustomSettings):
         "a tag must have a key and an optional value. see [https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html]",
     )
 
-    @validator("WORKERS_EC2_INSTANCES_ALLOWED_TYPES")
+    @field_validator("WORKERS_EC2_INSTANCES_ALLOWED_TYPES")
     @classmethod
     def check_valid_instance_names(
         cls, value: dict[str, EC2InstanceBootSpecific]
     ) -> dict[str, EC2InstanceBootSpecific]:
         # NOTE: needed because of a flaw in BaseCustomSettings
         # issubclass raises TypeError if used on Aliases
-        parse_obj_as(list[InstanceTypeType], list(value))
+        TypeAdapter(list[InstanceTypeType]).validate_python(list(value))
         return value
 
 
@@ -130,7 +132,7 @@ class PrimaryEC2InstancesSettings(BaseCustomSettings):
     )
     PRIMARY_EC2_INSTANCES_SECURITY_GROUP_IDS: list[str] = Field(
         ...,
-        min_items=1,
+        min_length=1,
         description="A security group acts as a virtual firewall for your EC2 instances to control incoming and outgoing traffic"
         " (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-security-groups.html), "
         " this is required to start a new EC2 instance",
@@ -182,17 +184,17 @@ class PrimaryEC2InstancesSettings(BaseCustomSettings):
         "that take longer than this time will be terminated as sometimes it happens that EC2 machine fail on start.",
     )
 
-    @validator("PRIMARY_EC2_INSTANCES_ALLOWED_TYPES")
+    @field_validator("PRIMARY_EC2_INSTANCES_ALLOWED_TYPES")
     @classmethod
     def check_valid_instance_names(
         cls, value: dict[str, EC2InstanceBootSpecific]
     ) -> dict[str, EC2InstanceBootSpecific]:
         # NOTE: needed because of a flaw in BaseCustomSettings
         # issubclass raises TypeError if used on Aliases
-        parse_obj_as(list[InstanceTypeType], list(value))
+        TypeAdapter(list[InstanceTypeType]).validate_python(list(value))
         return value
 
-    @validator("PRIMARY_EC2_INSTANCES_ALLOWED_TYPES")
+    @field_validator("PRIMARY_EC2_INSTANCES_ALLOWED_TYPES")
     @classmethod
     def check_only_one_value(
         cls, value: dict[str, EC2InstanceBootSpecific]
@@ -231,45 +233,54 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
 
     # RUNTIME  -----------------------------------------------------------
     CLUSTERS_KEEPER_DEBUG: bool = Field(
-        default=False, description="Debug mode", env=["CLUSTERS_KEEPER_DEBUG", "DEBUG"]
+        default=False,
+        description="Debug mode",
+        validation_alias=AliasChoices("CLUSTERS_KEEPER_DEBUG", "DEBUG"),
     )
     CLUSTERS_KEEPER_LOGLEVEL: LogLevel = Field(
-        LogLevel.INFO, env=["CLUSTERS_KEEPER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"]
+        LogLevel.INFO,
+        validation_alias=AliasChoices(
+            "CLUSTERS_KEEPER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"
+        ),
     )
     CLUSTERS_KEEPER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
-        env=[
+        validation_alias=AliasChoices(
             "CLUSTERS_KEEPER_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!",
     )
 
     CLUSTERS_KEEPER_EC2_ACCESS: ClustersKeeperEC2Settings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES: PrimaryEC2InstancesSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES: WorkersEC2InstancesSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX: str = Field(
         ...,
         description="set a prefix to all machines created (useful for testing)",
     )
 
-    CLUSTERS_KEEPER_RABBITMQ: RabbitSettings | None = Field(auto_default_from_env=True)
+    CLUSTERS_KEEPER_RABBITMQ: RabbitSettings | None = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     CLUSTERS_KEEPER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True
 
-    CLUSTERS_KEEPER_REDIS: RedisSettings = Field(auto_default_from_env=True)
+    CLUSTERS_KEEPER_REDIS: RedisSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     CLUSTERS_KEEPER_REGISTRY: RegistrySettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     CLUSTERS_KEEPER_TASK_INTERVAL: datetime.timedelta = Field(
@@ -320,7 +331,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def LOG_LEVEL(self) -> LogLevel:  # noqa: N802
         return self.CLUSTERS_KEEPER_LOGLEVEL
 
-    @validator("CLUSTERS_KEEPER_LOGLEVEL")
+    @field_validator("CLUSTERS_KEEPER_LOGLEVEL")
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)