42-normalize-timestamp

distill/core/log.py

@@ -53,3 +53,4 @@ def to_json(self) -> str:
 
     def to_dict(self) -> JsonDict:
         return self.data.model_dump(by_alias=True)
+

distill/core/types.py

@@ -1,5 +1,5 @@
 from typing import Union, List, Dict
-from typing_extensions import Annotated, TypeAliasType
+from typing_extensions import TypeAliasType
 
 # TypeAliasType is necessary to avoid recursion error when validating this
 # type with Pydantic
@@ -17,4 +17,6 @@
 
 JsonDict = Dict[str, 'JSONSerializable']
 
+Timestamp = Union[str, int, float]
+
 

distill/schemas/userale.py

@@ -13,12 +13,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from enum import Enum
 from typing import List, Optional
 
-from pydantic import AliasGenerator, BaseModel, Field
+from pydantic import AliasGenerator, BaseModel, Field, field_serializer, field_validator
 from pydantic.alias_generators import to_camel
 from pydantic.config import ConfigDict
+from datetime import datetime
 
 
 class Browser(BaseModel):
@@ -58,7 +58,7 @@ class UserAleSchema(BaseModel):
     page_title: str
     page_referrer: str
     browser: Browser
-    client_time: int
+    client_time: int 
     micro_time: int = Field(..., lt=2)
     location: Location
     scrn_res: ScrnRes
@@ -71,3 +71,12 @@ class UserAleSchema(BaseModel):
     tool_name: Optional[str]
     userale_version: Optional[str]
     session_id: str
+
+    @field_validator("client_time")
+    def validate_ct(cls, ct: float):
+        return datetime.fromtimestamp(ct / 1000)
+
+    @field_serializer("client_time")
+    def serialize_ct(self, ct: datetime):
+        return int(ct.timestamp() * 1000)
+