fixed issue with RunID

Author: Andrei Neagu

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

@@ -1,6 +1,5 @@
 import datetime
 
-from models_library.services_types import RunID
 from pydantic import field_validator
 
 
@@ -19,13 +18,3 @@ def _try_convert_str_to_float_or_return(
 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"""
     return field_validator(field, mode="before")(_try_convert_str_to_float_or_return)
-
-
-def _convert_str_to_run_id_object(v: RunID | str) -> RunID:
-    if isinstance(v, str):
-        return RunID(v)
-    return v
-
-
-def convert_str_to_run_id_object(field: str):
-    return field_validator(field, mode="before")(_convert_str_to_run_id_object)

packages/models-library/src/models_library/services_types.py

@@ -2,7 +2,7 @@
 from uuid import uuid4
 
 import arrow
-from pydantic import StringConstraints, TypeAdapter
+from pydantic import StringConstraints, TypeAdapter, ValidationInfo
 
 from .basic_regex import PROPERTY_KEY_RE, SIMPLE_VERSION_RE
 from .services_regex import (
@@ -59,3 +59,16 @@ def create(cls) -> "RunID":
         utc_int_timestamp: int = arrow.utcnow().int_timestamp
         run_id_format = f"{utc_int_timestamp}_{uuid4()}"
         return cls(run_id_format)
+
+    @classmethod
+    def __get_validators__(cls):
+        yield cls.validate
+
+    @classmethod
+    def validate(cls, v: "RunID | str", _: ValidationInfo) -> "RunID":
+        if isinstance(v, cls):
+            return v
+        if isinstance(v, str):
+            return cls(v)
+        msg = f"Invalid value for RunID: {v}"
+        raise TypeError(msg)

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

@@ -5,10 +5,7 @@
 from typing import cast
 
 from common_library.pydantic_type_adapters import ByteSizeAdapter
-from common_library.pydantic_validators import (
-    convert_str_to_run_id_object,
-    timedelta_try_convert_str_to_float,
-)
+from common_library.pydantic_validators import timedelta_try_convert_str_to_float
 from models_library.basic_types import BootModeEnum, PortInt
 from models_library.callbacks_mapping import CallbacksMapping
 from models_library.products import ProductName
@@ -197,8 +194,6 @@ def are_prometheus_metrics_enabled(self) -> bool:
     def _check_log_level(cls, value):
         return cls.validate_log_level(value)
 
-    _convert_str_to_run_id_object = convert_str_to_run_id_object("DY_SIDECAR_RUN_ID")
-
     _try_convert_dynamic_sidecar_telemetry_disk_usage_monitor_interval = (
         timedelta_try_convert_str_to_float(
             "DYNAMIC_SIDECAR_TELEMETRY_DISK_USAGE_MONITOR_INTERVAL"