continue upgrading

Author: giancarloromeo

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/settings.py

@@ -2,7 +2,7 @@
 from functools import cached_property
 
 from models_library.basic_types import BootModeEnum
-from pydantic import Field, PositiveInt, validator
+from pydantic import AliasChoices, field_validator, Field, PositiveInt
 from settings_library.base import BaseCustomSettings
 from settings_library.basic_types import BuildTargetEnum, LogLevel, VersionTag
 from settings_library.postgres import PostgresSettings
@@ -44,26 +44,32 @@ class _BaseApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     RESOURCE_USAGE_TRACKER_DEBUG: bool = Field(
         default=False,
         description="Debug mode",
-        env=["RESOURCE_USAGE_TRACKER_DEBUG", "DEBUG"],
+        validation_alias=AliasChoices(
+            "RESOURCE_USAGE_TRACKER_DEBUG",
+            "DEBUG",
+        ),
     )
     RESOURCE_USAGE_TRACKER_LOGLEVEL: LogLevel = Field(
         default=LogLevel.INFO,
-        env=["RESOURCE_USAGE_TRACKER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"],
+        validation_alias=AliasChoices(
+            "RESOURCE_USAGE_TRACKER_LOGLEVEL", 
+            "LOG_LEVEL", 
+            "LOGLEVEL"),
     )
     RESOURCE_USAGE_TRACKER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
-        env=[
+        validation_alias=AliasChoices(
             "RESOURCE_USAGE_TRACKER_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!",
     )
 
     @cached_property
     def LOG_LEVEL(self) -> LogLevel:  # noqa: N802
         return self.RESOURCE_USAGE_TRACKER_LOGLEVEL
 
-    @validator("RESOURCE_USAGE_TRACKER_LOGLEVEL")
+    @field_validator("RESOURCE_USAGE_TRACKER_LOGLEVEL")
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)
@@ -77,16 +83,18 @@ class MinimalApplicationSettings(_BaseApplicationSettings):
     """
 
     RESOURCE_USAGE_TRACKER_PROMETHEUS: PrometheusSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env":True}
     )
 
     RESOURCE_USAGE_TRACKER_POSTGRES: PostgresSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env":True},
     )
 
-    RESOURCE_USAGE_TRACKER_REDIS: RedisSettings = Field(auto_default_from_env=True)
+    RESOURCE_USAGE_TRACKER_REDIS: RedisSettings = Field(
+        json_schema_extra={"auto_default_from_env":True},
+    )
     RESOURCE_USAGE_TRACKER_RABBITMQ: RabbitSettings | None = Field(
-        auto_default_from_env=True
+        json_schema_extra={"auto_default_from_env":True},
     )
 
 
@@ -109,4 +117,6 @@ class ApplicationSettings(MinimalApplicationSettings):
         description="Heartbeat couter limit when RUT considers service as unhealthy.",
     )
     RESOURCE_USAGE_TRACKER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True
-    RESOURCE_USAGE_TRACKER_S3: S3Settings | None = Field(auto_default_from_env=True)
+    RESOURCE_USAGE_TRACKER_S3: S3Settings | None = Field(
+        json_schema_extra={"auto_default_from_env":True},
+    )

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_credit_transactions.py

@@ -13,7 +13,7 @@
 )
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import BaseModel
+from pydantic import ConfigDict, BaseModel
 
 
 class CreditTransactionCreate(BaseModel):
@@ -64,6 +64,4 @@ class CreditTransactionDB(BaseModel):
     created: datetime
     last_heartbeat_at: datetime
     modified: datetime
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_pricing_plans.py

@@ -2,7 +2,7 @@
 
 from models_library.resource_tracker import PricingPlanClassification, PricingPlanId
 from models_library.services import ServiceKey, ServiceVersion
-from pydantic import BaseModel
+from pydantic import ConfigDict, BaseModel
 
 ## DB Models
 
@@ -15,23 +15,17 @@ class PricingPlansDB(BaseModel):
     is_active: bool
     created: datetime
     pricing_plan_key: str
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class PricingPlansWithServiceDefaultPlanDB(PricingPlansDB):
     service_default_plan: bool
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class PricingPlanToServiceDB(BaseModel):
     pricing_plan_id: PricingPlanId
     service_key: ServiceKey
     service_version: ServiceVersion
     created: datetime
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_pricing_unit_costs.py

@@ -6,7 +6,7 @@
     PricingUnitCostId,
     PricingUnitId,
 )
-from pydantic import BaseModel
+from pydantic import ConfigDict, BaseModel
 
 
 class PricingUnitCostsDB(BaseModel):
@@ -21,6 +21,4 @@ class PricingUnitCostsDB(BaseModel):
     created: datetime
     comment: str | None
     modified: datetime
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_pricing_units.py

@@ -9,7 +9,7 @@
     PricingUnitId,
     UnitExtraInfo,
 )
-from pydantic import BaseModel, validator
+from pydantic import field_validator, ConfigDict, BaseModel
 
 
 class PricingUnitsDB(BaseModel):
@@ -23,11 +23,9 @@ class PricingUnitsDB(BaseModel):
     modified: datetime
     current_cost_per_unit: Decimal
     current_cost_per_unit_id: PricingUnitCostId
+    model_config = ConfigDict(from_attributes=True)
 
-    class Config:
-        orm_mode = True
-
-    @validator("specific_info", pre=True)
+    @field_validator("specific_info", mode="before")
     @classmethod
     def default_hardware_info_when_empty(cls, v) -> HardwareInfo | Any:
         if not v:

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/resource_tracker_service_runs.py

@@ -16,7 +16,7 @@
 from models_library.services import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from pydantic import BaseModel, NonNegativeInt
+from pydantic import ConfigDict, BaseModel, NonNegativeInt
 
 
 class ServiceRunCreate(BaseModel):
@@ -93,32 +93,24 @@ class ServiceRunDB(BaseModel):
     last_heartbeat_at: datetime
     service_run_status_msg: str | None
     missed_heartbeat_counter: NonNegativeInt
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class ServiceRunWithCreditsDB(ServiceRunDB):
-    osparc_credits: Decimal | None
+    osparc_credits: Decimal | None = None
     transaction_status: CreditTransactionStatus | None
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class OsparcCreditsAggregatedByServiceKeyDB(BaseModel):
     osparc_credits: Decimal
     service_key: ServiceKey
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class ServiceRunForCheckDB(BaseModel):
     service_run_id: ServiceRunId
     last_heartbeat_at: datetime
     missed_heartbeat_counter: NonNegativeInt
     modified: datetime
-
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)