fixes

Author: v1r3n

src/conductor/client/event/task_events.py

@@ -6,7 +6,7 @@
 """
 
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 
 from conductor.client.event.conductor_event import ConductorEvent
 
@@ -33,7 +33,7 @@ class TaskResultPayloadSize(TaskEvent):
         timestamp: UTC timestamp when the event was created
     """
     size_bytes: int
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -49,4 +49,4 @@ class TaskPayloadUsed(TaskEvent):
     """
     operation: str
     payload_type: str
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))

src/conductor/client/event/task_runner_events.py

@@ -6,7 +6,7 @@
 """
 
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Optional
 
 from conductor.client.event.conductor_event import ConductorEvent
@@ -37,7 +37,7 @@ class PollStarted(TaskRunnerEvent):
     """
     worker_id: str
     poll_count: int
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -53,7 +53,7 @@ class PollCompleted(TaskRunnerEvent):
     """
     duration_ms: float
     tasks_received: int
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -69,7 +69,7 @@ class PollFailure(TaskRunnerEvent):
     """
     duration_ms: float
     cause: Exception
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -87,7 +87,7 @@ class TaskExecutionStarted(TaskRunnerEvent):
     task_id: str
     worker_id: str
     workflow_instance_id: Optional[str] = None
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -109,7 +109,7 @@ class TaskExecutionCompleted(TaskRunnerEvent):
     workflow_instance_id: Optional[str]
     duration_ms: float
     output_size_bytes: Optional[int] = None
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -131,4 +131,4 @@ class TaskExecutionFailure(TaskRunnerEvent):
     workflow_instance_id: Optional[str]
     cause: Exception
     duration_ms: float
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))

src/conductor/client/event/workflow_events.py

@@ -6,7 +6,7 @@
 """
 
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Optional
 
 from conductor.client.event.conductor_event import ConductorEvent
@@ -41,7 +41,7 @@ class WorkflowStarted(WorkflowEvent):
     success: bool = True
     workflow_id: Optional[str] = None
     cause: Optional[Exception] = None
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -56,7 +56,7 @@ class WorkflowInputPayloadSize(WorkflowEvent):
         timestamp: UTC timestamp when the event was created
     """
     size_bytes: int = 0
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -73,4 +73,4 @@ class WorkflowPayloadUsed(WorkflowEvent):
     """
     operation: str = ""
     payload_type: str = ""
-    timestamp: datetime = field(default_factory=datetime.utcnow)
+    timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))

tests/unit/automator/utils_test.py

@@ -33,7 +33,7 @@ def printme(self):
         print(f'ba is: {self.ba} and all are {self.__dict__}')
 
 
-class Test:
+class SampleModel:
 
     def __init__(self, a, b: List[SubTest], d: list[UserInfo], g: CaseInsensitiveDict[str, UserInfo]) -> None:
         self.a = a
@@ -57,9 +57,9 @@ def test_convert_non_dataclass(self):
         dictionary = {'a': 123, 'b': [{'ba': 2}, {'ba': 21}],
                       'd': [{'name': 'conductor', 'id': 123}, {'F': 3}],
                       'g': {'userA': {'name': 'userA', 'id': 100}, 'userB': {'name': 'userB', 'id': 101}}}
-        value = convert_from_dict(Test, dictionary)
+        value = convert_from_dict(SampleModel, dictionary)
 
-        self.assertEqual(Test, type(value))
+        self.assertEqual(SampleModel, type(value))
         self.assertEqual(123, value.a)
         self.assertEqual(2, len(value.b))
         self.assertEqual(21, value.b[1].ba)