uiprotect 6.6.2__py3-none-any.whl → 6.6.4__py3-none-any.whl

uiprotect/__init__.py

@@ -21,7 +21,7 @@ __all__ = [
     "get_nested_attr",
     "get_nested_attr_as_bool",
     "get_top_level_attr_as_bool",
-    "make_value_getter",
     "make_enabled_getter",
     "make_required_getter",
+    "make_value_getter",
 ]

uiprotect/api.py

@@ -12,7 +12,7 @@ import time
 from collections.abc import Callable
 from datetime import datetime, timedelta
 from functools import partial
-from http import HTTPStatus
+from http import HTTPStatus, cookies
 from http.cookies import Morsel, SimpleCookie
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
@@ -67,9 +67,7 @@ from .utils import (
 )
 from .websocket import Websocket, WebsocketState
 
-if sys.version_info[:2] < (3, 13):
-    from http import cookies
-
+if "partitioned" not in cookies.Morsel._reserved:  # type: ignore[attr-defined]
     # See: https://github.com/python/cpython/issues/112713
     cookies.Morsel._reserved["partitioned"] = "partitioned"  # type: ignore[attr-defined]
     cookies.Morsel._flags.add("partitioned")  # type: ignore[attr-defined]

uiprotect/data/devices.py

@@ -2014,17 +2014,18 @@ class Camera(ProtectMotionDeviceModel):
         Datetime of screenshot is approximate. It may be +/- a few seconds.
         """
         # Use READ_LIVE if dt is None, otherwise READ_MEDIA
-        permission = (
-            PermissionNode.READ_LIVE if dt is None else PermissionNode.READ_MEDIA
-        )
-        if not self._api.bootstrap.auth_user.can(
-            ModelType.CAMERA,
-            permission,
-            self,
-        ):
-            action = "read live" if dt is None else "read media"
+        auth_user = self._api.bootstrap.auth_user
+        if dt is None:
+            if not (
+                auth_user.can(ModelType.CAMERA, PermissionNode.READ_LIVE, self)
+                or auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self)
+            ):
+                raise NotAuthorized(
+                    f"Do not have permission to read live or media for camera: {self.id}"
+                )
+        elif not auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self):
             raise NotAuthorized(
-                f"Do not have permission to {action} for camera: {self.id}"
+                f"Do not have permission to read media for camera: {self.id}"
             )
 
         if height is None and width is None and self.high_camera_channel is not None:
@@ -2046,18 +2047,19 @@ class Camera(ProtectMotionDeviceModel):
         if not self.feature_flags.has_package_camera:
             raise BadRequest("Device does not have package camera")
 
+        auth_user = self._api.bootstrap.auth_user
         # Use READ_LIVE if dt is None, otherwise READ_MEDIA
-        permission = (
-            PermissionNode.READ_LIVE if dt is None else PermissionNode.READ_MEDIA
-        )
-        if not self._api.bootstrap.auth_user.can(
-            ModelType.CAMERA,
-            permission,
-            self,
-        ):
-            action = "read live" if dt is None else "read media"
+        if dt is None:
+            if not (
+                auth_user.can(ModelType.CAMERA, PermissionNode.READ_LIVE, self)
+                or auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self)
+            ):
+                raise NotAuthorized(
+                    f"Do not have permission to read live or media for camera: {self.id}"
+                )
+        elif not auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self):
             raise NotAuthorized(
-                f"Do not have permission to {action} for camera: {self.id}"
+                f"Do not have permission to read media for camera: {self.id}"
             )
 
         if height is None and width is None and self.package_camera_channel is not None:

{uiprotect-6.6.2.dist-info → uiprotect-6.6.4.dist-info}/METADATA

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

{uiprotect-6.6.2.dist-info → uiprotect-6.6.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-uiprotect/__init__.py,sha256=GDRM9WvWUBbOyBVgltq6Qv8i7LVdWEbG8q5EzYvOFbE,636
+uiprotect/__init__.py,sha256=Oz6i1tonIz4QWVnEPkbielJDJ3WQdwZVgYtjY4IwGAQ,636
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
 uiprotect/_compat.py,sha256=HThmb1zQZCEssCxYYbQzFhJq8zYYlVaSnIEZabKc-6U,302
-uiprotect/api.py,sha256=RkaGtvzIkWg0OCM429uKnqklHbqruCjVTwo-iEo5uKU,67954
+uiprotect/api.py,sha256=Gc_x8mo-W-xtEFAhRIkiQyW99MJQgWdkkXlKxl3h-JU,67978
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=k-_qGuNT7br0iV0KE5F4wYXF75iyLLjBEckTqxC71xM,7591
@@ -18,7 +18,7 @@ uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,29
 uiprotect/data/base.py,sha256=sn7IHKQN96uiZL6ImN1gdCHV97EpUmy-X7xWTUAtWsg,35054
 uiprotect/data/bootstrap.py,sha256=iROUw-pPdJpytaV8Dg5peOJotI7jidXJABsEzCQGid8,20704
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
-uiprotect/data/devices.py,sha256=H3ioGq8Px_McyrLykAcA2gAtTmkpsd6DdKX0XdDNpL4,113041
+uiprotect/data/devices.py,sha256=KIk4o1mhE7EruhuwroyoBf2kLOCTh0-LYBa7yaqk1bU,113421
 uiprotect/data/nvr.py,sha256=FGI0eIAyy3Zy9kaxcr67HxwaVCUU8wq3oZyWvoDq7Sg,47251
 uiprotect/data/types.py,sha256=PA9YOEJCmh9DAlJajHh2Y6hi4aTjlQ8LhWN8ZH5x7Fc,18522
 uiprotect/data/user.py,sha256=1o5gyPHafn4lHARpoSMD_NWbo5IbzGPfiSASwqqDvWs,7002
@@ -31,8 +31,8 @@ uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwTo
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=jIWT7n_reL90oY91svBfQ4naRxo28qHzP5jNOL12mQE,20342
 uiprotect/websocket.py,sha256=tEyenqblNXHcjWYuf4oRP1E7buNwx6zoECMwpBr-jig,8191
-uiprotect-6.6.2.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-6.6.2.dist-info/METADATA,sha256=xUdjKyhJ_-hA0KUUdzYxlbQlC3clFxToPZc11A8iSCc,11096
-uiprotect-6.6.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uiprotect-6.6.2.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-6.6.2.dist-info/RECORD,,
+uiprotect-6.6.4.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-6.6.4.dist-info/METADATA,sha256=I5I00-fRjsppSQH_SgW27u4_fAmaH4yDJo_OAlTvRfM,11096
+uiprotect-6.6.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uiprotect-6.6.4.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-6.6.4.dist-info/RECORD,,