uiprotect 3.7.0__tar.gz → 4.0.0__tar.gz

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

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

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

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

{uiprotect-3.7.0 → uiprotect-4.0.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.7.0 → uiprotect-4.0.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.7.0 → uiprotect-4.0.0}/src/uiprotect/data/bootstrap.py

@@ -464,13 +464,6 @@ class Bootstrap(ProtectBaseObject):
             if TYPE_CHECKING:
                 assert isinstance(obj, Event)
             self.process_event(obj)
-        elif model_type is ModelType.CAMERA:
-            if TYPE_CHECKING:
-                assert isinstance(obj, Camera)
-            if "last_ring" in data and (last_ring := obj.last_ring):
-                if is_recent := last_ring + RECENT_EVENT_MAX >= utc_now():
-                    obj.set_ring_timeout()
-                _LOGGER.debug("last_ring for %s (%s)", obj.id, is_recent)
         elif model_type is ModelType.SENSOR:
             if TYPE_CHECKING:
                 assert isinstance(obj, Sensor)
@@ -560,34 +553,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 +592,6 @@ class Bootstrap(ProtectBaseObject):
             ValidationError,
             TimeoutError,
             asyncio.TimeoutError,
-            asyncio.CancelledError,
             ClientError,
             ServerDisconnectedError,
         ):

{uiprotect-3.7.0 → uiprotect-4.0.0}/src/uiprotect/data/devices.py

@@ -977,7 +977,6 @@ class Camera(ProtectMotionDeviceModel):
     last_smart_detect_event_ids: dict[SmartDetectObjectType, str] = {}
     last_smart_audio_detect_event_ids: dict[SmartDetectAudioType, str] = {}
     talkback_stream: TalkbackStream | None = None
-    _last_ring_timeout: datetime | None = PrivateAttr(None)
 
     @classmethod
     @cache
@@ -1845,12 +1844,6 @@ class Camera(ProtectMotionDeviceModel):
     # endregion
     # endregion
 
-    @property
-    def is_ringing(self) -> bool:
-        if self._last_ring_timeout is None:
-            return False
-        return utc_now() < self._last_ring_timeout
-
     @property
     def chime_type(self) -> ChimeType:
         if self.chime_duration.total_seconds() == 0.3:
@@ -1935,10 +1928,6 @@ class Camera(ProtectMotionDeviceModel):
 
         return False
 
-    def set_ring_timeout(self) -> None:
-        self._last_ring_timeout = utc_now() + EVENT_PING_INTERVAL
-        self._event_callback_ping()
-
     def get_privacy_zone(self) -> tuple[int | None, CameraZone | None]:
         for index, zone in enumerate(self.privacy_zones):
             if zone.name == PRIVACY_ZONE_NAME:

{uiprotect-3.7.0 → uiprotect-4.0.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