uiprotect 1.11.0__tar.gz → 1.12.0__tar.gz

{uiprotect-1.11.0 → uiprotect-1.12.0}/PKG-INFO

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

{uiprotect-1.11.0 → uiprotect-1.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "1.11.0"
+version = "1.12.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"

{uiprotect-1.11.0 → uiprotect-1.12.0}/src/uiprotect/data/base.py

@@ -6,7 +6,7 @@ import asyncio
 import logging
 from collections.abc import Callable
 from datetime import datetime, timedelta
-from functools import cache, cached_property
+from functools import cache
 from ipaddress import IPv4Address
 from typing import TYPE_CHECKING, Any, ClassVar, TypeVar
 from uuid import UUID
@@ -89,7 +89,6 @@ class ProtectBaseObject(BaseModel):
         arbitrary_types_allowed = True
         validate_assignment = True
         copy_on_model_validation = "shallow"
-        keep_untouched = (cached_property,)
 
     def __init__(self, api: ProtectApiClient | None = None, **data: Any) -> None:
         """

{uiprotect-1.11.0 → uiprotect-1.12.0}/src/uiprotect/data/bootstrap.py

@@ -8,7 +8,7 @@ from collections.abc import Iterable
 from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
-from functools import cache, cached_property
+from functools import cache
 from typing import TYPE_CHECKING, Any, cast
 
 from aiohttp.client_exceptions import ServerDisconnectedError
@@ -56,6 +56,7 @@ _LOGGER = logging.getLogger(__name__)
 MAX_SUPPORTED_CAMERAS = 256
 MAX_EVENT_HISTORY_IN_STATE_MACHINE = MAX_SUPPORTED_CAMERAS * 2
 STATS_KEYS = {
+    "eventStats",
     "storageStats",
     "stats",
     "systemInfo",
@@ -181,6 +182,10 @@ class Bootstrap(ProtectBaseObject):
     mac_lookup: dict[str, ProtectDeviceRef] = {}
     id_lookup: dict[str, ProtectDeviceRef] = {}
     _ws_stats: list[WSStat] = PrivateAttr([])
+    _has_doorbell: bool | None = PrivateAttr(None)
+    _has_smart: bool | None = PrivateAttr(None)
+    _has_media: bool | None = PrivateAttr(None)
+    _recording_start: datetime | None = PrivateAttr(None)
     _refresh_tasks: set[asyncio.Task[None]] = PrivateAttr(set())
 
     @classmethod
@@ -248,33 +253,48 @@ class Bootstrap(ProtectBaseObject):
     def auth_user(self) -> User:
         return self._api.bootstrap.users[self.auth_user_id]
 
-    @cached_property
+    @property
     def has_doorbell(self) -> bool:
-        return any(c.feature_flags.is_doorbell for c in self.cameras.values())
+        if self._has_doorbell is None:
+            self._has_doorbell = any(
+                c.feature_flags.is_doorbell for c in self.cameras.values()
+            )
 
-    @cached_property
+        return self._has_doorbell
+
+    @property
     def recording_start(self) -> datetime | None:
-        """Get earliest recording date."""
-        try:
-            return min(
-                c.stats.video.recording_start
-                for c in self.cameras.values()
-                if c.stats.video.recording_start is not None
-            )
-        except ValueError:
-            return None
+        """Get earilest recording date."""
+        if self._recording_start is None:
+            try:
+                self._recording_start = min(
+                    c.stats.video.recording_start
+                    for c in self.cameras.values()
+                    if c.stats.video.recording_start is not None
+                )
+            except ValueError:
+                return None
+        return self._recording_start
 
-    @cached_property
+    @property
     def has_smart_detections(self) -> bool:
         """Check if any camera has smart detections."""
-        return any(c.feature_flags.has_smart_detect for c in self.cameras.values())
+        if self._has_smart is None:
+            self._has_smart = any(
+                c.feature_flags.has_smart_detect for c in self.cameras.values()
+            )
+        return self._has_smart
 
-    @cached_property
+    @property
     def has_media(self) -> bool:
         """Checks if user can read media for any camera."""
-        if self.recording_start is None:
-            return False
-        return any(c.can_read_media(self.auth_user) for c in self.cameras.values())
+        if self._has_media is None:
+            if self.recording_start is None:
+                return False
+            self._has_media = any(
+                c.can_read_media(self.auth_user) for c in self.cameras.values()
+            )
+        return self._has_media
 
     def get_device_from_mac(self, mac: str) -> ProtectAdoptableDeviceModel | None:
         """Retrieve a device from MAC address."""
@@ -375,8 +395,7 @@ class Bootstrap(ProtectBaseObject):
 
         device_id: str = packet.action_frame.data["id"]
         self.id_lookup.pop(device_id, None)
-        device = devices.pop(device_id, None)
-        if device is None:
+        if (device := devices.pop(device_id, None)) is None:
             return None
         self.mac_lookup.pop(normalize_mac(device.mac), None)
 
@@ -467,19 +486,17 @@ class Bootstrap(ProtectBaseObject):
         elif model_type is ModelType.CAMERA:
             if TYPE_CHECKING:
                 assert isinstance(obj, Camera)
-            if "last_ring" in data and obj.last_ring:
-                is_recent = obj.last_ring + RECENT_EVENT_MAX >= utc_now()
-                _LOGGER.debug("last_ring for %s (%s)", obj.id, is_recent)
-                if is_recent:
+            if "last_ring" in data and (last_ring := obj.last_ring):
+                if is_recent := last_ring + RECENT_EVENT_MAX >= utc_now():
                     obj.set_ring_timeout()
+                _LOGGER.debug("last_ring for %s (%s)", obj.id, is_recent)
         elif model_type is ModelType.SENSOR:
             if TYPE_CHECKING:
                 assert isinstance(obj, Sensor)
-            if "alarm_triggered_at" in data and obj.alarm_triggered_at:
-                is_recent = obj.alarm_triggered_at + RECENT_EVENT_MAX >= utc_now()
-                _LOGGER.debug("alarm_triggered_at for %s (%s)", obj.id, is_recent)
-                if is_recent:
+            if "alarm_triggered_at" in data and (trigged_at := obj.alarm_triggered_at):
+                if is_recent := trigged_at + RECENT_EVENT_MAX >= utc_now():
                     obj.set_alarm_timeout()
+                _LOGGER.debug("alarm_triggered_at for %s (%s)", obj.id, is_recent)
 
         devices[action_id] = obj
         self._create_stat(packet, data, False)