uiprotect 0.12.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

uiprotect/data/base.py

@@ -14,10 +14,10 @@ from uuid import UUID
 from ..exceptions import BadRequest, ClientError, NotAuthorized
 from ..utils import (
     asyncio_timeout,
+    convert_to_datetime,
     convert_unifi_data,
     dict_diff,
     is_debug,
-    process_datetime,
     serialize_unifi_obj,
     to_snake_case,
 )
@@ -850,9 +850,9 @@ class ProtectDeviceModel(ProtectModelWithId):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         if "lastSeen" in data:
-            data["lastSeen"] = process_datetime(data, "lastSeen")
+            data["lastSeen"] = convert_to_datetime(data["lastSeen"])
         if "upSince" in data and data["upSince"] is not None:
-            data["upSince"] = process_datetime(data, "upSince")
+            data["upSince"] = convert_to_datetime(data["upSince"])
         if (
             "uptime" in data
             and data["uptime"] is not None
@@ -1001,7 +1001,7 @@ class ProtectAdoptableDeviceModel(ProtectDeviceModel):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         if "lastDisconnect" in data and data["lastDisconnect"] is not None:
-            data["lastDisconnect"] = process_datetime(data, "lastDisconnect")
+            data["lastDisconnect"] = convert_to_datetime(data["lastDisconnect"])
 
         return super().unifi_dict_to_dict(data)
 

uiprotect/data/bootstrap.py

@@ -131,26 +131,34 @@ def _process_sensor_event(event: Event) -> None:
             event.sensor.last_value_event_id = event.id
 
 
+_CAMERA_SMART_AND_LINE_EVENTS = {
+    EventType.SMART_DETECT,
+    EventType.SMART_DETECT_LINE,
+}
+_CAMERA_SMART_AUDIO_EVENT = EventType.SMART_AUDIO_DETECT
+
+
 def _process_camera_event(event: Event) -> None:
-    if event.camera is None:
+    if (camera := event.camera) is None:
         return
 
-    dt_attr, event_attr = CAMERA_EVENT_ATTR_MAP[event.type]
-    dt = getattr(event.camera, dt_attr)
+    event_type = event.type
+    dt_attr, event_attr = CAMERA_EVENT_ATTR_MAP[event_type]
+    dt = getattr(camera, dt_attr)
     if dt is None or event.start >= dt or (event.end is not None and event.end >= dt):
-        setattr(event.camera, event_attr, event.id)
-        setattr(event.camera, dt_attr, event.start)
-        if event.type in {EventType.SMART_DETECT, EventType.SMART_DETECT_LINE}:
+        setattr(camera, event_attr, event.id)
+        setattr(camera, dt_attr, event.start)
+        if event_type in _CAMERA_SMART_AND_LINE_EVENTS:
             for smart_type in event.smart_detect_types:
-                event.camera.last_smart_detect_event_ids[smart_type] = event.id
-                event.camera.last_smart_detects[smart_type] = event.start
-        elif event.type == EventType.SMART_AUDIO_DETECT:
+                camera.last_smart_detect_event_ids[smart_type] = event.id
+                camera.last_smart_detects[smart_type] = event.start
+        elif event_type is _CAMERA_SMART_AUDIO_EVENT:
             for smart_type in event.smart_detect_types:
                 audio_type = smart_type.audio_type
                 if audio_type is None:
                     continue
-                event.camera.last_smart_audio_detect_event_ids[audio_type] = event.id
-                event.camera.last_smart_audio_detects[audio_type] = event.start
+                camera.last_smart_audio_detect_event_ids[audio_type] = event.id
+                camera.last_smart_audio_detects[audio_type] = event.start
 
 
 @dataclass
@@ -212,7 +220,7 @@ class Bootstrap(ProtectBaseObject):
         data["macLookup"] = {}
         data["idLookup"] = {}
         for model_type in ModelType.bootstrap_models():
-            key = model_type + "s"
+            key = f"{model_type}s"
             items: dict[str, ProtectModel] = {}
             for item in data[key]:
                 if (
@@ -249,7 +257,7 @@ class Bootstrap(ProtectBaseObject):
             del data["idLookup"]
 
         for model_type in ModelType.bootstrap_models():
-            attr = model_type + "s"
+            attr = f"{model_type}s"
             if attr in data and isinstance(data[attr], dict):
                 data[attr] = list(data[attr].values())
 
@@ -379,7 +387,7 @@ class Bootstrap(ProtectBaseObject):
             and obj.model is not None
             and obj.model.value in ModelType.bootstrap_models_set()
         ):
-            key = obj.model.value + "s"
+            key = f"{obj.model.value}s"
             if not self.api.ignore_unadopted or (
                 obj.is_adopted and not obj.is_adopted_by_other
             ):

uiprotect/data/devices.py

@@ -23,9 +23,9 @@ from ..utils import (
     clamp_value,
     convert_smart_audio_types,
     convert_smart_types,
+    convert_to_datetime,
     convert_video_modes,
     from_js_time,
-    process_datetime,
     serialize_point,
     to_js_time,
     utc_now,
@@ -494,7 +494,7 @@ class LCDMessage(ProtectBaseObject):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         if "resetAt" in data:
-            data["resetAt"] = process_datetime(data, "resetAt")
+            data["resetAt"] = convert_to_datetime(data["resetAt"])
         if "text" in data:
             # UniFi Protect bug: some times LCD messages can get into a bad state where message = DEFAULT MESSAGE, but no type
             if "type" not in data:
@@ -579,21 +579,21 @@ class VideoStats(ProtectBaseObject):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         if "recordingStart" in data:
-            data["recordingStart"] = process_datetime(data, "recordingStart")
+            data["recordingStart"] = convert_to_datetime(data["recordingStart"])
         if "recordingEnd" in data:
-            data["recordingEnd"] = process_datetime(data, "recordingEnd")
+            data["recordingEnd"] = convert_to_datetime(data["recordingEnd"])
         if "recordingStartLQ" in data:
-            data["recordingStartLQ"] = process_datetime(data, "recordingStartLQ")
+            data["recordingStartLQ"] = convert_to_datetime(data["recordingStartLQ"])
         if "recordingEndLQ" in data:
-            data["recordingEndLQ"] = process_datetime(data, "recordingEndLQ")
+            data["recordingEndLQ"] = convert_to_datetime(data["recordingEndLQ"])
         if "timelapseStart" in data:
-            data["timelapseStart"] = process_datetime(data, "timelapseStart")
+            data["timelapseStart"] = convert_to_datetime(data["timelapseStart"])
         if "timelapseEnd" in data:
-            data["timelapseEnd"] = process_datetime(data, "timelapseEnd")
+            data["timelapseEnd"] = convert_to_datetime(data["timelapseEnd"])
         if "timelapseStartLQ" in data:
-            data["timelapseStartLQ"] = process_datetime(data, "timelapseStartLQ")
+            data["timelapseStartLQ"] = convert_to_datetime(data["timelapseStartLQ"])
         if "timelapseEndLQ" in data:
-            data["timelapseEndLQ"] = process_datetime(data, "timelapseEndLQ")
+            data["timelapseEndLQ"] = convert_to_datetime(data["timelapseEndLQ"])
 
         return super().unifi_dict_to_dict(data)
 

uiprotect/data/nvr.py

@@ -17,7 +17,7 @@ import orjson
 from aiofiles import os as aos
 
 from ..exceptions import BadRequest, NotAuthorized
-from ..utils import RELEASE_CACHE, process_datetime
+from ..utils import RELEASE_CACHE, convert_to_datetime
 from .base import (
     ProtectBaseObject,
     ProtectDeviceModel,
@@ -170,7 +170,7 @@ class EventDetectedThumbnail(ProtectBaseObject):
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         if "clockBestWall" in data:
             if data["clockBestWall"]:
-                data["clockBestWall"] = process_datetime(data, "clockBestWall")
+                data["clockBestWall"] = convert_to_datetime(data["clockBestWall"])
             else:
                 del data["clockBestWall"]
 
@@ -309,7 +309,7 @@ class Event(ProtectModelWithId):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         for key in {"start", "end", "timestamp", "deletedAt"}.intersection(data):
-            data[key] = process_datetime(data, key)
+            data[key] = convert_to_datetime(data[key])
 
         return super().unifi_dict_to_dict(data)
 
@@ -1025,11 +1025,10 @@ class NVR(ProtectDeviceModel):
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
         if "lastUpdateAt" in data:
-            data["lastUpdateAt"] = process_datetime(data, "lastUpdateAt")
+            data["lastUpdateAt"] = convert_to_datetime(data["lastUpdateAt"])
         if "lastDeviceFwUpdatesCheckedAt" in data:
-            data["lastDeviceFwUpdatesCheckedAt"] = process_datetime(
-                data,
-                "lastDeviceFwUpdatesCheckedAt",
+            data["lastDeviceFwUpdatesCheckedAt"] = convert_to_datetime(
+                data["lastDeviceFwUpdatesCheckedAt"]
             )
         if (
             "recordingRetentionDurationMs" in data

uiprotect/utils.py

@@ -172,9 +172,10 @@ def from_js_time(num: float | str | datetime) -> datetime:
     return datetime.fromtimestamp(int(num) / 1000, tz=timezone.utc)
 
 
-def process_datetime(data: dict[str, Any], key: str) -> datetime | None:
-    """Extracts datetime object from Protect dictionary"""
-    return None if data.get(key) is None else from_js_time(data[key])
+@lru_cache(maxsize=1024)
+def convert_to_datetime(source_time: float | str | datetime | None) -> datetime | None:
+    """Converts timestamp to datetime object"""
+    return None if source_time is None else from_js_time(source_time)
 
 
 def format_datetime(

{uiprotect-0.12.0.dist-info → uiprotect-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 0.12.0
+Version: 0.14.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT

{uiprotect-0.12.0.dist-info → uiprotect-0.14.0.dist-info}/RECORD

@@ -14,11 +14,11 @@ uiprotect/cli/nvr.py,sha256=TwxEg2XT8jXAbOqv6gc7KFXELKadeItEDYweSL4_-e8,4260
 uiprotect/cli/sensors.py,sha256=fQtcDJCVxs4VbAqcavgBy2ABiVxAW3GXtna6_XFBp2k,8153
 uiprotect/cli/viewers.py,sha256=2cyrp104ffIvgT0wYGIO0G35QMkEbFe7fSVqLwDXQYQ,2171
 uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,2938
-uiprotect/data/base.py,sha256=ex-UC9CJUtzxMFqtYokSiXM8pNHVBqCzq7r8WrEf1Mw,37178
-uiprotect/data/bootstrap.py,sha256=RcqIiIk8z5QKDMnrWB7ZZDlBouesx2xQGN02wEl-B9s,21416
+uiprotect/data/base.py,sha256=TkhnYoHxYFmtg30rFOYQjmk7uw2Ky7dMSS-cV6FGLnw,37190
+uiprotect/data/bootstrap.py,sha256=cFp8PmsRLcz_hKFn50n2BBPNZcnI_RJvEF9GYEXKPOg,21543
 uiprotect/data/convert.py,sha256=rOQplUMIdTMD2SbAx_iI9BNPDscnhDvyRVLEMDhtADg,2047
-uiprotect/data/devices.py,sha256=LHVBT8ihMAZen7gIlQNbiYxukRrBpi_TNKNmV_5R6Xc,111705
-uiprotect/data/nvr.py,sha256=OJso6oewA_jY7ovKbD2U2Onp1GqheT5bCW0F6dC53DQ,47570
+uiprotect/data/devices.py,sha256=yx30uYnAlzabVhMohdDkO6LMgEuC7kSwUJbX5LWXHnA,111735
+uiprotect/data/nvr.py,sha256=At4N2trpfMk-wMXViBe7Lp_a5ML4JnOXOnDIVr3vPDI,47568
 uiprotect/data/types.py,sha256=6Z5ZqWTbH4Igy0l4QJShqQZ_zvrJKD0G-hZLjoBNP-U,16193
 uiprotect/data/user.py,sha256=yBnUQ3qpHL745hLhR41WjWv_Yx51RlmfHapgvK0KSgM,7067
 uiprotect/data/websocket.py,sha256=WZJVA7EfYuKYMv-9jmvGgMWXKzE9ES25SKv1NQ2eHjc,6281
@@ -28,10 +28,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
 uiprotect/test_util/__init__.py,sha256=d2g7afa0LSdixQ0kjEDYwafDFME_UlW2LzxpamZ2BC0,18556
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=ItYUrIhCbvdvIO3Q_MI9jQFnFs5OouqfsO_SXWeQZPM,18389
+uiprotect/utils.py,sha256=6OLY8hNiCzk418PjJJIlFW7jjPzVt1vxBKEzBSqMeTk,18418
 uiprotect/websocket.py,sha256=iMTdchymaCgVHsmY1bRbxkcymqt6WQircIHYNxCu178,7289
-uiprotect-0.12.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-0.12.0.dist-info/METADATA,sha256=13ADAWhiHnb4kCgVFsioRdR_pYLaGG4vDYQzdDfIcU0,10985
-uiprotect-0.12.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-0.12.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-0.12.0.dist-info/RECORD,,
+uiprotect-0.14.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-0.14.0.dist-info/METADATA,sha256=0Y-f0uuYI6g81m3TwXC102R5wUtTw0VWIlvJQizQ81w,10985
+uiprotect-0.14.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-0.14.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-0.14.0.dist-info/RECORD,,