multifix

Author: sanderegg

packages/settings-library/tests/test_utils_logging.py

@@ -25,11 +25,13 @@ class Settings(BaseCustomSettings, MixinLoggingSettings):
             ],
         )
 
-        APPNAME_DEBUG: bool = Field(False, description="Starts app in debug mode")
+        APPNAME_DEBUG: bool = Field(
+            default=False, description="Starts app in debug mode"
+        )
 
-        @validator("LOG_LEVEL")
+        @validator("LOG_LEVEL", pre=True)
         @classmethod
-        def _v(cls, value) -> str:
+        def _v(cls, value: str) -> str:
             return cls.validate_log_level(value)
 
     # -----------------------------------------------------------

services/autoscaling/src/simcore_service_autoscaling/core/settings.py

@@ -298,7 +298,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def LOG_LEVEL(self):  # noqa: N802
         return self.AUTOSCALING_LOGLEVEL
 
-    @validator("AUTOSCALING_LOGLEVEL")
+    @validator("AUTOSCALING_LOGLEVEL", pre=True)
     @classmethod
     def _valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)

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

@@ -311,11 +311,9 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         "(default to seconds, or see https://pydantic-docs.helpmanual.io/usage/types/#datetime-types for string formating)",
     )
 
-    CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION: NonNegativeInt = (
-        Field(
-            default=5,
-            description="Max number of missed heartbeats before a cluster is terminated",
-        )
+    CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION: NonNegativeInt = Field(
+        default=5,
+        description="Max number of missed heartbeats before a cluster is terminated",
     )
 
     CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG: str = Field(
@@ -352,7 +350,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def LOG_LEVEL(self) -> LogLevel:  # noqa: N802
         return self.CLUSTERS_KEEPER_LOGLEVEL
 
-    @validator("CLUSTERS_KEEPER_LOGLEVEL")
+    @validator("CLUSTERS_KEEPER_LOGLEVEL", pre=True)
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)

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

@@ -165,9 +165,9 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def are_prometheus_metrics_enabled(self) -> bool:
         return self.DY_SIDECAR_CALLBACKS_MAPPING.metrics is not None
 
-    @validator("LOG_LEVEL")
+    @validator("LOG_LEVEL", pre=True)
     @classmethod
-    def _check_log_level(cls, value):
+    def _check_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)
 
 

services/efs-guardian/src/simcore_service_efs_guardian/core/settings.py

@@ -96,7 +96,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def LOG_LEVEL(self) -> LogLevel:  # noqa: N802
         return self.EFS_GUARDIAN_LOGLEVEL
 
-    @validator("EFS_GUARDIAN_LOGLEVEL")
+    @validator("EFS_GUARDIAN_LOGLEVEL", pre=True)
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)

services/invitations/src/simcore_service_invitations/core/settings.py

@@ -54,7 +54,7 @@ class _BaseApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def LOG_LEVEL(self):
         return self.INVITATIONS_LOGLEVEL
 
-    @validator("INVITATIONS_LOGLEVEL")
+    @validator("INVITATIONS_LOGLEVEL", pre=True)
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)

services/payments/src/simcore_service_payments/core/settings.py

@@ -48,7 +48,7 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     def LOG_LEVEL(self):  # noqa: N802
         return self.PAYMENTS_LOGLEVEL
 
-    @validator("PAYMENTS_LOGLEVEL")
+    @validator("PAYMENTS_LOGLEVEL", pre=True)
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)

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

@@ -64,7 +64,7 @@ class _BaseApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     def LOG_LEVEL(self) -> LogLevel:  # noqa: N802
         return self.RESOURCE_USAGE_TRACKER_LOGLEVEL
 
-    @validator("RESOURCE_USAGE_TRACKER_LOGLEVEL")
+    @validator("RESOURCE_USAGE_TRACKER_LOGLEVEL", pre=True)
     @classmethod
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -287,9 +287,9 @@ def log_level(self) -> int:
         level: int = getattr(logging, self.WEBSERVER_LOGLEVEL.upper())
         return level
 
-    @validator("WEBSERVER_LOGLEVEL")
+    @validator("WEBSERVER_LOGLEVEL", pre=True)
     @classmethod
-    def valid_log_level(cls, value):
+    def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)
 
     @validator("SC_HEALTHCHECK_TIMEOUT", pre=True)