uiprotect 4.2.0__tar.gz → 5.1.0__tar.gz

{uiprotect-4.2.0 → uiprotect-5.1.0}/PKG-INFO

@@ -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 → uiprotect-5.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "4.2.0"
+version = "5.1.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 readme = "README.md"
@@ -48,8 +48,8 @@ typer = ">=0.12.3"
 convertertools = ">=0.5.0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.0"
-pytest-cov = "^3.0"
+pytest = ">=7,<9"
+pytest-cov = ">=3,<6"
 aiosqlite = ">=0.20.0"
 asttokens = "^2.4.1"
 pytest-asyncio = "^0.23.7"
@@ -57,7 +57,7 @@ pytest-benchmark = "^4.0.0"
 pytest-sugar = "^1.0.0"
 pytest-timeout = "^2.3.1"
 pytest-xdist = "^3.6.1"
-types-aiofiles = "^23.2.0.20240403"
+types-aiofiles = ">=23.2.0.20240403,<25.0.0.0"
 types-dateparser = "^1.2.0.20240420"
 mypy = "^1.10.0"
 
@@ -146,6 +146,7 @@ ignore = [
     "D106", # Missing docstring in public nested class
     "UP007", # typer needs Optional syntax
     "UP038", # Use `X | Y` in `isinstance` is slower
+    "S603", #  check for execution of untrusted input
 ]
 select = [
     "B",   # flake8-bugbear

{uiprotect-4.2.0 → uiprotect-5.1.0}/src/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-4.2.0 → uiprotect-5.1.0}/src/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-4.2.0 → uiprotect-5.1.0}/src/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-4.2.0 → uiprotect-5.1.0}/src/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(".")))