uiprotect 4.2.0__py3-none-any.whl → 5.1.0__py3-none-any.whl

uiprotect/__init__.py

@@ -7,7 +7,6 @@ from .exceptions import Invalid, NotAuthorized, NvrError
 from .utils import (
     get_nested_attr,
     get_nested_attr_as_bool,
-    get_top_level_attr,
     get_top_level_attr_as_bool,
     make_enabled_getter,
     make_required_getter,
@@ -21,7 +20,6 @@ __all__ = [
     "ProtectApiClient",
     "get_nested_attr",
     "get_nested_attr_as_bool",
-    "get_top_level_attr",
     "get_top_level_attr_as_bool",
     "make_value_getter",
     "make_enabled_getter",

uiprotect/data/devices.py

@@ -1134,11 +1134,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 +1220,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/test_util/__init__.py

@@ -359,7 +359,7 @@ class SampleDataGenerator:
         length = int((motion_event["end"] - motion_event["start"]) / 1000)
         if self.anonymize:
             run(
-                split(  # noqa: S603
+                split(
                     BLANK_VIDEO_CMD.format(
                         length=length,
                         filename=self.output_folder / f"{filename}.mp4",

uiprotect/utils.py

@@ -634,7 +634,7 @@ def get_nested_attr(attrs: tuple[str, ...], obj: Any) -> Any:
     for key in attrs:
         if (value := getattr(value, key, _SENTINEL)) is _SENTINEL:
             return None
-    return value.value if isinstance(value, Enum) else value
+    return value
 
 
 def get_nested_attr_as_bool(attrs: tuple[str, ...], obj: Any) -> bool:
@@ -643,25 +643,18 @@ def get_nested_attr_as_bool(attrs: tuple[str, ...], obj: Any) -> bool:
     for key in attrs:
         if (value := getattr(value, key, _SENTINEL)) is _SENTINEL:
             return False
-    return bool(value.value if isinstance(value, Enum) else value)
-
-
-def get_top_level_attr(attr: str, obj: Any) -> Any:
-    """Fetch a top level attribute."""
-    value = getattr(obj, attr)
-    return value.value if isinstance(value, Enum) else value
+    return bool(value)
 
 
 def get_top_level_attr_as_bool(attr: str, obj: Any) -> Any:
     """Fetch a top level attribute as a bool."""
-    value = getattr(obj, attr)
-    return bool(value.value if isinstance(value, Enum) else value)
+    return bool(getattr(obj, attr))
 
 
 def make_value_getter(ufp_value: str) -> Callable[[T], Any]:
     """Return a function to get a value from a Protect device."""
     if "." not in ufp_value:
-        return partial(get_top_level_attr, ufp_value)
+        return attrgetter(ufp_value)
     return partial(get_nested_attr, tuple(ufp_value.split(".")))
 
 

{uiprotect-4.2.0.dist-info → uiprotect-5.1.0.dist-info}/METADATA

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

{uiprotect-4.2.0.dist-info → uiprotect-5.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-uiprotect/__init__.py,sha256=UdpRSSLSy7pdDfTKf0zRIfy6KRGt_Jv-fMzYWgibbG4,686
+uiprotect/__init__.py,sha256=GDRM9WvWUBbOyBVgltq6Qv8i7LVdWEbG8q5EzYvOFbE,636
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
 uiprotect/api.py,sha256=8zfSeqDKArG2pbvImqibQx4HrMi_y06fYXrgcwYztCc,67585
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
@@ -17,7 +17,7 @@ uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,29
 uiprotect/data/base.py,sha256=J2ytJqWJIsFq7vXYG4gfp2c-mrj5gqa3UhmItF0MWbI,35033
 uiprotect/data/bootstrap.py,sha256=l1r2eHsjdE6subYAllvdaXOs26-dQDcnrDBxF2fenbI,20500
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
-uiprotect/data/devices.py,sha256=VRehNQHJFefwnAfBwC72QG5tzs5z86uOAfbr9Fu4R2g,109832
+uiprotect/data/devices.py,sha256=GdoDXVkiIvJQExoe8km94cdLkdESJzhsiWquBswBaqA,109917
 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
@@ -26,12 +26,12 @@ uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
 uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,386
 uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
-uiprotect/test_util/__init__.py,sha256=whiOUb5LfDLNT3AQG6ISiKtAqO2JnhCIdFavhWDK46M,18718
+uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwToAI,18704
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=G0WkMXpCky2Cc4jynFDFFxAcVaZX4F01OXKa6cx9pho,20121
+uiprotect/utils.py,sha256=9ny9-GMn5Fpnxaw9i769VTIDp4ntfgiCCItqJYWepns,19769
 uiprotect/websocket.py,sha256=D5DZrMzo434ecp8toNxOB5HM193kVwYw42yEcg99yMw,8029
-uiprotect-4.2.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-4.2.0.dist-info/METADATA,sha256=0Wq8hI7efhmNMHGUJQQvDtN5WeB0tIAdNwbRnYNsIZ0,11009
-uiprotect-4.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-4.2.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-4.2.0.dist-info/RECORD,,
+uiprotect-5.1.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-5.1.0.dist-info/METADATA,sha256=OQVQsAbczGehKhrGAdgPEVikjg7I4hYWNdhRIyE-WJw,11009
+uiprotect-5.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-5.1.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-5.1.0.dist-info/RECORD,,