uiprotect 3.6.0__tar.gz → 3.8.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 3.6.0
+Version: 3.8.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.8.0}/pyproject.toml

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

{uiprotect-3.6.0 → uiprotect-3.8.0}/src/uiprotect/api.py

@@ -1815,7 +1815,6 @@ class ProtectApiClient(BaseApiClient):
         except (
             TimeoutError,
             asyncio.TimeoutError,
-            asyncio.CancelledError,
             aiohttp.ServerDisconnectedError,
             client_exceptions.ClientError,
         ) as err:

{uiprotect-3.6.0 → uiprotect-3.8.0}/src/uiprotect/data/base.py

@@ -647,7 +647,7 @@ class ProtectModelWithId(ProtectModel):
                 await self._update_sync.event.wait()
             self._update_sync.event.clear()
             return
-        except (TimeoutError, asyncio.TimeoutError, asyncio.CancelledError):
+        except (TimeoutError, asyncio.TimeoutError):
             async with self._update_sync.lock:
                 # Important! Now that we have the lock, we yield to the event loop so any
                 # updates from the websocket are processed before we generate the diff

{uiprotect-3.6.0 → uiprotect-3.8.0}/src/uiprotect/data/bootstrap.py

@@ -560,34 +560,38 @@ class Bootstrap(ProtectBaseObject):
                         model_type, action, data, ignore_stats, is_ping_back
                     )
         except (ValidationError, ValueError) as err:
-            self._handle_ws_error(action, err)
+            self._handle_ws_error(action_action, model_type, action, err)
 
         _LOGGER.debug(
             "Unexpected bootstrap model type deviceadoptedfor update: %s", model_key
         )
         return None
 
-    def _handle_ws_error(self, action: dict[str, Any], err: Exception) -> None:
+    def _handle_ws_error(
+        self,
+        action_action: str,
+        model_type: ModelType,
+        action: dict[str, Any],
+        err: Exception,
+    ) -> None:
         msg = ""
-        if action["modelKey"] == "event":
-            msg = f"Validation error processing event: {action['id']}. Ignoring event."
+        device_id: str = action["id"]
+        if model_type is ModelType.EVENT:
+            msg = f"Validation error processing event: {device_id}. Ignoring event."
         else:
-            try:
-                model_type = ModelType.from_string(action["modelKey"])
-                device_id: str = action["id"]
-                task = asyncio.create_task(self.refresh_device(model_type, device_id))
-                self._refresh_tasks.add(task)
-                task.add_done_callback(self._refresh_tasks.discard)
-            except (ValueError, IndexError):
-                msg = f"{action['action']} packet caused invalid state. Unable to refresh device."
-            else:
-                msg = f"{action['action']} packet caused invalid state. Refreshing device: {model_type} {device_id}"
+            task = asyncio.create_task(self.refresh_device(model_type, device_id))
+            self._refresh_tasks.add(task)
+            task.add_done_callback(self._refresh_tasks.discard)
+            msg = (
+                f"{action_action} packet caused invalid state. "
+                f"Refreshing device: {model_type} {device_id}"
+            )
         _LOGGER.debug("%s Error: %s", msg, err)
 
     async def refresh_device(self, model_type: ModelType, device_id: str) -> None:
         """Refresh a device in the bootstrap."""
         try:
-            if model_type == ModelType.NVR:
+            if model_type is ModelType.NVR:
                 device: ProtectModelWithId = await self._api.get_nvr()
             else:
                 device = await self._api.get_device(model_type, device_id)
@@ -595,7 +599,6 @@ class Bootstrap(ProtectBaseObject):
             ValidationError,
             TimeoutError,
             asyncio.TimeoutError,
-            asyncio.CancelledError,
             ClientError,
             ServerDisconnectedError,
         ):

{uiprotect-3.6.0 → uiprotect-3.8.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.8.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,

{uiprotect-3.6.0 → uiprotect-3.8.0}/src/uiprotect/utils.py

@@ -201,11 +201,14 @@ def to_camel_case(name: str) -> str:
     return name
 
 
+_EMPTY_UUID = UUID("0" * 32)
+
+
 def convert_unifi_data(value: Any, field: ModelField) -> Any:
     """Converts value from UFP data into pydantic field class"""
     type_ = field.type_
 
-    if type_ == Any:
+    if type_ is Any:
         return value
 
     shape = field.shape
@@ -222,7 +225,7 @@ def convert_unifi_data(value: Any, field: ModelField) -> Any:
                 return ip_address(value)
             except ValueError:
                 return value
-        if type_ == datetime:
+        if type_ is datetime:
             return from_js_time(value)
         if type_ in _CREATE_TYPES or _is_enum_type(type_):
             # cannot do this check too soon because some types cannot be used in isinstance
@@ -230,8 +233,8 @@ def convert_unifi_data(value: Any, field: ModelField) -> Any:
                 return value
             # handle edge case for improperly formatted UUIDs
             # 00000000-0000-00 0- 000-000000000000
-            if type_ == UUID and value == _BAD_UUID:
-                value = "0" * 32
+            if type_ is UUID and value == _BAD_UUID:
+                return _EMPTY_UUID
             return type_(value)
 
     return value
@@ -574,7 +577,7 @@ def log_event(event: Event) -> None:
     )
     smart_settings = camera.smart_detect_settings
     for smart_type in event.smart_detect_types:
-        is_audio = event.type == EventType.SMART_AUDIO_DETECT
+        is_audio = event.type is EventType.SMART_AUDIO_DETECT
         if is_audio:
             if smart_type.audio_type is None:
                 return