add beforevalidator for timedelta

Author: giancarloromeo

.env-devel

@@ -52,7 +52,7 @@ CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX=""
 CLUSTERS_KEEPER_LOGLEVEL=WARNING
 CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
 CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
-CLUSTERS_KEEPER_TASK_INTERVAL=PT30S
+CLUSTERS_KEEPER_TASK_INTERVAL=30
 CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
 
 DASK_SCHEDULER_HOST=dask-scheduler

services/clusters-keeper/.env-devel

@@ -1,7 +1,7 @@
 CLUSTERS_KEEPER_DEBUG=true
 CLUSTERS_KEEPER_LOGLEVEL=INFO
 CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=60
-CLUSTERS_KEEPER_TASK_INTERVAL=PT30S
+CLUSTERS_KEEPER_TASK_INTERVAL=30
 EC2_CLUSTERS_KEEPER_ACCESS_KEY_ID=XXXXXXXXXX
 PRIMARY_EC2_INSTANCES_ALLOWED_TYPES='{"t2.medium":"ami_id": "XXXXXXXXXX", "custom_boot_scripts": ["whoami"]}}'
 PRIMARY_EC2_INSTANCES_KEY_NAME=XXXXXXXXXX

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 Final, Literal, cast
+from typing import Annotated, Final, Literal, cast
 
 from aws_library.ec2 import EC2InstanceBootSpecific, EC2Tags
 from fastapi import FastAPI
@@ -13,6 +13,7 @@
 from models_library.clusters import InternalClusterAuthentication
 from pydantic import (
     AliasChoices,
+    BeforeValidator,
     Field,
     NonNegativeFloat,
     NonNegativeInt,
@@ -283,7 +284,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         json_schema_extra={"auto_default_from_env": True}
     )
 
-    CLUSTERS_KEEPER_TASK_INTERVAL: datetime.timedelta = Field(
+    CLUSTERS_KEEPER_TASK_INTERVAL: Annotated[datetime.timedelta, BeforeValidator(int)] = Field(
         default=datetime.timedelta(seconds=30),
         description="interval between each clusters clean check "
         "(default to seconds, or see https://pydantic-docs.helpmanual.io/usage/types/#datetime-types for string formating)",

services/clusters-keeper/tests/unit/test_modules_clusters_management_task.py

@@ -13,7 +13,7 @@
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from simcore_service_clusters_keeper.core.settings import ApplicationSettings
 
-_FAST_POLL_INTERVAL = 1 # seconds
+_FAST_POLL_INTERVAL = 1
 
 
 @pytest.fixture
@@ -22,7 +22,7 @@ def app_environment(
     monkeypatch: pytest.MonkeyPatch,
 ) -> EnvVarsDict:
     return app_environment | setenvs_from_dict(
-        monkeypatch, {"CLUSTERS_KEEPER_TASK_INTERVAL": f"PT{_FAST_POLL_INTERVAL}S"}
+        monkeypatch, {"CLUSTERS_KEEPER_TASK_INTERVAL": f"{_FAST_POLL_INTERVAL}"}
     )