rename

Andrei Neagu · Andrei Neagu · commit d5fcc1c0b651 · 2024-10-18T09:12:54.000+02:00
diff --git a/packages/common-library/src/common_library/pydantic_validators.py b/packages/common-library/src/common_library/pydantic_validators.py
@@ -5,10 +5,10 @@
 from pydantic import TypeAdapter, field_validator
 
 
-def timedelta_try_convert_str_to_float(field: str):
+def validate_numeric_string_as_timedelta(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(
+    def _numeric_string_as_timedelta(
         v: datetime.timedelta | str | float,
     ) -> datetime.timedelta | str | float:
         if isinstance(v, str):
@@ -32,4 +32,4 @@ def _try_convert_str_to_float_or_return(
                 return v
         return v
 
-    return field_validator(field, mode="before")(_try_convert_str_to_float_or_return)
+    return field_validator(field, mode="before")(_numeric_string_as_timedelta)
diff --git a/packages/common-library/tests/test_pydantic_validators.py b/packages/common-library/tests/test_pydantic_validators.py
@@ -1,7 +1,7 @@
 from datetime import timedelta
 
 import pytest
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from faker import Faker
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -15,7 +15,7 @@ class Settings(BaseSettings):
         APP_NAME: str
         REQUEST_TIMEOUT: timedelta = Field(default=timedelta(seconds=40))
 
-        _try_convert_request_timeout = timedelta_try_convert_str_to_float(
+        _validate_request_timeout = validate_numeric_string_as_timedelta(
             "REQUEST_TIMEOUT"
         )
 
diff --git a/services/agent/src/simcore_service_agent/core/settings.py b/services/agent/src/simcore_service_agent/core/settings.py
@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from models_library.basic_types import BootModeEnum, LogLevel
 from pydantic import AliasChoices, AnyHttpUrl, Field, field_validator
 from settings_library.base import BaseCustomSettings
@@ -76,17 +76,17 @@ 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(
+    _validate_agent_volumes_cleanup_interval = validate_numeric_string_as_timedelta(
         "AGENT_VOLUMES_CLEANUP_INTERVAL"
     )
 
-    _try_convert_agent_volumes_cleanup_book_keeping_interval = (
-        timedelta_try_convert_str_to_float(
+    _validate_agent_volumes_cleanup_book_keeping_interval = (
+        validate_numeric_string_as_timedelta(
             "AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL"
         )
     )
-    _try_convert_agent_volumes_cleanup_remove_volumes_inactive_for = (
-        timedelta_try_convert_str_to_float(
+    _validate_agent_volumes_cleanup_remove_volumes_inactive_for = (
+        validate_numeric_string_as_timedelta(
             "AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR"
         )
     )
diff --git a/services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py b/services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py
@@ -1,7 +1,7 @@
 from datetime import timedelta
 from typing import Final
 
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from models_library.projects_networks import DockerNetworkName
 from pydantic import Field, NonNegativeInt, PositiveFloat
 from settings_library.base import BaseCustomSettings
@@ -168,11 +168,11 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings):
         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")
+    _validate_director_v2_dynamic_scheduler_interval = (
+        validate_numeric_string_as_timedelta("DIRECTOR_V2_DYNAMIC_SCHEDULER_INTERVAL")
     )
-    _try_convert_director_v2_dynamic_sidecar_sleep_after_container_removal = (
-        timedelta_try_convert_str_to_float(
+    _validate_director_v2_dynamic_sidecar_sleep_after_container_removal = (
+        validate_numeric_string_as_timedelta(
             "DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL"
         )
     )
diff --git a/services/director-v2/src/simcore_service_director_v2/core/settings.py b/services/director-v2/src/simcore_service_director_v2/core/settings.py
@@ -5,7 +5,7 @@
 import datetime
 from functools import cached_property
 
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from models_library.basic_types import (
     BootModeEnum,
     BuildTargetEnum,
@@ -236,6 +236,6 @@ 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(
+    _validate_service_tracking_heartbeat = validate_numeric_string_as_timedelta(
         "SERVICE_TRACKING_HEARTBEAT"
     )
diff --git a/services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py b/services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py
@@ -1,7 +1,7 @@
 import datetime
 from functools import cached_property
 
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from pydantic import AliasChoices, Field, TypeAdapter, field_validator
 from pydantic_settings import SettingsConfigDict
 from settings_library.application import BaseApplicationSettings
@@ -52,8 +52,8 @@ class _BaseApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     def LOG_LEVEL(self):  # noqa: N802
         return self.DYNAMIC_SCHEDULER__LOGLEVEL
 
-    _try_convert_dynamic_scheduler_stop_service_timeout = (
-        timedelta_try_convert_str_to_float("DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT")
+    _validate_dynamic_scheduler_stop_service_timeout = (
+        validate_numeric_string_as_timedelta("DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT")
     )
 
     @field_validator("DYNAMIC_SCHEDULER__LOGLEVEL")
diff --git a/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/settings.py b/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/settings.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import cast
 
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from models_library.basic_types import BootModeEnum, PortInt
 from models_library.callbacks_mapping import CallbacksMapping
 from models_library.products import ProductName
@@ -39,8 +39,8 @@ class ResourceTrackingSettings(BaseCustomSettings):
         description="each time the status of the service is propagated",
     )
 
-    _try_convert_resource_tracking_heartbeat_interval = (
-        timedelta_try_convert_str_to_float("RESOURCE_TRACKING_HEARTBEAT_INTERVAL")
+    _validate_resource_tracking_heartbeat_interval = (
+        validate_numeric_string_as_timedelta("RESOURCE_TRACKING_HEARTBEAT_INTERVAL")
     )
 
 
@@ -200,8 +200,8 @@ def are_prometheus_metrics_enabled(self) -> bool:
     def _check_log_level(cls, value):
         return cls.validate_log_level(value)
 
-    _try_convert_dynamic_sidecar_telemetry_disk_usage_monitor_interval = (
-        timedelta_try_convert_str_to_float(
+    _validate_dynamic_sidecar_telemetry_disk_usage_monitor_interval = (
+        validate_numeric_string_as_timedelta(
             "DYNAMIC_SIDECAR_TELEMETRY_DISK_USAGE_MONITOR_INTERVAL"
         )
     )
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/settings.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/settings.py
@@ -1,7 +1,7 @@
 import datetime
 from functools import cached_property
 
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from models_library.basic_types import BootModeEnum
 from pydantic import Field, PositiveInt, validator
 from settings_library.base import BaseCustomSettings
@@ -116,8 +116,8 @@ class ApplicationSettings(MinimalApplicationSettings):
         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(
+    _validate_resource_usage_tracker_missed_heartbeat_interval_sec = (
+        validate_numeric_string_as_timedelta(
             "RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC"
         )
     )
diff --git a/services/web/server/src/simcore_service_webserver/projects/settings.py b/services/web/server/src/simcore_service_webserver/projects/settings.py
@@ -1,7 +1,7 @@
 from datetime import timedelta
 
 from aiohttp import web
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from pydantic import ByteSize, Field, NonNegativeInt, parse_obj_as
 from settings_library.base import BaseCustomSettings
 
@@ -24,7 +24,7 @@ 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(
+    _validate_projects_inactivity_interval = validate_numeric_string_as_timedelta(
         "PROJECTS_INACTIVITY_INTERVAL"
     )
 
diff --git a/services/web/server/src/simcore_service_webserver/studies_dispatcher/settings.py b/services/web/server/src/simcore_service_webserver/studies_dispatcher/settings.py
@@ -2,7 +2,7 @@
 from typing import Any, ClassVar
 
 from aiohttp import web
-from common_library.pydantic_validators import timedelta_try_convert_str_to_float
+from common_library.pydantic_validators import validate_numeric_string_as_timedelta
 from pydantic import ByteSize, HttpUrl, parse_obj_as, validator
 from pydantic.fields import Field
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
@@ -51,7 +51,7 @@ def is_login_required(self):
         """
         return not self.STUDIES_ACCESS_ANONYMOUS_ALLOWED
 
-    _try_convert_studies_guest_account_lifetime = timedelta_try_convert_str_to_float(
+    _validate_studies_guest_account_lifetime = validate_numeric_string_as_timedelta(
         "STUDIES_GUEST_ACCOUNT_LIFETIME"
     )
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`from datetime import timedelta`
`2`	`2`
`3`		`-from common_library.pydantic_validators import timedelta_try_convert_str_to_float`
	`3`	`+from common_library.pydantic_validators import validate_numeric_string_as_timedelta`
`4`	`4`	`from models_library.basic_types import BootModeEnum, LogLevel`
`5`	`5`	`from pydantic import AliasChoices, AnyHttpUrl, Field, field_validator`
`6`	`6`	`from settings_library.base import BaseCustomSettings`
`@@ -76,17 +76,17 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):`
`76`	`76`	`auto_default_from_env=True, description="settings for service/rabbitmq"`
`77`	`77`	`)`
`78`	`78`
`79`		`- _try_convert_agent_volumes_cleanup_interval = timedelta_try_convert_str_to_float(`
	`79`	`+ _validate_agent_volumes_cleanup_interval = validate_numeric_string_as_timedelta(`
`80`	`80`	`"AGENT_VOLUMES_CLEANUP_INTERVAL"`
`81`	`81`	`)`
`82`	`82`
`83`		`- _try_convert_agent_volumes_cleanup_book_keeping_interval = (`
`84`		`- timedelta_try_convert_str_to_float(`
	`83`	`+ _validate_agent_volumes_cleanup_book_keeping_interval = (`
	`84`	`+ validate_numeric_string_as_timedelta(`
`85`	`85`	`"AGENT_VOLUMES_CLEANUP_BOOK_KEEPING_INTERVAL"`
`86`	`86`	`)`
`87`	`87`	`)`
`88`		`- _try_convert_agent_volumes_cleanup_remove_volumes_inactive_for = (`
`89`		`- timedelta_try_convert_str_to_float(`
	`88`	`+ _validate_agent_volumes_cleanup_remove_volumes_inactive_for = (`
	`89`	`+ validate_numeric_string_as_timedelta(`
`90`	`90`	`"AGENT_VOLUMES_CLEANUP_REMOVE_VOLUMES_INACTIVE_FOR"`
`91`	`91`	`)`
`92`	`92`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from datetime import timedelta`
`2`	`2`	`from typing import Final`
`3`	`3`
`4`		`-from common_library.pydantic_validators import timedelta_try_convert_str_to_float`
	`4`	`+from common_library.pydantic_validators import validate_numeric_string_as_timedelta`
`5`	`5`	`from models_library.projects_networks import DockerNetworkName`
`6`	`6`	`from pydantic import Field, NonNegativeInt, PositiveFloat`
`7`	`7`	`from settings_library.base import BaseCustomSettings`
`@@ -168,11 +168,11 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings):`
`168`	`168`	`timedelta(0), description="time to sleep before removing a container"`
`169`	`169`	`)`
`170`	`170`
`171`		`- _try_convert_director_v2_dynamic_scheduler_interval = (`
`172`		`- timedelta_try_convert_str_to_float("DIRECTOR_V2_DYNAMIC_SCHEDULER_INTERVAL")`
	`171`	`+ _validate_director_v2_dynamic_scheduler_interval = (`
	`172`	`+ validate_numeric_string_as_timedelta("DIRECTOR_V2_DYNAMIC_SCHEDULER_INTERVAL")`
`173`	`173`	`)`
`174`		`- _try_convert_director_v2_dynamic_sidecar_sleep_after_container_removal = (`
`175`		`- timedelta_try_convert_str_to_float(`
	`174`	`+ _validate_director_v2_dynamic_sidecar_sleep_after_container_removal = (`
	`175`	`+ validate_numeric_string_as_timedelta(`
`176`	`176`	`"DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL"`
`177`	`177`	`)`
`178`	`178`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from pathlib import Path`
`5`	`5`	`from typing import cast`
`6`	`6`
`7`		`-from common_library.pydantic_validators import timedelta_try_convert_str_to_float`
	`7`	`+from common_library.pydantic_validators import validate_numeric_string_as_timedelta`
`8`	`8`	`from models_library.basic_types import BootModeEnum, PortInt`
`9`	`9`	`from models_library.callbacks_mapping import CallbacksMapping`
`10`	`10`	`from models_library.products import ProductName`
`@@ -39,8 +39,8 @@ class ResourceTrackingSettings(BaseCustomSettings):`
`39`	`39`	`description="each time the status of the service is propagated",`
`40`	`40`	`)`
`41`	`41`
`42`		`- _try_convert_resource_tracking_heartbeat_interval = (`
`43`		`- timedelta_try_convert_str_to_float("RESOURCE_TRACKING_HEARTBEAT_INTERVAL")`
	`42`	`+ _validate_resource_tracking_heartbeat_interval = (`
	`43`	`+ validate_numeric_string_as_timedelta("RESOURCE_TRACKING_HEARTBEAT_INTERVAL")`
`44`	`44`	`)`
`45`	`45`
`46`	`46`
`@@ -200,8 +200,8 @@ def are_prometheus_metrics_enabled(self) -> bool:`
`200`	`200`	`def _check_log_level(cls, value):`
`201`	`201`	`return cls.validate_log_level(value)`
`202`	`202`
`203`		`- _try_convert_dynamic_sidecar_telemetry_disk_usage_monitor_interval = (`
`204`		`- timedelta_try_convert_str_to_float(`
	`203`	`+ _validate_dynamic_sidecar_telemetry_disk_usage_monitor_interval = (`
	`204`	`+ validate_numeric_string_as_timedelta(`
`205`	`205`	`"DYNAMIC_SIDECAR_TELEMETRY_DISK_USAGE_MONITOR_INTERVAL"`
`206`	`206`	`)`
`207`	`207`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import datetime`
`2`	`2`	`from functools import cached_property`
`3`	`3`
`4`		`-from common_library.pydantic_validators import timedelta_try_convert_str_to_float`
	`4`	`+from common_library.pydantic_validators import validate_numeric_string_as_timedelta`
`5`	`5`	`from models_library.basic_types import BootModeEnum`
`6`	`6`	`from pydantic import Field, PositiveInt, validator`
`7`	`7`	`from settings_library.base import BaseCustomSettings`
`@@ -116,8 +116,8 @@ class ApplicationSettings(MinimalApplicationSettings):`
`116`	`116`	`auto_default_from_env=True, description="settings for opentelemetry tracing"`
`117`	`117`	`)`
`118`	`118`
`119`		`- _try_convert_resource_usage_tracker_missed_heartbeat_interval_sec = (`
`120`		`- timedelta_try_convert_str_to_float(`
	`119`	`+ _validate_resource_usage_tracker_missed_heartbeat_interval_sec = (`
	`120`	`+ validate_numeric_string_as_timedelta(`
`121`	`121`	`"RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC"`
`122`	`122`	`)`
`123`	`123`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from datetime import timedelta`
`2`	`2`
`3`	`3`	`from aiohttp import web`
`4`		`-from common_library.pydantic_validators import timedelta_try_convert_str_to_float`
	`4`	`+from common_library.pydantic_validators import validate_numeric_string_as_timedelta`
`5`	`5`	`from pydantic import ByteSize, Field, NonNegativeInt, parse_obj_as`
`6`	`6`	`from settings_library.base import BaseCustomSettings`
`7`	`7`
`@@ -24,7 +24,7 @@ class ProjectsSettings(BaseCustomSettings):`
`24`	`24`	`description="interval after which services need to be idle in order to be considered inactive",`
`25`	`25`	`)`
`26`	`26`
`27`		`- _try_convert_projects_inactivity_interval = timedelta_try_convert_str_to_float(`
	`27`	`+ _validate_projects_inactivity_interval = validate_numeric_string_as_timedelta(`
`28`	`28`	`"PROJECTS_INACTIVITY_INTERVAL"`
`29`	`29`	`)`
`30`	`30`