uiprotect 5.2.1__tar.gz → 5.3.0__tar.gz

{uiprotect-5.2.1 → uiprotect-5.3.0}/PKG-INFO

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

{uiprotect-5.2.1 → uiprotect-5.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "5.2.1"
+version = "5.3.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 readme = "README.md"

{uiprotect-5.2.1 → uiprotect-5.3.0}/src/uiprotect/api.py

@@ -1401,21 +1401,20 @@ class ProtectApiClient(BaseApiClient):
 
         Datetime of screenshot is approximate. It may be +/- a few seconds.
         """
-        params = {
-            "ts": to_js_time(dt or utc_now()),
-            "force": "true",
-        }
+        params: dict[str, Any] = {}
+        if dt is not None:
+            path = "recording-snapshot"
+            params["ts"] = to_js_time(dt)
+        else:
+            path = "snapshot"
+            params["ts"] = int(time.time() * 1000)
+            params["force"] = "true"
 
         if width is not None:
-            params.update({"w": width})
+            params["w"] = width
 
         if height is not None:
-            params.update({"h": height})
-
-        path = "snapshot"
-        if dt is not None:
-            path = "recording-snapshot"
-            del params["force"]
+            params["h"] = height
 
         return await self.api_request_raw(
             f"cameras/{camera_id}/{path}",
@@ -1435,22 +1434,21 @@ class ProtectApiClient(BaseApiClient):
 
         Datetime of screenshot is approximate. It may be +/- a few seconds.
         """
-        params = {
-            "ts": to_js_time(dt or utc_now()),
-            "force": "true",
-        }
+        params: dict[str, Any] = {}
+        if dt is not None:
+            path = "recording-snapshot"
+            params["ts"] = to_js_time(dt)
+            params["lens"] = 2
+        else:
+            path = "package-snapshot"
+            params["ts"] = int(time.time() * 1000)
+            params["force"] = "true"
 
         if width is not None:
-            params.update({"w": width})
+            params["w"] = width
 
         if height is not None:
-            params.update({"h": height})
-
-        path = "package-snapshot"
-        if dt is not None:
-            path = "recording-snapshot"
-            del params["force"]
-            params.update({"lens": 2})
+            params["h"] = height
 
         return await self.api_request_raw(
             f"cameras/{camera_id}/{path}",

{uiprotect-5.2.1 → uiprotect-5.3.0}/src/uiprotect/data/devices.py

@@ -7,7 +7,7 @@ import logging
 import warnings
 from collections.abc import Callable
 from datetime import datetime, timedelta
-from functools import cache
+from functools import cache, lru_cache
 from ipaddress import IPv4Address
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, cast
@@ -25,6 +25,7 @@ from ..utils import (
     convert_video_modes,
     from_js_time,
     serialize_point,
+    timedelta_total_seconds,
     to_js_time,
     utc_now,
 )
@@ -900,6 +901,15 @@ class CameraAudioSettings(ProtectBaseObject):
     style: list[AudioStyle]
 
 
+@lru_cache
+def _chime_type_from_total_seconds(total_seconds: float) -> ChimeType:
+    if total_seconds == 0.3:
+        return ChimeType.MECHANICAL
+    if total_seconds > 0.3:
+        return ChimeType.DIGITAL
+    return ChimeType.NONE
+
+
 class Camera(ProtectMotionDeviceModel):
     is_deleting: bool
     # Microphone Sensitivity
@@ -1855,11 +1865,13 @@ class Camera(ProtectMotionDeviceModel):
 
     @property
     def chime_type(self) -> ChimeType:
-        if self.chime_duration.total_seconds() == 0.3:
-            return ChimeType.MECHANICAL
-        if self.chime_duration.total_seconds() > 0.3:
-            return ChimeType.DIGITAL
-        return ChimeType.NONE
+        return _chime_type_from_total_seconds(
+            timedelta_total_seconds(self.chime_duration)
+        )
+
+    @property
+    def chime_duration_seconds(self) -> float:
+        return timedelta_total_seconds(self.chime_duration)
 
     @property
     def is_digital_chime(self) -> bool:

{uiprotect-5.2.1 → uiprotect-5.3.0}/src/uiprotect/data/types.py

@@ -111,6 +111,16 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
         """Return the devices key."""
         return f"{self.value}s"
 
+    @cached_property
+    def name(self) -> str:
+        """Return the name."""
+        return self._name_
+
+    @cached_property
+    def value(self) -> str:
+        """Return the value."""
+        return self._value_
+
     @classmethod
     @cache
     def from_string(cls, value: str) -> ModelType:
@@ -575,6 +585,16 @@ class PermissionNode(str, UnknownValuesEnumMixin, enum.Enum):
     READ_LIVE = "readlive"
     UNKNOWN = "unknown"
 
+    @cached_property
+    def name(self) -> str:
+        """Return the name."""
+        return self._name_
+
+    @cached_property
+    def value(self) -> str:
+        """Return the value."""
+        return self._value_
+
 
 @enum.unique
 class HDRMode(str, UnknownValuesEnumMixin, enum.Enum):

{uiprotect-5.2.1 → uiprotect-5.3.0}/src/uiprotect/data/user.py

@@ -210,7 +210,7 @@ class User(ProtectModelWithId):
     ) -> bool:
         """Checks if a user can do a specific action"""
         check_self = False
-        if model == self.model and obj is not None and obj.id == self.id:
+        if model is self.model and obj is not None and obj.id == self.id:
             perm_str = f"{model.value}:{node.value}:$"
             check_self = True
         else:
@@ -221,7 +221,7 @@ class User(ProtectModelWithId):
             return self._perm_cache[perm_str]
 
         for perm in self.all_permissions:
-            if model != perm.model or node not in perm.nodes:
+            if model is not perm.model or node not in perm.nodes:
                 continue
             if perm.obj_ids is None:
                 self._perm_cache[perm_str] = True

{uiprotect-5.2.1 → uiprotect-5.3.0}/src/uiprotect/utils.py

@@ -670,3 +670,8 @@ def make_required_getter(ufp_required_field: str) -> Callable[[T], bool]:
     if "." not in ufp_required_field:
         return partial(get_top_level_attr_as_bool, ufp_required_field)
     return partial(get_nested_attr_as_bool, tuple(ufp_required_field.split(".")))
+
+
+@lru_cache
+def timedelta_total_seconds(td: timedelta) -> float:
+    return td.total_seconds()