added timedelta validator in everywhere it is required

Author: Andrei Neagu

packages/common-library/src/common_library/pydantic_validators.py

@@ -1,20 +1,35 @@
 import datetime
+import warnings
+from datetime import timedelta
 
-from pydantic import field_validator
-
-
-def _try_convert_str_to_float_or_return(
-    v: datetime.timedelta | str | float,
-) -> datetime.timedelta | str | float:
-    if isinstance(v, str):
-        try:
-            return float(v)
-        except ValueError:
-            # returns format like "1:00:00"
-            return v
-    return v
+from pydantic import TypeAdapter, field_validator
 
 
 def timedelta_try_convert_str_to_float(field: str):
     """Transforms a float/int number into a valid datetime as it used to work in the past"""
+
+    def _try_convert_str_to_float_or_return(
+        v: datetime.timedelta | str | float,
+    ) -> datetime.timedelta | str | float:
+        if isinstance(v, str):
+            try:
+                converted_value = float(v)
+
+                iso8601_format = TypeAdapter(timedelta).dump_python(
+                    timedelta(seconds=converted_value), mode="json"
+                )
+                warnings.warn(
+                    f"{field}='{v}' -should be set to-> {field}='{iso8601_format}' (ISO8601 datetime format). "
+                    "Please also convert the value in the >>OPS REPOSITORY<<. "
+                    "For details: https://docs.pydantic.dev/1.10/usage/types/#datetime-types.",
+                    DeprecationWarning,
+                    stacklevel=8,
+                )
+
+                return converted_value
+            except ValueError:
+                # returns format like "1:00:00"
+                return v
+        return v
+
     return field_validator(field, mode="before")(_try_convert_str_to_float_or_return)

services/agent/src/simcore_service_agent/core/settings.py

@@ -1,5 +1,6 @@
 from datetime import timedelta
 
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from models_library.basic_types import BootModeEnum, LogLevel
 from pydantic import AliasChoices, AnyHttpUrl, Field, field_validator
 from settings_library.base import BaseCustomSettings
@@ -51,14 +52,14 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     AGENT_VOLUMES_CLEANUP_INTERVAL: timedelta = Field(
         timedelta(minutes=1), description="interval for running volumes removal"
     )
-    AGENT_VOLUMES_CLENUP_BOOK_KEEPING_INTERVAL: timedelta = Field(
+    AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL: timedelta = Field(
         timedelta(minutes=1),
         description=(
             "interval at which to scan for unsued volumes and keep track since "
             "they were detected as being unused"
         ),
     )
-    AGENT_VOLUMES_CLENUP_REMOVE_VOLUMES_INACTIVE_FOR: timedelta = Field(
+    AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR: timedelta = Field(
         timedelta(minutes=65),
         description=(
             "if a volume is unused for more than this interval it can be removed. "
@@ -75,6 +76,21 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         auto_default_from_env=True, description="settings for service/rabbitmq"
     )
 
+    _try_convert_agent_volumes_cleanup_interval = timedelta_try_convert_str_to_float(
+        "AGENT_VOLUMES_CLEANUP_INTERVAL"
+    )
+
+    _try_convert_agent_volumes_cleanup_book_keeping_interval = (
+        timedelta_try_convert_str_to_float(
+            "AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL"
+        )
+    )
+    _try_convert_agent_volumes_cleanup_remove_volumes_inactive_for = (
+        timedelta_try_convert_str_to_float(
+            "AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR"
+        )
+    )
+
     @field_validator("LOGLEVEL")
     @classmethod
     def valid_log_level(cls, value) -> LogLevel:

services/agent/src/simcore_service_agent/services/volumes_manager.py

@@ -174,9 +174,9 @@ async def _on_startup() -> None:
 
         volumes_manager = VolumesManager(
             app=app,
-            book_keeping_interval=settings.AGENT_VOLUMES_CLENUP_BOOK_KEEPING_INTERVAL,
+            book_keeping_interval=settings.AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL,
             volume_cleanup_interval=settings.AGENT_VOLUMES_CLEANUP_INTERVAL,
-            remove_volumes_inactive_for=settings.AGENT_VOLUMES_CLENUP_REMOVE_VOLUMES_INACTIVE_FOR.total_seconds(),
+            remove_volumes_inactive_for=settings.AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR.total_seconds(),
         )
         volumes_manager.set_to_app_state(app)
         await volumes_manager.setup()

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

@@ -1,6 +1,7 @@
 from datetime import timedelta
 from typing import Final
 
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from models_library.projects_networks import DockerNetworkName
 from pydantic import Field, NonNegativeInt, PositiveFloat
 from settings_library.base import BaseCustomSettings
@@ -166,3 +167,12 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings):
     DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL: timedelta = Field(
         timedelta(0), description="time to sleep before removing a container"
     )
+
+    _try_convert_director_v2_dynamic_scheduler_interval = (
+        timedelta_try_convert_str_to_float("DIRECTOR_V2_DYNAMIC_SCHEDULER_INTERVAL")
+    )
+    _try_convert_director_v2_dynamic_sidecar_sleep_after_container_removal = (
+        timedelta_try_convert_str_to_float(
+            "DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL"
+        )
+    )

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

@@ -5,6 +5,7 @@
 import datetime
 from functools import cached_property
 
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from models_library.basic_types import (
     BootModeEnum,
     BuildTargetEnum,
@@ -234,3 +235,7 @@ class AppSettings(BaseCustomSettings, MixinLoggingSettings):
     def _validate_loglevel(cls, value: str) -> str:
         log_level: str = cls.validate_log_level(value)
         return log_level
+
+    _try_convert_service_tracking_heartbeat = timedelta_try_convert_str_to_float(
+        "SERVICE_TRACKING_HEARTBEAT"
+    )

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py

@@ -1,6 +1,7 @@
 import datetime
 from functools import cached_property
 
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from pydantic import Field, parse_obj_as, validator
 from settings_library.application import BaseApplicationSettings
 from settings_library.basic_types import LogLevel, VersionTag
@@ -53,6 +54,10 @@ def LOG_LEVEL(self):  # noqa: N802
     def valid_log_level(cls, value: str) -> str:
         return cls.validate_log_level(value)
 
+    _try_convert_dynamic_scheduler_stop_service_timeout = (
+        timedelta_try_convert_str_to_float("DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT")
+    )
+
 
 class ApplicationSettings(_BaseApplicationSettings):
     """Web app's environment variables

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

@@ -1,6 +1,7 @@
 import datetime
 from functools import cached_property
 
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from models_library.basic_types import BootModeEnum
 from pydantic import Field, PositiveInt, validator
 from settings_library.base import BaseCustomSettings
@@ -114,3 +115,9 @@ class ApplicationSettings(MinimalApplicationSettings):
     RESOURCE_USAGE_TRACKER_TRACING: TracingSettings | None = Field(
         auto_default_from_env=True, description="settings for opentelemetry tracing"
     )
+
+    _try_convert_resource_usage_tracker_missed_heartbeat_interval_sec = (
+        timedelta_try_convert_str_to_float(
+            "RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC"
+        )
+    )

services/web/server/src/simcore_service_webserver/projects/settings.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 
 from aiohttp import web
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from pydantic import ByteSize, Field, NonNegativeInt, parse_obj_as
 from settings_library.base import BaseCustomSettings
 
@@ -23,6 +24,10 @@ class ProjectsSettings(BaseCustomSettings):
         description="interval after which services need to be idle in order to be considered inactive",
     )
 
+    _try_convert_projects_inactivity_interval = timedelta_try_convert_str_to_float(
+        "PROJECTS_INACTIVITY_INTERVAL"
+    )
+
 
 def get_plugin_settings(app: web.Application) -> ProjectsSettings:
     settings = app[APP_SETTINGS_KEY].WEBSERVER_PROJECTS

services/web/server/src/simcore_service_webserver/studies_dispatcher/settings.py

@@ -2,6 +2,7 @@
 from typing import Any, ClassVar
 
 from aiohttp import web
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from pydantic import ByteSize, HttpUrl, parse_obj_as, validator
 from pydantic.fields import Field
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
@@ -50,6 +51,10 @@ def is_login_required(self):
         """
         return not self.STUDIES_ACCESS_ANONYMOUS_ALLOWED
 
+    _try_convert_studies_guest_account_lifetime = timedelta_try_convert_str_to_float(
+        "STUDIES_GUEST_ACCOUNT_LIFETIME"
+    )
+
     class Config:
         schema_extra: ClassVar[dict[str, Any]] = {
             "example": {