uiprotect 3.1.7__py3-none-any.whl → 3.1.9__py3-none-any.whl

uiprotect/data/base.py

@@ -582,28 +582,24 @@ class ProtectModelWithId(ProtectModel):
             setattr(self, key, data_before_changes[key])
 
     def can_create(self, user: User) -> bool:
-        if self.model is None:
-            return True
-
-        return user.can(self.model, PermissionNode.CREATE, self)
+        if (model := self.model) is not None:
+            return user.can(model, PermissionNode.CREATE, self)
+        return True
 
     def can_read(self, user: User) -> bool:
-        if self.model is None:
-            return True
-
-        return user.can(self.model, PermissionNode.READ, self)
+        if (model := self.model) is not None:
+            return user.can(model, PermissionNode.READ, self)
+        return True
 
     def can_write(self, user: User) -> bool:
-        if self.model is None:
-            return True
-
-        return user.can(self.model, PermissionNode.WRITE, self)
+        if (model := self.model) is not None:
+            return user.can(model, PermissionNode.WRITE, self)
+        return True
 
     def can_delete(self, user: User) -> bool:
-        if self.model is None:
-            return True
-
-        return user.can(self.model, PermissionNode.DELETE, self)
+        if (model := self.model) is not None:
+            return user.can(model, PermissionNode.DELETE, self)
+        return True
 
     async def queue_update(self, callback: Callable[[], None]) -> None:
         """
@@ -615,9 +611,8 @@ class ProtectModelWithId(ProtectModel):
         self._update_sync.queue.put_nowait(callback)
 
         self._update_sync.event.set()
-        await asyncio.sleep(
-            0.001,
-        )  # release execution so other `queue_update` calls can abort
+        # release execution so other `queue_update` calls can abort
+        await asyncio.sleep(0.001)
         self._update_sync.event.clear()
 
         try:
@@ -930,8 +925,8 @@ class ProtectAdoptableDeviceModel(ProtectDeviceModel):
         }
 
     async def _api_update(self, data: dict[str, Any]) -> None:
-        if self.model is not None:
-            return await self._api.update_device(self.model, self.id, data)
+        if (model := self.model) is not None:
+            return await self._api.update_device(model, self.id, data)
         return None
 
     def unifi_dict(
@@ -974,10 +969,9 @@ class ProtectAdoptableDeviceModel(ProtectDeviceModel):
 
     @property
     def bridge(self) -> Bridge | None:
-        if self.bridge_id is None:
-            return None
-
-        return self._api.bootstrap.bridges[self.bridge_id]
+        if (bridge_id := self.bridge_id) is not None:
+            return self._api.bootstrap.bridges[bridge_id]
+        return None
 
     @property
     def protect_url(self) -> str:
@@ -1066,7 +1060,6 @@ class ProtectMotionDeviceModel(ProtectAdoptableDeviceModel):
 
     @property
     def last_motion_event(self) -> Event | None:
-        if self.last_motion_event_id is None:
-            return None
-
-        return self._api.bootstrap.events.get(self.last_motion_event_id)
+        if (last_motion_event_id := self.last_motion_event_id) is not None:
+            return self._api.bootstrap.events.get(last_motion_event_id)
+        return None

uiprotect/data/bootstrap.py

@@ -102,31 +102,19 @@ CAMERA_EVENT_ATTR_MAP: dict[EventType, tuple[str, str]] = {
 
 
 def _process_light_event(event: Event, light: Light) -> None:
-    if _event_is_in_range(event, light.last_motion):
-        light.last_motion_event_id = event.id
-
-
-def _event_is_in_range(event: Event, dt: datetime | None) -> bool:
-    """Check if event is in range of datetime."""
-    return (
-        dt is None or event.start >= dt or (event.end is not None and event.end >= dt)
-    )
+    light.last_motion_event_id = event.id
 
 
 def _process_sensor_event(event: Event, sensor: Sensor) -> None:
     if event.type is EventType.MOTION_SENSOR:
-        if _event_is_in_range(event, sensor.motion_detected_at):
-            sensor.last_motion_event_id = event.id
+        sensor.last_motion_event_id = event.id
     elif event.type in {EventType.SENSOR_CLOSED, EventType.SENSOR_OPENED}:
-        if _event_is_in_range(event, sensor.open_status_changed_at):
-            sensor.last_contact_event_id = event.id
+        sensor.last_contact_event_id = event.id
     elif event.type is EventType.SENSOR_EXTREME_VALUE:
-        if _event_is_in_range(event, sensor.extreme_value_detected_at):
-            sensor.extreme_value_detected_at = event.end
-            sensor.last_value_event_id = event.id
+        sensor.extreme_value_detected_at = event.end
+        sensor.last_value_event_id = event.id
     elif event.type is EventType.SENSOR_ALARM:
-        if _event_is_in_range(event, sensor.alarm_triggered_at):
-            sensor.last_value_event_id = event.id
+        sensor.last_value_event_id = event.id
 
 
 _CAMERA_SMART_AND_LINE_EVENTS = {
@@ -139,10 +127,6 @@ _CAMERA_SMART_AUDIO_EVENT = EventType.SMART_AUDIO_DETECT
 def _process_camera_event(event: Event, camera: Camera) -> None:
     event_type = event.type
     dt_attr, event_attr = CAMERA_EVENT_ATTR_MAP[event_type]
-    dt: datetime | None = getattr(camera, dt_attr)
-    if not _event_is_in_range(event, dt):
-        return
-
     event_id = event.id
     event_start = event.start
 

{uiprotect-3.1.7.dist-info → uiprotect-3.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 3.1.7
+Version: 3.1.9
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT

{uiprotect-3.1.7.dist-info → uiprotect-3.1.9.dist-info}/RECORD

@@ -14,8 +14,8 @@ uiprotect/cli/nvr.py,sha256=TwxEg2XT8jXAbOqv6gc7KFXELKadeItEDYweSL4_-e8,4260
 uiprotect/cli/sensors.py,sha256=fQtcDJCVxs4VbAqcavgBy2ABiVxAW3GXtna6_XFBp2k,8153
 uiprotect/cli/viewers.py,sha256=2cyrp104ffIvgT0wYGIO0G35QMkEbFe7fSVqLwDXQYQ,2171
 uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,2938
-uiprotect/data/base.py,sha256=0dfm5qLHpDJYTO04tYpEB869DkVoT0uev9BmgPR9HrA,35436
-uiprotect/data/bootstrap.py,sha256=aF6BJ8qgE7sEDsTKPdRXsrMsL_CTmo8Xr-TUNZjfU6I,21810
+uiprotect/data/base.py,sha256=OefiljoofvG7Hp3cEp3DOabKDHW86qBXjiQnI_OUONg,35499
+uiprotect/data/bootstrap.py,sha256=EWl8zWo3zSN7HWMTgcoWr3UI9WE62Mi6FJ33DTqWTII,21128
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=n2TVY0J-xhO7fXgrvC0hqsHjNc-B_DdySDKHOIKPeqs,110363
 uiprotect/data/nvr.py,sha256=4EzeRFogmdT96VJ9yY17rqpUMx7NuKBRnUrgRbQ5YJs,47461
@@ -30,8 +30,8 @@ uiprotect/test_util/__init__.py,sha256=whiOUb5LfDLNT3AQG6ISiKtAqO2JnhCIdFavhWDK4
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=3SJFF8qs1Jz8t3mD8qwc1hFSocolFjdXI_v4yVlC7o4,20088
 uiprotect/websocket.py,sha256=D5DZrMzo434ecp8toNxOB5HM193kVwYw42yEcg99yMw,8029
-uiprotect-3.1.7.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-3.1.7.dist-info/METADATA,sha256=Fojhzsg5wyTfSca70SAEkDYH_mwt66DqasNBDpMpmME,10982
-uiprotect-3.1.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-3.1.7.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-3.1.7.dist-info/RECORD,,
+uiprotect-3.1.9.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-3.1.9.dist-info/METADATA,sha256=Dwku5PiqpAAGuSE4lMNpd98ZEXU6aY0iwpiSpV4HMM8,10982
+uiprotect-3.1.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-3.1.9.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-3.1.9.dist-info/RECORD,,