applied model conversion

Author: Andrei Neagu

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/settings.py

@@ -11,7 +11,14 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.services import DynamicServiceKey, RunID, ServiceVersion
 from models_library.users import UserID
-from pydantic import ByteSize, Field, PositiveInt, parse_obj_as, validator
+from pydantic import (
+    AliasChoices,
+    ByteSize,
+    Field,
+    PositiveInt,
+    TypeAdapter,
+    field_validator,
+)
 from settings_library.aws_s3_cli import AwsS3CliSettings
 from settings_library.base import BaseCustomSettings
 from settings_library.docker_registry import RegistrySettings
@@ -61,7 +68,10 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
 
     # LOGGING
     LOG_LEVEL: str = Field(
-        default="WARNING", env=["DYNAMIC_SIDECAR_LOG_LEVEL", "LOG_LEVEL", "LOGLEVEL"]
+        default="WARNING",
+        validation_alias=AliasChoices(
+            "DYNAMIC_SIDECAR_LOG_LEVEL", "LOG_LEVEL", "LOGLEVEL"
+        ),
     )
 
     # SERVICE SERVER (see : https://www.uvicorn.org/settings/)
@@ -100,7 +110,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     )
 
     DYNAMIC_SIDECAR_RESERVED_SPACE_SIZE: ByteSize = Field(
-        parse_obj_as(ByteSize, "10Mib"),
+        TypeAdapter(ByteSize).validate_python("10Mib"),
         description=(
             "Disk space reserve when the dy-sidecar is started. Can be freed at "
             "any time via an API call. Main reason to free this disk space is "
@@ -130,7 +140,10 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     )
     DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
-        env=["DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED", "LOG_FORMAT_LOCAL_DEV_ENABLED"],
+        validation_alias=AliasChoices(
+            "DY_SIDECAR_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!",
     )
     DY_SIDECAR_USER_ID: UserID
@@ -144,28 +157,38 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     DY_SIDECAR_PRODUCT_NAME: ProductName | None = None
 
     NODE_PORTS_STORAGE_AUTH: StorageAuthSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env": True}
+    )
+    DY_SIDECAR_R_CLONE_SETTINGS: RCloneSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
     )
-    DY_SIDECAR_R_CLONE_SETTINGS: RCloneSettings = Field(auto_default_from_env=True)
     DY_SIDECAR_AWS_S3_CLI_SETTINGS: AwsS3CliSettings | None = Field(
         None,
         description="AWS S3 settings are used for the AWS S3 CLI. If these settings are filled, the AWS S3 CLI is used instead of RClone.",
     )
-    POSTGRES_SETTINGS: PostgresSettings = Field(auto_default_from_env=True)
-    RABBIT_SETTINGS: RabbitSettings = Field(auto_default_from_env=True)
+    POSTGRES_SETTINGS: PostgresSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
+    RABBIT_SETTINGS: RabbitSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     DY_DEPLOYMENT_REGISTRY_SETTINGS: RegistrySettings = Field()
     DY_DOCKER_HUB_REGISTRY_SETTINGS: RegistrySettings | None = Field()
 
-    RESOURCE_TRACKING: ResourceTrackingSettings = Field(auto_default_from_env=True)
+    RESOURCE_TRACKING: ResourceTrackingSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
-    SYSTEM_MONITOR_SETTINGS: SystemMonitorSettings = Field(auto_default_from_env=True)
+    SYSTEM_MONITOR_SETTINGS: SystemMonitorSettings = Field(
+        json_schema_extra={"auto_default_from_env": True}
+    )
 
     @property
     def are_prometheus_metrics_enabled(self) -> bool:
         return self.DY_SIDECAR_CALLBACKS_MAPPING.metrics is not None
 
-    @validator("LOG_LEVEL")
+    @field_validator("LOG_LEVEL")
     @classmethod
     def _check_log_level(cls, value):
         return cls.validate_log_level(value)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/resource_tracking/_models.py

@@ -1,10 +1,8 @@
 from asyncio import Task
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class ResourceTrackingState(BaseModel):
     heart_beat_task: Task | None = None
-
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)