fix datetime

Author: giancarloromeo

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

@@ -1,12 +1,25 @@
-import datetime
+import datetime as dt
 import re
 import warnings
-from datetime import timedelta
 
 from pydantic import TypeAdapter, field_validator
 
 
-def _validate_legacy_timedelta_str(time_str: str | timedelta) -> str | timedelta:
+def validate_legacy_datetime_str(v: str | dt.datetime) -> dt.datetime:
+    if isinstance(v, dt.datetime):
+        return v
+    try:
+        return dt.datetime.fromisoformat(v)
+    except ValueError:
+        pass
+
+    try:
+        return dt.datetime.strptime(v, "%Y-%m-%d %H:%M:%S.%f%z")
+    except ValueError:
+        raise ValueError("Timestamp must be in a recognized datetime format")
+
+
+def _validate_legacy_timedelta_str(time_str: str | dt.timedelta) -> str | dt.timedelta:
     if not isinstance(time_str, str):
         return time_str
 
@@ -34,14 +47,14 @@ 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 _numeric_string_as_timedelta(
-        v: datetime.timedelta | str | float,
-    ) -> datetime.timedelta | str | float:
+        v: dt.timedelta | str | float,
+    ) -> dt.timedelta | str | float:
         if isinstance(v, str):
             try:
                 converted_value = float(v)
 
-                iso8601_format = TypeAdapter(timedelta).dump_python(
-                    timedelta(seconds=converted_value), mode="json"
+                iso8601_format = TypeAdapter(dt.timedelta).dump_python(
+                    dt.timedelta(seconds=converted_value), mode="json"
                 )
                 warnings.warn(
                     f"{field}='{v}' -should be set to-> {field}='{iso8601_format}' (ISO8601 datetime format). "

services/director-v2/src/simcore_service_director_v2/models/comp_runs.py

@@ -106,8 +106,8 @@ def convert_null_to_empty_metadata(cls, v):
                     "iteration": 12,
                     "result": "SUCCESS",
                     "created": "2021-03-01 13:07:34.19161",
-                    "modified": "2021-03-0 13:07:34.19161",
-                    "started": "2021-03-01 8:07:34.19161",
+                    "modified": "2021-03-01 13:07:34.19161",
+                    "started": "2021-03-01 08:07:34.19161",
                     "ended": "2021-03-01 13:07:34.10",
                     "metadata": {
                         "node_id_names_map": {},

services/director-v2/src/simcore_service_director_v2/models/comp_tasks.py

@@ -1,7 +1,8 @@
-import datetime
+import datetime as dt
 from contextlib import suppress
 from typing import Annotated, Any
 
+from common_library.pydantic_validators import validate_legacy_datetime_str
 from dask_task_models_library.container_tasks.protocol import ContainerEnvsDict
 from models_library.api_schemas_directorv2.services import NodeRequirements
 from models_library.basic_regex import SIMPLE_VERSION_RE
@@ -16,6 +17,7 @@
 from models_library.services_resources import BootMode
 from pydantic import (
     BaseModel,
+    BeforeValidator,
     ByteSize,
     ConfigDict,
     Field,
@@ -128,25 +130,25 @@ class CompTaskAtDB(BaseModel):
         description="the hex digest of the resolved inputs +outputs hash at the time when the last outputs were generated",
     )
     image: Image
-    submit: datetime.datetime
-    start: datetime.datetime | None = Field(default=None)
-    end: datetime.datetime | None = Field(default=None)
+    submit: dt.datetime
+    start: dt.datetime | None = None
+    end: dt.datetime | None = None
     state: RunningState
-    task_id: PositiveInt | None = Field(default=None)
+    task_id: PositiveInt | None = None
     internal_id: PositiveInt
     node_class: NodeClass
-    errors: list[ErrorDict] | None = Field(default=None)
+    errors: list[ErrorDict] | None = None
     progress: float | None = Field(
         default=None,
         ge=0.0,
         le=1.0,
         description="current progress of the task if available",
     )
-    last_heartbeat: datetime.datetime | None = Field(
+    last_heartbeat: dt.datetime | None = Field(
         ..., description="Last time the running task was checked by the backend"
     )
-    created: datetime.datetime
-    modified: datetime.datetime
+    created: Annotated[dt.datetime, BeforeValidator(validate_legacy_datetime_str)]
+    modified: Annotated[dt.datetime, BeforeValidator(validate_legacy_datetime_str)]
     # Additional information about price and hardware (ex. AWS EC2 instance type)
     pricing_info: dict | None
     hardware_info: HardwareInfo
@@ -165,9 +167,9 @@ def _convert_state_from_state_type_enum_if_needed(cls, v):
 
     @field_validator("start", "end", "submit")
     @classmethod
-    def _ensure_utc(cls, v: datetime.datetime | None) -> datetime.datetime | None:
+    def _ensure_utc(cls, v: dt.datetime | None) -> dt.datetime | None:
         if v is not None and v.tzinfo is None:
-            v = v.replace(tzinfo=datetime.UTC)
+            v = v.replace(tzinfo=dt.UTC)
         return v
 
     @field_validator("hardware_info", mode="before")