run bump-pydantic

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/sidecar.py

@@ -9,7 +9,7 @@
     ensure_unique_dict_values_validator,
     ensure_unique_list_values_validator,
 )
-from pydantic import Field, PositiveInt, validator
+from pydantic import AliasChoices, field_validator, Field, PositiveInt
 from settings_library.aws_s3_cli import AwsS3CliSettings
 from settings_library.base import BaseCustomSettings
 from settings_library.efs import AwsEfsSettings
@@ -45,7 +45,7 @@ class RCloneSettings(SettingsLibraryRCloneSettings):
         description="VFS operation mode, defines how and when the disk cache is synced",
     )
 
-    @validator("R_CLONE_POLL_INTERVAL_SECONDS")
+    @field_validator("R_CLONE_POLL_INTERVAL_SECONDS")
     @classmethod
     def enforce_r_clone_requirement(cls, v: int, values) -> PositiveInt:
         dir_cache_time = values["R_CLONE_DIR_CACHE_TIME_SECONDS"]
@@ -60,7 +60,7 @@ class PlacementSettings(BaseCustomSettings):
     # https://docs.docker.com/engine/swarm/services/#control-service-placement.
     DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS: list[DockerPlacementConstraint] = Field(
         default_factory=list,
-        example='["node.labels.region==east", "one!=yes"]',
+        examples=['["node.labels.region==east", "one!=yes"]'],
     )
 
     DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS: dict[
@@ -72,20 +72,18 @@ class PlacementSettings(BaseCustomSettings):
             "see https://github.com/ITISFoundation/osparc-simcore/issues/5250 "
             "When `None` (default), uses generic resources"
         ),
-        example='{"AIRAM": "node.labels.custom==true"}',
+        examples=['{"AIRAM": "node.labels.custom==true"}'],
     )
 
-    _unique_custom_constraints = validator(
+    _unique_custom_constraints = field_validator(
         "DIRECTOR_V2_SERVICES_CUSTOM_CONSTRAINTS",
-        allow_reuse=True,
     )(ensure_unique_list_values_validator)
 
-    _unique_resource_placement_constraints_substitutions = validator(
+    _unique_resource_placement_constraints_substitutions = field_validator(
         "DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS",
-        allow_reuse=True,
     )(ensure_unique_dict_values_validator)
 
-    @validator("DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS")
+    @field_validator("DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS")
     @classmethod
     def warn_if_any_values_provided(cls, value: dict) -> dict:
         if len(value) > 0:
@@ -101,40 +99,40 @@ def warn_if_any_values_provided(cls, value: dict) -> dict:
 class DynamicSidecarSettings(BaseCustomSettings, MixinLoggingSettings):
     DYNAMIC_SIDECAR_ENDPOINT_SPECS_MODE_DNSRR_ENABLED: bool = Field(  # doc: https://docs.docker.com/engine/swarm/networking/#configure-service-discovery
         default=False,
-        env=["DYNAMIC_SIDECAR_ENDPOINT_SPECS_MODE_DNSRR_ENABLED"],
+        validation_alias=AliasChoices("DYNAMIC_SIDECAR_ENDPOINT_SPECS_MODE_DNSRR_ENABLED"),
         description="dynamic-sidecar's service 'endpoint_spec' with {'Mode': 'dnsrr'}",
     )
     DYNAMIC_SIDECAR_SC_BOOT_MODE: BootModeEnum = Field(
         ...,
         description="Boot mode used for the dynamic-sidecar services"
         "By defaults, it uses the same boot mode set for the director-v2",
-        env=["DYNAMIC_SIDECAR_SC_BOOT_MODE", "SC_BOOT_MODE"],
+        validation_alias=AliasChoices("DYNAMIC_SIDECAR_SC_BOOT_MODE", "SC_BOOT_MODE"),
     )
 
     DYNAMIC_SIDECAR_LOG_LEVEL: str = Field(
         "WARNING",
         description="log level of the dynamic sidecar"
         "If defined, it captures global env vars LOG_LEVEL and LOGLEVEL from the director-v2 service",
-        env=["DYNAMIC_SIDECAR_LOG_LEVEL", "LOG_LEVEL", "LOGLEVEL"],
+        validation_alias=AliasChoices("DYNAMIC_SIDECAR_LOG_LEVEL", "LOG_LEVEL", "LOGLEVEL"),
     )
 
     DYNAMIC_SIDECAR_IMAGE: str = Field(
         ...,
-        regex=DYNAMIC_SIDECAR_DOCKER_IMAGE_RE,
+        pattern=DYNAMIC_SIDECAR_DOCKER_IMAGE_RE,
         description="used by the director to start a specific version of the dynamic-sidecar",
     )
 
-    DYNAMIC_SIDECAR_R_CLONE_SETTINGS: RCloneSettings = Field(auto_default_from_env=True)
+    DYNAMIC_SIDECAR_R_CLONE_SETTINGS: RCloneSettings = Field(json_schema_extra={"auto_default_from_env": True})
 
     DYNAMIC_SIDECAR_AWS_S3_CLI_SETTINGS: AwsS3CliSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
     DYNAMIC_SIDECAR_EFS_SETTINGS: AwsEfsSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     DYNAMIC_SIDECAR_PLACEMENT_SETTINGS: PlacementSettings = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
     )
 
     #
@@ -144,7 +142,7 @@ class DynamicSidecarSettings(BaseCustomSettings, MixinLoggingSettings):
     DYNAMIC_SIDECAR_MOUNT_PATH_DEV: Path | None = Field(
         None,
         description="Host path to the dynamic-sidecar project. Used as source path to mount to the dynamic-sidecar [DEVELOPMENT ONLY]",
-        example="osparc-simcore/services/dynamic-sidecar",
+        examples=["osparc-simcore/services/dynamic-sidecar"],
     )
 
     DYNAMIC_SIDECAR_PORT: PortInt = Field(
@@ -157,9 +155,10 @@ class DynamicSidecarSettings(BaseCustomSettings, MixinLoggingSettings):
         description="Publishes the service on localhost for debuging and testing [DEVELOPMENT ONLY]"
         "Can be used to access swagger doc from the host as http://127.0.0.1:30023/dev/doc "
         "where 30023 is the host published port",
+        validate_default=True
     )
 
-    @validator("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", pre=True)
+    @field_validator("DYNAMIC_SIDECAR_MOUNT_PATH_DEV", mode="before")
     @classmethod
     def auto_disable_if_production(cls, v, values):
         if v and values.get("DYNAMIC_SIDECAR_SC_BOOT_MODE") == BootModeEnum.PRODUCTION:
@@ -170,7 +169,7 @@ def auto_disable_if_production(cls, v, values):
             return None
         return v
 
-    @validator("DYNAMIC_SIDECAR_EXPOSE_PORT", pre=True, always=True)
+    @field_validator("DYNAMIC_SIDECAR_EXPOSE_PORT", mode="before")
     @classmethod
     def auto_enable_if_development(cls, v, values):
         if (
@@ -180,12 +179,12 @@ def auto_enable_if_development(cls, v, values):
             return True
         return v
 
-    @validator("DYNAMIC_SIDECAR_IMAGE", pre=True)
+    @field_validator("DYNAMIC_SIDECAR_IMAGE", mode="before")
     @classmethod
     def strip_leading_slashes(cls, v: str) -> str:
         return v.lstrip("/")
 
-    @validator("DYNAMIC_SIDECAR_LOG_LEVEL")
+    @field_validator("DYNAMIC_SIDECAR_LOG_LEVEL")
     @classmethod
     def _validate_log_level(cls, value) -> str:
         log_level: str = cls.validate_log_level(value)

services/director-v2/src/simcore_service_director_v2/core/settings.py

@@ -20,7 +20,7 @@
     ClusterTypeInModel,
     NoAuthentication,
 )
-from pydantic import AnyHttpUrl, AnyUrl, Field, NonNegativeInt, validator
+from pydantic import AliasChoices, field_validator, AnyHttpUrl, AnyUrl, Field, NonNegativeInt
 from settings_library.base import BaseCustomSettings
 from settings_library.catalog import CatalogSettings
 from settings_library.docker_registry import RegistrySettings
@@ -107,7 +107,7 @@ def default_cluster(self) -> Cluster:
             type=ClusterTypeInModel.ON_PREMISE,
         )
 
-    @validator("COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH", pre=True)
+    @field_validator("COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH", mode="before")
     @classmethod
     def _empty_auth_is_none(cls, v):
         if not v:
@@ -122,14 +122,14 @@ class AppSettings(BaseCustomSettings, MixinLoggingSettings):
 
     LOG_LEVEL: LogLevel = Field(
         LogLevel.INFO.value,
-        env=["DIRECTOR_V2_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"],
+        validation_alias=AliasChoices("DIRECTOR_V2_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"),
     )
     DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
-        env=[
+        validation_alias=AliasChoices(
             "DIRECTOR_V2_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!",
     )
     DIRECTOR_V2_DEV_FEATURES_ENABLED: bool = False
@@ -161,7 +161,7 @@ class AppSettings(BaseCustomSettings, MixinLoggingSettings):
     DIRECTOR_V2_REMOTE_DEBUGGING_PORT: PortInt | None
 
     # extras
-    SWARM_STACK_NAME: str = Field("undefined-please-check", env="SWARM_STACK_NAME")
+    SWARM_STACK_NAME: str = Field("undefined-please-check", validation_alias="SWARM_STACK_NAME")
     SERVICE_TRACKING_HEARTBEAT: datetime.timedelta = Field(
         default=DEFAULT_RESOURCE_USAGE_HEARTBEAT_INTERVAL,
         description="Service scheduler heartbeat (everytime a heartbeat is sent into RabbitMQ)"
@@ -227,10 +227,10 @@ class AppSettings(BaseCustomSettings, MixinLoggingSettings):
         description="Base URL used to access the public api e.g. http://127.0.0.1:6000 for development or https://api.osparc.io",
     )
     DIRECTOR_V2_TRACING: TracingSettings | None = Field(
-        auto_default_from_env=True, description="settings for opentelemetry tracing"
+        json_schema_extra={"auto_default_from_env": True}, description="settings for opentelemetry tracing"
     )
 
-    @validator("LOG_LEVEL", pre=True)
+    @field_validator("LOG_LEVEL", mode="before")
     @classmethod
     def _validate_loglevel(cls, value: str) -> str:
         log_level: str = cls.validate_log_level(value)

services/director-v2/src/simcore_service_director_v2/models/comp_pipelines.py

@@ -4,7 +4,7 @@
 import networkx as nx
 from models_library.projects import ProjectID
 from models_library.projects_state import RunningState
-from pydantic import BaseModel, validator
+from pydantic import field_validator, ConfigDict, BaseModel
 from simcore_postgres_database.models.comp_pipeline import StateType
 
 from ..utils.db import DB_TO_RUNNING_STATE
@@ -15,7 +15,7 @@ class CompPipelineAtDB(BaseModel):
     dag_adjacency_list: dict[str, list[str]]  # json serialization issue if using NodeID
     state: RunningState
 
-    @validator("state", pre=True)
+    @field_validator("state", mode="before")
     @classmethod
     def convert_state_from_state_type_enum_if_needed(cls, v):
         if isinstance(v, str):
@@ -27,7 +27,7 @@ def convert_state_from_state_type_enum_if_needed(cls, v):
             return RunningState(DB_TO_RUNNING_STATE[StateType(v)])
         return v
 
-    @validator("dag_adjacency_list", pre=True)
+    @field_validator("dag_adjacency_list", mode="before")
     @classmethod
     def auto_convert_dag(cls, v):
         # this enforcement is here because the serialization using json is not happy with non str Dict keys, also comparison gets funny if the lists are having sometimes UUIDs or str.
@@ -41,11 +41,9 @@ def get_graph(self) -> nx.DiGraph:
                 self.dag_adjacency_list, create_using=nx.DiGraph  # type: ignore[arg-type] # list is an Iterable but dict is Invariant
             ),
         )
-
-    class Config:
-        orm_mode = True
-
-        schema_extra: ClassVar[dict[str, Any]] = {
+    model_config = ConfigDict(
+        from_attributes=True,
+        json_schema_extra={
             "examples": [
                 # DB model
                 {
@@ -61,3 +59,4 @@ class Config:
                 }
             ]
         }
+    )

services/director-v2/src/simcore_service_director_v2/models/comp_runs.py

@@ -7,7 +7,7 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import RunningState
 from models_library.users import UserID
-from pydantic import BaseModel, PositiveInt, validator
+from pydantic import field_validator, ConfigDict, BaseModel, PositiveInt
 from simcore_postgres_database.models.comp_pipeline import StateType
 
 from ..utils.db import DB_TO_RUNNING_STATE
@@ -49,7 +49,7 @@ class CompRunsAtDB(BaseModel):
     metadata: RunMetadataDict = RunMetadataDict()
     use_on_demand_clusters: bool
 
-    @validator("result", pre=True)
+    @field_validator("result", mode="before")
     @classmethod
     def convert_result_from_state_type_enum_if_needed(cls, v):
         if isinstance(v, str):
@@ -61,30 +61,29 @@ def convert_result_from_state_type_enum_if_needed(cls, v):
             return RunningState(DB_TO_RUNNING_STATE[StateType(v)])
         return v
 
-    @validator("cluster_id", pre=True)
+    @field_validator("cluster_id", mode="before")
     @classmethod
     def convert_null_to_default_cluster_id(cls, v):
         if v is None:
             v = DEFAULT_CLUSTER_ID
         return v
 
-    @validator("created", "modified", "started", "ended")
+    @field_validator("created", "modified", "started", "ended")
     @classmethod
     def ensure_utc(cls, v: datetime.datetime | None) -> datetime.datetime | None:
         if v is not None and v.tzinfo is None:
             v = v.replace(tzinfo=datetime.timezone.utc)
         return v
 
-    @validator("metadata", pre=True)
+    @field_validator("metadata", mode="before")
     @classmethod
     def convert_null_to_empty_metadata(cls, v):
         if v is None:
             v = RunMetadataDict()
         return v
-
-    class Config:
-        orm_mode = True
-        schema_extra: ClassVar[dict[str, Any]] = {
+    model_config = ConfigDict(
+        from_attributes=True,
+        json_schema_extra={
             "examples": [
                 # DB model
                 {
@@ -120,3 +119,4 @@ class Config:
                 },
             ]
         }
+    )