utc timezone fix

Author: robotastic

axis-ptz-controller/axis_ptz_controller.py

@@ -5,7 +5,7 @@
 """
 
 import ast
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 from json import JSONDecodeError
 
@@ -296,7 +296,7 @@ def __init__(
         self.object: Object = Object("fake", self.camera) # Initialize with a fake object for Typing
 
         config_msg = self.generate_payload_json(
-            push_timestamp=int(datetime.utcnow().timestamp()),
+            push_timestamp=int(datetime.now(timezone.utc).timestamp()),
             device_type=os.environ.get("DEVICE_TYPE", "Collector"),
             id_=self.hostname,
             deployment_id=os.environ.get(
@@ -328,7 +328,7 @@ def __init__(
         # coordinate system to the camera housing fixed (uvw)
         # coordinate system
         orientation_msg = self.generate_payload_json(
-            push_timestamp=int(datetime.utcnow().timestamp()),
+            push_timestamp=int(datetime.now(timezone.utc).timestamp()),
             device_type=os.environ.get("DEVICE_TYPE", "Collector"),
             id_=self.hostname,
             deployment_id=os.environ.get(
@@ -589,7 +589,7 @@ def _config_object(self) -> Dict[str, Any]:
     def _publish_config(self) -> None:
         config = self._config_object()
         config_msg = self.generate_payload_json(
-            push_timestamp=int(datetime.utcnow().timestamp()),
+            push_timestamp=int(datetime.now(timezone.utc).timestamp()),
             device_type=os.environ.get("DEVICE_TYPE", "Collector"),
             id_=self.hostname,
             deployment_id=os.environ.get(
@@ -746,7 +746,7 @@ def _track_object(self, time_since_last_update: float) -> None:
             # Log camera pointing using MQTT
             if self.log_to_mqtt:
                 logger_msg = self.generate_payload_json(
-                    push_timestamp=int(datetime.utcnow().timestamp()),
+                    push_timestamp=int(datetime.now(timezone.utc).timestamp()),
                     device_type=os.environ.get("DEVICE_TYPE", "Collector"),
                     id_=self.hostname,
                     deployment_id=os.environ.get(
@@ -996,7 +996,7 @@ def _send_data(self, data: Dict[str, str]) -> bool:
         """
         # Generate payload as JSON
         payload = self.generate_payload_json(
-            push_timestamp=int(datetime.utcnow().timestamp()),
+            push_timestamp=int(datetime.now(timezone.utc).timestamp()),
             device_type=os.environ.get("DEVICE_TYPE", "Collector"),
             id_=self.hostname,
             deployment_id=os.environ.get(
@@ -1088,7 +1088,6 @@ def _capture_image(self) -> None:
             )
 
             ptz_age = time() - ptz_time
-            logging.info(f"PTZ time: {ptz_age}")
             adjusted_rho_c = rho_c + self.rho_dot_c * self.capture_lead_time
             adjusted_tau_c = tau_c + self.tau_dot_c * self.capture_lead_time
             # Note: this time does not include any leading

axis-ptz-controller/axis_ptz_utilities.py

@@ -1,6 +1,6 @@
 import base64
 import contextlib
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 import math
 import os

axis-ptz-controller/object.py

@@ -6,7 +6,7 @@
 import numpy as np
 import axis_ptz_utilities
 from camera import Camera
-
+from datetime import datetime, timezone
 
 class Object:
 
@@ -184,8 +184,8 @@ def recompute_location(self) -> None:
         msg_age = 0.0
         if self.include_age:
             msg_age = (
-                time() - self.msg_timestamp
-            )  # datetime.utcnow().timestamp() - self.timestamp_o  # [s]
+                datetime.now(timezone.utc).timestamp()  - self.msg_timestamp
+            )  # datetime.now(timezone.utc).timestamp() - self.timestamp_o  # [s]
             logging.debug(f"Object msg age: {msg_age} [s]")
             if msg_age < 0:
                 logging.warning(

tests/test_modules.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 import math
 import os
@@ -100,7 +100,7 @@ def config_msg(controller: axis_ptz_controller.AxisPtzController) -> str:
     with open("test-data/unit-test-data/config_msg_data.json", "r") as f:
         data = json.load(f)
     msg = controller.generate_payload_json(
-        push_timestamp=int(datetime.utcnow().timestamp()),
+        push_timestamp=int(datetime.now(timezone.utc).timestamp()),
         device_type="TBC",
         id_="TBC",
         deployment_id="TBC",
@@ -121,7 +121,7 @@ def orientation_msg_0s(controller: axis_ptz_controller.AxisPtzController) -> str
     with open("test-data/unit-test-data/orientation_msg_data_0s.json", "r") as f:
         data = json.load(f)
     msg = controller.generate_payload_json(
-        push_timestamp=int(datetime.utcnow().timestamp()),
+        push_timestamp=int(datetime.now(timezone.utc).timestamp()),
         device_type="TBC",
         id_="TBC",
         deployment_id="TBC",
@@ -142,7 +142,7 @@ def orientation_msg_90s(controller: axis_ptz_controller.AxisPtzController) -> st
     with open("test-data/unit-test-data/orientation_msg_data_90s.json", "r") as f:
         data = json.load(f)
     msg = controller.generate_payload_json(
-        push_timestamp=int(datetime.utcnow().timestamp()),
+        push_timestamp=int(datetime.now(timezone.utc).timestamp()),
         device_type="TBC",
         id_="TBC",
         deployment_id="TBC",
@@ -175,7 +175,7 @@ def object_msg(controller: axis_ptz_controller.AxisPtzController) -> str:
     with open("test-data/unit-test-data/object_msg_data.json", "r") as f:
         data = json.load(f)
     msg = controller.generate_payload_json(
-        push_timestamp=int(datetime.utcnow().timestamp()),
+        push_timestamp=int(datetime.now(timezone.utc).timestamp()),
         device_type="TBC",
         id_="TBC",
         deployment_id="TBC",