uiprotect 5.0.0__py3-none-any.whl → 5.2.0__py3-none-any.whl

uiprotect/data/bootstrap.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 import logging
-from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
 from typing import TYPE_CHECKING, Any
@@ -399,7 +398,7 @@ class Bootstrap(ProtectBaseObject):
             return None
 
         old_nvr = self.nvr.copy()
-        self.nvr = self.nvr.update_from_dict(deepcopy(data))
+        self.nvr = self.nvr.update_from_dict(data)
 
         return WSSubscriptionMessage(
             action=WSAction.UPDATE,
@@ -455,7 +454,7 @@ class Bootstrap(ProtectBaseObject):
             return None
 
         old_obj = obj.copy()
-        obj = obj.update_from_dict(deepcopy(data))
+        obj = obj.update_from_dict(data)
 
         if model_type is ModelType.EVENT:
             if TYPE_CHECKING:

uiprotect/data/devices.py

@@ -1090,11 +1090,12 @@ class Camera(ProtectMotionDeviceModel):
         return updated
 
     def update_from_dict(self, data: dict[str, Any]) -> Camera:
-        # a message in the past is actually a singal to wipe the message
-        reset_at = data.get("lcd_message", {}).get("reset_at")
-        if reset_at is not None:
-            reset_at = from_js_time(reset_at)
-            if utc_now() > reset_at:
+        # a message in the past is actually a signal to wipe the message
+        if (reset_at := data.get("lcd_message", {}).get("reset_at")) is not None:
+            if utc_now() > from_js_time(reset_at):
+                # Important: Make a copy of the data before modifying it
+                # since unifi_dict_to_dict will otherwise report incorrect changes
+                data = data.copy()
                 data["lcd_message"] = None
 
         return super().update_from_dict(data)
@@ -1134,11 +1135,9 @@ class Camera(ProtectMotionDeviceModel):
         smart_type: SmartDetectObjectType,
     ) -> Event | None:
         """Get the last smart detect event for given type."""
-        event_id = self.last_smart_detect_event_ids.get(smart_type)
-        if event_id is None:
-            return None
-
-        return self._api.bootstrap.events.get(event_id)
+        if event_id := self.last_smart_detect_event_ids.get(smart_type):
+            return self._api.bootstrap.events.get(event_id)
+        return None
 
     @property
     def last_smart_audio_detect_event(self) -> Event | None:
@@ -1222,19 +1221,20 @@ class Camera(ProtectMotionDeviceModel):
         """Get active smart detection types."""
         if self.use_global:
             return set(self.smart_detect_settings.object_types).intersection(
-                self.feature_flags.smart_detect_types,
+                self.feature_flags.smart_detect_types
             )
         return set(self.smart_detect_settings.object_types)
 
     @property
     def active_audio_detect_types(self) -> set[SmartDetectAudioType]:
         """Get active audio detection types."""
+        if not (enabled_audio_types := self.smart_detect_settings.audio_types):
+            return set()
         if self.use_global:
-            return set(self.smart_detect_settings.audio_types or []).intersection(
-                self.feature_flags.smart_detect_audio_types or [],
-            )
-
-        return set(self.smart_detect_settings.audio_types or [])
+            if not (feature_audio_types := self.feature_flags.smart_detect_audio_types):
+                return set()
+            return set(feature_audio_types).intersection(enabled_audio_types)
+        return set(enabled_audio_types)
 
     @property
     def is_motion_detection_on(self) -> bool:

{uiprotect-5.0.0.dist-info → uiprotect-5.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 5.0.0
+Version: 5.2.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers

{uiprotect-5.0.0.dist-info → uiprotect-5.2.0.dist-info}/RECORD

@@ -15,9 +15,9 @@ 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=J2ytJqWJIsFq7vXYG4gfp2c-mrj5gqa3UhmItF0MWbI,35033
-uiprotect/data/bootstrap.py,sha256=l1r2eHsjdE6subYAllvdaXOs26-dQDcnrDBxF2fenbI,20500
+uiprotect/data/bootstrap.py,sha256=OSPHu08p7Ys9KqEb8sq_LFufuECtF4lY7OnAYK27ngo,20454
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
-uiprotect/data/devices.py,sha256=VRehNQHJFefwnAfBwC72QG5tzs5z86uOAfbr9Fu4R2g,109832
+uiprotect/data/devices.py,sha256=aMGxB-6iX9kduYNQj4PKhS1oI76POiXz5gWECEcZCQM,110062
 uiprotect/data/nvr.py,sha256=8M-62AG4q1k71eX-DaFcdO52QWG4zO9X5Voj0Tj9D5A,46598
 uiprotect/data/types.py,sha256=3CocULpkdTgF4is1nIEDYIlwf2EOkNNM7L4kJ7NkAwM,17654
 uiprotect/data/user.py,sha256=YvgXJKV4_y-bm0eySWz9f_ie9aR5lpVn17t9H0Pix8I,6998
@@ -30,8 +30,8 @@ uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwTo
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=9ny9-GMn5Fpnxaw9i769VTIDp4ntfgiCCItqJYWepns,19769
 uiprotect/websocket.py,sha256=D5DZrMzo434ecp8toNxOB5HM193kVwYw42yEcg99yMw,8029
-uiprotect-5.0.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-5.0.0.dist-info/METADATA,sha256=wE8gx41SJjaYT-w5RA_6a-qZoauXYIxEqFKG1X1Se_4,11009
-uiprotect-5.0.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-5.0.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-5.0.0.dist-info/RECORD,,
+uiprotect-5.2.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-5.2.0.dist-info/METADATA,sha256=vUJTI2o1QhkwEAiIn4DYbAWy36F-a8cJeOFr-IHmLh8,11009
+uiprotect-5.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-5.2.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-5.2.0.dist-info/RECORD,,