Bring epoch calculation and date validation in line with DIRAC

Stricter models.

precommit

Don't use TimeUtilities

revert JobLoggingDB changes

Author: ryuwd

diracx-core/src/diracx/core/models.py

@@ -5,12 +5,36 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import StrEnum
 from typing import Literal
 
-from pydantic import BaseModel, Field
-from typing_extensions import TypedDict
+from pydantic import AwareDatetime, BaseModel, BeforeValidator, Field
+from typing_extensions import Annotated, TypedDict
+
+
+def good_utc_dt(v):
+    # We need to specify that timezone is UTC because otherwise timestamp
+    # assumes local time while we mean UTC.
+    if not v:
+        # Make the UTC datetime
+        v = datetime.now(tz=timezone.utc)
+
+    if isinstance(v, str):
+        # The date is provided as a string.
+        v = datetime.fromisoformat(v)
+
+    if isinstance(v, datetime):
+        if not v.tzinfo:
+            raise ValueError(f"datetime object provided but tzinfo was None. got {v=}")
+        return v.astimezone(timezone.utc)
+
+    raise ValueError(
+        f"Incorrect date for the logging record: got {v=}. Should be a UTC datetime object."
+    )
+
+
+DiracUTCDatetime = Annotated[AwareDatetime, BeforeValidator(good_utc_dt)]
 
 
 class ScalarSearchOperator(StrEnum):
@@ -56,7 +80,7 @@ class InsertedJob(TypedDict):
     JobID: int
     Status: str
     MinorStatus: str
-    TimeStamp: datetime
+    TimeStamp: DiracUTCDatetime
 
 
 class JobSummaryParams(BaseModel):
@@ -101,7 +125,7 @@ class JobLoggingRecord(BaseModel):
     status: JobStatus | Literal["idem"]
     minor_status: str
     application_status: str
-    date: datetime
+    date: DiracUTCDatetime
     source: str
 
 
@@ -130,10 +154,10 @@ class SetJobStatusReturnSuccess(BaseModel):
         Status: JobStatus | None = None
         MinorStatus: str | None = None
         ApplicationStatus: str | None = None
-        HeartBeatTime: datetime | None = None
-        StartExecTime: datetime | None = None
-        EndExecTime: datetime | None = None
-        LastUpdateTime: datetime | None = None
+        HeartBeatTime: DiracUTCDatetime | None = None
+        StartExecTime: DiracUTCDatetime | None = None
+        EndExecTime: DiracUTCDatetime | None = None
+        LastUpdateTime: DiracUTCDatetime | None = None
 
     success: dict[int, SetJobStatusReturnSuccess]
     failed: dict[int, dict[str, str]]