uiprotect 0.8.0__tar.gz → 0.10.0__tar.gz

{uiprotect-0.8.0 → uiprotect-0.10.0}/PKG-INFO

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

{uiprotect-0.8.0 → uiprotect-0.10.0}/pyproject.toml

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

{uiprotect-0.8.0 → uiprotect-0.10.0}/src/uiprotect/api.py

@@ -1075,7 +1075,10 @@ class ProtectApiClient(BaseApiClient):
 
         for event_dict in response:
             # ignore unknown events
-            if "type" not in event_dict or event_dict["type"] not in EventType.values():
+            if (
+                "type" not in event_dict
+                or event_dict["type"] not in EventType.values_set()
+            ):
                 _LOGGER.debug("Unknown event type: %s", event_dict)
                 continue
 
@@ -1086,7 +1089,7 @@ class ProtectApiClient(BaseApiClient):
                 continue
 
             if (
-                event.type.value in EventType.device_events()
+                event.type.value in EventType.device_events_set()
                 and event.score >= self._minimum_score
             ):
                 events.append(event)

{uiprotect-0.8.0 → uiprotect-0.10.0}/src/uiprotect/data/bootstrap.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
+from collections.abc import Iterable
 from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
@@ -337,7 +338,7 @@ class Bootstrap(ProtectBaseObject):
     def _create_stat(
         self,
         packet: WSPacket,
-        keys_set: list[str],
+        keys_set: Iterable[str] | None,
         filtered: bool,
     ) -> None:
         if self.capture_ws_stats:
@@ -346,7 +347,7 @@ class Bootstrap(ProtectBaseObject):
                     model=packet.action_frame.data["modelKey"],
                     action=packet.action_frame.data["action"],
                     keys=list(packet.data_frame.data),
-                    keys_set=keys_set,
+                    keys_set=[] if keys_set is None else list(keys_set),
                     size=len(packet.raw),
                     filtered=filtered,
                 ),
@@ -389,7 +390,9 @@ class Bootstrap(ProtectBaseObject):
             return None
 
         updated = obj.dict()
-        self._create_stat(packet, list(updated), False)
+
+        self._create_stat(packet, updated, False)
+
         return WSSubscriptionMessage(
             action=WSAction.ADD,
             new_update_id=self.last_update_id,
@@ -415,7 +418,7 @@ class Bootstrap(ProtectBaseObject):
             return None
         self.mac_lookup.pop(device.mac.lower().replace(":", ""), None)
 
-        self._create_stat(packet, [], False)
+        self._create_stat(packet, None, False)
         return WSSubscriptionMessage(
             action=WSAction.REMOVE,
             new_update_id=self.last_update_id,
@@ -433,25 +436,25 @@ class Bootstrap(ProtectBaseObject):
             _remove_stats_keys(data)
         # nothing left to process
         if not data:
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         # for another NVR in stack
         nvr_id = packet.action_frame.data.get("id")
         if nvr_id and nvr_id != self.nvr.id:
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         data = self.nvr.unifi_dict_to_dict(data)
         # nothing left to process
         if not data:
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         old_nvr = self.nvr.copy()
         self.nvr = self.nvr.update_from_dict(deepcopy(data))
 
-        self._create_stat(packet, list(data), False)
+        self._create_stat(packet, data, False)
         return WSSubscriptionMessage(
             action=WSAction.UPDATE,
             new_update_id=self.last_update_id,
@@ -478,7 +481,7 @@ class Bootstrap(ProtectBaseObject):
             del data["lastMotion"]
         # nothing left to process
         if not data:
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         key = f"{model_type}s"
@@ -492,12 +495,14 @@ class Bootstrap(ProtectBaseObject):
             data = obj.unifi_dict_to_dict(data)
             old_obj = obj.copy()
             obj = obj.update_from_dict(deepcopy(data))
-            now = utc_now()
+            now: datetime | None = None
 
             if isinstance(obj, Event):
                 self.process_event(obj)
             elif isinstance(obj, Camera):
                 if "last_ring" in data and obj.last_ring:
+                    if now is None:
+                        now = utc_now()
                     is_recent = obj.last_ring + RECENT_EVENT_MAX >= now
                     _LOGGER.debug("last_ring for %s (%s)", obj.id, is_recent)
                     if is_recent:
@@ -507,6 +512,8 @@ class Bootstrap(ProtectBaseObject):
                 and "alarm_triggered_at" in data
                 and obj.alarm_triggered_at
             ):
+                if now is None:
+                    now = utc_now()
                 is_recent = obj.alarm_triggered_at + RECENT_EVENT_MAX >= now
                 _LOGGER.debug("alarm_triggered_at for %s (%s)", obj.id, is_recent)
                 if is_recent:
@@ -514,7 +521,7 @@ class Bootstrap(ProtectBaseObject):
 
             devices[action["id"]] = obj
 
-            self._create_stat(packet, list(data), False)
+            self._create_stat(packet, data, False)
             return WSSubscriptionMessage(
                 action=WSAction.UPDATE,
                 new_update_id=self.last_update_id,
@@ -553,20 +560,20 @@ class Bootstrap(ProtectBaseObject):
         if action["newUpdateId"] is not None:
             self.last_update_id = action["newUpdateId"]
 
-        if action["modelKey"] not in ModelType.values():
+        if action["modelKey"] not in ModelType.values_set():
             _LOGGER.debug("Unknown model type: %s", action["modelKey"])
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         if len(models) > 0 and ModelType(action["modelKey"]) not in models:
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         if action["action"] == "remove":
             return self._process_remove_packet(packet, data)
 
         if data is None or len(data) == 0:
-            self._create_stat(packet, [], True)
+            self._create_stat(packet, None, True)
             return None
 
         try:
@@ -577,7 +584,7 @@ class Bootstrap(ProtectBaseObject):
                 if action["modelKey"] == ModelType.NVR.value:
                     return self._process_nvr_update(packet, data, ignore_stats)
                 if (
-                    action["modelKey"] in ModelType.bootstrap_models()
+                    action["modelKey"] in ModelType.bootstrap_models_set()
                     or action["modelKey"] == ModelType.EVENT.value
                 ):
                     return self._process_device_update(
@@ -593,7 +600,7 @@ class Bootstrap(ProtectBaseObject):
         except (ValidationError, ValueError) as err:
             self._handle_ws_error(action, err)
 
-        self._create_stat(packet, [], True)
+        self._create_stat(packet, None, True)
         return None
 
     def _handle_ws_error(self, action: dict[str, Any], err: Exception) -> None:

{uiprotect-0.8.0 → uiprotect-0.10.0}/src/uiprotect/data/types.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import enum
 from collections.abc import Callable, Coroutine
+from functools import cache
 from typing import Any, Literal, Optional, TypeVar, Union
 
 from packaging.version import Version as BaseVersion
@@ -58,11 +59,17 @@ class ValuesEnumMixin:
     _values_normalized: dict[str, str] | None = None
 
     @classmethod
+    @cache
     def values(cls) -> list[str]:
         if cls._values is None:
             cls._values = [e.value for e in cls]  # type: ignore[attr-defined]
         return cls._values
 
+    @classmethod
+    @cache
+    def values_set(cls) -> set[str]:
+        return set(cls.values())
+
     @classmethod
     def _missing_(cls, value: Any) -> Any | None:
         if cls._values_normalized is None:
@@ -103,6 +110,7 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
     UNKNOWN = "unknown"
 
     @staticmethod
+    @cache
     def bootstrap_models() -> tuple[str, ...]:
         # TODO:
         # legacyUFV
@@ -121,6 +129,11 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
             ModelType.CHIME.value,
         )
 
+    @staticmethod
+    @cache
+    def bootstrap_models_set() -> set[str]:
+        return set(ModelType.bootstrap_models())
+
 
 @enum.unique
 class EventType(str, ValuesEnumMixin, enum.Enum):
@@ -204,6 +217,7 @@ class EventType(str, ValuesEnumMixin, enum.Enum):
     RECORDING_OFF = "recordingOff"
 
     @staticmethod
+    @cache
     def device_events() -> list[str]:
         return [
             EventType.MOTION.value,
@@ -212,6 +226,12 @@ class EventType(str, ValuesEnumMixin, enum.Enum):
         ]
 
     @staticmethod
+    @cache
+    def device_events_set() -> set[str]:
+        return set(EventType.device_events())
+
+    @staticmethod
+    @cache
     def motion_events() -> list[str]:
         return [EventType.MOTION.value, EventType.SMART_DETECT.value]