uiprotect 3.6.0__tar.gz → 3.7.0__tar.gz

{uiprotect-3.6.0 → uiprotect-3.7.0}/PKG-INFO

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

{uiprotect-3.6.0 → uiprotect-3.7.0}/pyproject.toml

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

{uiprotect-3.6.0 → uiprotect-3.7.0}/src/uiprotect/data/nvr.py

@@ -1024,7 +1024,7 @@ class NVR(ProtectDeviceModel):
 
     @property
     def is_analytics_enabled(self) -> bool:
-        return self.analytics_data != AnalyticsOption.NONE
+        return self.analytics_data is not AnalyticsOption.NONE
 
     @property
     def protect_url(self) -> str:
@@ -1037,7 +1037,7 @@ class NVR(ProtectDeviceModel):
     @property
     def vault_cameras(self) -> list[Camera]:
         """Vault Cameras for NVR"""
-        if len(self.vault_camera_ids) == 0:
+        if not self.vault_camera_ids:
             return []
         return [self._api.bootstrap.cameras[c] for c in self.vault_camera_ids]
 
@@ -1050,32 +1050,34 @@ class NVR(ProtectDeviceModel):
         motion/smart detection events.
         """
         return (
-            self.global_camera_settings is not None
-            and self.global_camera_settings.recording_settings.mode
+            (global_camera_settings := self.global_camera_settings) is not None
+            and global_camera_settings.recording_settings.mode
             is not RecordingMode.NEVER
         )
 
     @property
     def is_smart_detections_enabled(self) -> bool:
         """If smart detected enabled globally."""
-        return self.smart_detection is not None and self.smart_detection.enable
+        return (
+            smart_detection := self.smart_detection
+        ) is not None and smart_detection.enable
 
     @property
     def is_license_plate_detections_enabled(self) -> bool:
         """If smart detected enabled globally."""
         return (
-            self.smart_detection is not None
-            and self.smart_detection.enable
-            and self.smart_detection.license_plate_recognition
+            (smart_detection := self.smart_detection) is not None
+            and smart_detection.enable
+            and smart_detection.license_plate_recognition
         )
 
     @property
     def is_face_detections_enabled(self) -> bool:
         """If smart detected enabled globally."""
         return (
-            self.smart_detection is not None
-            and self.smart_detection.enable
-            and self.smart_detection.face_recognition
+            (smart_detection := self.smart_detection) is not None
+            and smart_detection.enable
+            and smart_detection.face_recognition
         )
 
     def update_all_messages(self) -> None:
@@ -1309,9 +1311,8 @@ class NVR(ProtectDeviceModel):
     def _is_smart_enabled(self, smart_type: SmartDetectObjectType) -> bool:
         return (
             self.is_global_recording_enabled
-            and self.global_camera_settings is not None
-            and smart_type
-            in self.global_camera_settings.smart_detect_settings.object_types
+            and (global_camera_settings := self.global_camera_settings) is not None
+            and smart_type in global_camera_settings.smart_detect_settings.object_types
         )
 
     @property
@@ -1326,11 +1327,13 @@ class NVR(ProtectDeviceModel):
     def is_global_person_tracking_enabled(self) -> bool:
         """Is person tracking enabled"""
         return (
-            self.global_camera_settings is not None
-            and self.global_camera_settings.smart_detect_settings.auto_tracking_object_types
+            (global_camera_settings := self.global_camera_settings) is not None
+            and (
+                auto_tracking_object_types
+                := global_camera_settings.smart_detect_settings.auto_tracking_object_types
+            )
             is not None
-            and SmartDetectObjectType.PERSON
-            in self.global_camera_settings.smart_detect_settings.auto_tracking_object_types
+            and SmartDetectObjectType.PERSON in auto_tracking_object_types
         )
 
     @property
@@ -1366,15 +1369,15 @@ class NVR(ProtectDeviceModel):
         return self._is_smart_enabled(SmartDetectObjectType.ANIMAL)
 
     def _is_audio_enabled(self, smart_type: SmartDetectObjectType) -> bool:
-        audio_type = smart_type.audio_type
         return (
-            audio_type is not None
+            (audio_type := smart_type.audio_type) is not None
             and self.is_global_recording_enabled
-            and self.global_camera_settings is not None
-            and self.global_camera_settings.smart_detect_settings.audio_types
+            and (global_camera_settings := self.global_camera_settings) is not None
+            and (
+                audio_types := global_camera_settings.smart_detect_settings.audio_types
+            )
             is not None
-            and audio_type
-            in self.global_camera_settings.smart_detect_settings.audio_types
+            and audio_type in audio_types
         )
 
     @property

{uiprotect-3.6.0 → uiprotect-3.7.0}/src/uiprotect/data/websocket.py

@@ -46,8 +46,12 @@ class WSSubscriptionMessage:
     old_obj: ProtectModelWithId | None = None
 
 
+_PACKET_STRUCT = struct.Struct("!bbbbi")
+
+
 class BaseWSPacketFrame:
-    UNPACK_FORMAT = struct.Struct("!bbbbi")
+    unpack = _PACKET_STRUCT.unpack
+    pack = _PACKET_STRUCT.pack
 
     data: Any
     position: int = 0
@@ -102,7 +106,7 @@ class BaseWSPacketFrame:
                 deflated,
                 unknown,
                 payload_size,
-            ) = BaseWSPacketFrame.UNPACK_FORMAT.unpack(
+            ) = BaseWSPacketFrame.unpack(
                 data[position:header_end],
             )
         except struct.error as e:
@@ -134,8 +138,7 @@ class BaseWSPacketFrame:
             raise WSEncodeError("No header to encode")
 
         data = self.get_binary_from_data()
-        header = struct.pack(
-            "!bbbbi",
+        header = self.pack(
             self.header.packet_type,
             self.header.payload_format,
             self.header.deflated,