uiprotect 0.11.0__tar.gz → 0.13.0__tar.gz

{uiprotect-0.11.0 → uiprotect-0.13.0}/PKG-INFO

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

{uiprotect-0.11.0 → uiprotect-0.13.0}/pyproject.toml

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

{uiprotect-0.11.0 → uiprotect-0.13.0}/src/uiprotect/data/bootstrap.py

@@ -18,7 +18,7 @@ except ImportError:
     from pydantic import PrivateAttr, ValidationError  # type: ignore[assignment]
 
 from ..exceptions import ClientError
-from ..utils import utc_now
+from ..utils import normalize_mac, utc_now
 from .base import (
     RECENT_EVENT_MAX,
     ProtectBaseObject,
@@ -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
@@ -226,7 +234,7 @@ class Bootstrap(ProtectBaseObject):
                 items[item["id"]] = item
                 data["idLookup"][item["id"]] = ref
                 if "mac" in item:
-                    cleaned_mac = item["mac"].lower().replace(":", "")
+                    cleaned_mac = normalize_mac(item["mac"])
                     data["macLookup"][cleaned_mac] = ref
             data[key] = items
 
@@ -312,8 +320,7 @@ class Bootstrap(ProtectBaseObject):
 
     def get_device_from_mac(self, mac: str) -> ProtectAdoptableDeviceModel | None:
         """Retrieve a device from MAC address."""
-        mac = mac.lower().replace(":", "").replace("-", "").replace("_", "")
-        ref = self.mac_lookup.get(mac)
+        ref = self.mac_lookup.get(normalize_mac(mac))
         if ref is None:
             return None
 
@@ -378,7 +385,7 @@ class Bootstrap(ProtectBaseObject):
         elif (
             isinstance(obj, ProtectAdoptableDeviceModel)
             and obj.model is not None
-            and obj.model.value in ModelType.bootstrap_models()
+            and obj.model.value in ModelType.bootstrap_models_set()
         ):
             key = obj.model.value + "s"
             if not self.api.ignore_unadopted or (
@@ -387,7 +394,7 @@ class Bootstrap(ProtectBaseObject):
                 getattr(self, key)[obj.id] = obj
                 ref = ProtectDeviceRef(model=obj.model, id=obj.id)
                 self.id_lookup[obj.id] = ref
-                self.mac_lookup[obj.mac.lower().replace(":", "")] = ref
+                self.mac_lookup[normalize_mac(obj.mac)] = ref
         else:
             _LOGGER.debug("Unexpected bootstrap model type for add: %s", obj.model)
             return None
@@ -403,23 +410,19 @@ class Bootstrap(ProtectBaseObject):
             new_obj=obj,
         )
 
-    def _process_remove_packet(
-        self,
-        packet: WSPacket,
-        data: dict[str, Any] | None,
-    ) -> WSSubscriptionMessage | None:
-        model = packet.action_frame.data.get("modelKey")
-        device_id = packet.action_frame.data.get("id")
+    def _process_remove_packet(self, packet: WSPacket) -> WSSubscriptionMessage | None:
+        model: str | None = packet.action_frame.data.get("modelKey")
         devices = getattr(self, f"{model}s", None)
 
         if devices is None:
             return None
 
+        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:
             return None
-        self.mac_lookup.pop(device.mac.lower().replace(":", ""), None)
+        self.mac_lookup.pop(normalize_mac(device.mac), None)
 
         self._create_stat(packet, None, False)
         return WSSubscriptionMessage(
@@ -489,12 +492,11 @@ class Bootstrap(ProtectBaseObject):
 
         key = f"{model_type}s"
         devices = getattr(self, key)
-        if action["id"] in devices:
-            if action["id"] not in devices:
-                raise ValueError(
-                    f"Unknown device update for {model_type}: { action['id']}",
-                )
-            obj: ProtectModelWithId = devices[action["id"]]
+        action_id: str = action["id"]
+        if action_id in devices:
+            if action_id not in devices:
+                raise ValueError(f"Unknown device update for {model_type}: {action_id}")
+            obj: ProtectModelWithId = devices[action_id]
             data = obj.unifi_dict_to_dict(data)
             old_obj = obj.copy()
             obj = obj.update_from_dict(deepcopy(data))
@@ -517,7 +519,7 @@ class Bootstrap(ProtectBaseObject):
                 if is_recent:
                     obj.set_alarm_timeout()
 
-            devices[action["id"]] = obj
+            devices[action_id] = obj
 
             self._create_stat(packet, data, False)
             return WSSubscriptionMessage(
@@ -529,8 +531,8 @@ class Bootstrap(ProtectBaseObject):
             )
 
         # ignore updates to events that phase out
-        if model_type != ModelType.EVENT.value:
-            _LOGGER.debug("Unexpected %s: %s", key, action["id"])
+        if model_type != _ModelType_Event_value:
+            _LOGGER.debug("Unexpected %s: %s", key, action_id)
         return None
 
     def process_ws_packet(
@@ -557,7 +559,7 @@ class Bootstrap(ProtectBaseObject):
 
         action_action: str = action["action"]
         if action_action == "remove":
-            return self._process_remove_packet(packet, data)
+            return self._process_remove_packet(packet)
 
         if not data:
             self._create_stat(packet, None, True)
@@ -596,7 +598,7 @@ class Bootstrap(ProtectBaseObject):
         else:
             try:
                 model_type = ModelType(action["modelKey"])
-                device_id = action["id"]
+                device_id: str = action["id"]
                 task = asyncio.create_task(self.refresh_device(model_type, device_id))
                 self._refresh_tasks.add(task)
                 task.add_done_callback(self._refresh_tasks.discard)

{uiprotect-0.11.0 → uiprotect-0.13.0}/src/uiprotect/utils.py

@@ -624,3 +624,9 @@ def clamp_value(value: float, step_size: float) -> float:
     """Clamps value to multiples of step size."""
     ratio = 1 / step_size
     return int(value * ratio) / ratio
+
+
+@lru_cache(maxsize=1024)
+def normalize_mac(mac: str) -> str:
+    """Normalize MAC address."""
+    return mac.lower().replace(":", "").replace("-", "").replace("_", "")