uiprotect 3.1.8__py3-none-any.whl → 3.2.0__py3-none-any.whl

uiprotect/data/base.py

@@ -8,7 +8,7 @@ from collections.abc import Callable
 from datetime import datetime, timedelta
 from functools import cache, cached_property
 from ipaddress import IPv4Address
-from typing import TYPE_CHECKING, Any, ClassVar, TypeVar
+from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar
 from uuid import UUID
 
 from pydantic.v1 import BaseModel
@@ -65,6 +65,23 @@ def _is_protect_base_object(cls: type) -> bool:
     return issubclass(cls, ProtectBaseObject)
 
 
+class _ProtectModelObjects(NamedTuple):
+    """
+    Class to track all child of UFP objects.
+
+    objs are UFP objects
+    lists are lists of UFP objects
+    dicts are dicts of UFP objects
+    """
+
+    objs: dict[str, type[ProtectBaseObject]]
+    has_objs: bool
+    lists: dict[str, type[ProtectBaseObject]]
+    has_lists: bool
+    dicts: dict[str, type[ProtectBaseObject]]
+    has_dicts: bool
+
+
 class ProtectBaseObject(BaseModel):
     """
     Base class for building Python objects from UniFi Protect JSON.
@@ -76,10 +93,6 @@ class ProtectBaseObject(BaseModel):
 
     _api: ProtectApiClient = PrivateAttr(None)
 
-    _protect_objs: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_lists: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_dicts: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-
     class Config:
         arbitrary_types_allowed = True
         validate_assignment = True
@@ -128,12 +141,14 @@ class ProtectBaseObject(BaseModel):
     @classmethod
     def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
         api: ProtectApiClient | None = values.pop("api", None)
-        unifi_objs = cls._get_protect_objs()
-        has_unifi_objs = bool(unifi_objs)
-        unifi_lists = cls._get_protect_lists()
-        has_unifi_lists = bool(unifi_lists)
-        unifi_dicts = cls._get_protect_dicts()
-        has_unifi_dicts = bool(unifi_dicts)
+        (
+            unifi_objs,
+            has_unifi_objs,
+            unifi_lists,
+            has_unifi_lists,
+            unifi_dicts,
+            has_unifi_dicts,
+        ) = cls._get_protect_model()
         for key, value in values.items():
             if has_unifi_objs and key in unifi_objs and isinstance(value, dict):
                 values[key] = unifi_objs[key].construct(**value)
@@ -195,56 +210,35 @@ class ProtectBaseObject(BaseModel):
         }
 
     @classmethod
-    def _set_protect_subtypes(cls) -> None:
+    @cache
+    def _get_protect_model(cls) -> _ProtectModelObjects:
         """Helper method to detect attrs of current class that are UFP Objects themselves"""
-        cls._protect_objs = {}
-        cls._protect_lists = {}
-        cls._protect_dicts = {}
+        objs: dict[str, type[ProtectBaseObject]] = {}
+        lists: dict[str, type[ProtectBaseObject]] = {}
+        dicts: dict[str, type[ProtectBaseObject]] = {}
 
         for name, field in cls.__fields__.items():
             try:
                 if _is_protect_base_object(field.type_):
                     if field.shape == SHAPE_LIST:
-                        cls._protect_lists[name] = field.type_
+                        lists[name] = field.type_
                     elif field.shape == SHAPE_DICT:
-                        cls._protect_dicts[name] = field.type_
+                        dicts[name] = field.type_
                     else:
-                        cls._protect_objs[name] = field.type_
+                        objs[name] = field.type_
             except TypeError:
                 pass
 
-    @classmethod
-    @cache
-    def _get_protect_objs(cls) -> dict[str, type[ProtectBaseObject]]:
-        """Helper method to get all child UFP objects"""
-        if cls._protect_objs is None:
-            cls._set_protect_subtypes()
-            assert cls._protect_objs is not None
-        return cls._protect_objs
+        return _ProtectModelObjects(
+            objs, bool(objs), lists, bool(lists), dicts, bool(dicts)
+        )
 
     @classmethod
     @cache
     def _get_excluded_fields(cls) -> set[str]:
         """Helper method to get all excluded fields for the current object."""
-        return set(cls._get_protect_objs()) | set(cls._get_protect_lists())
-
-    @classmethod
-    @cache
-    def _get_protect_lists(cls) -> dict[str, type[ProtectBaseObject]]:
-        """Helper method to get all child of UFP objects (lists)"""
-        if cls._protect_lists is None:
-            cls._set_protect_subtypes()
-            assert cls._protect_lists is not None
-        return cls._protect_lists
-
-    @classmethod
-    @cache
-    def _get_protect_dicts(cls) -> dict[str, type[ProtectBaseObject]]:
-        """Helper method to get all child of UFP objects (dicts)"""
-        if cls._protect_dicts is None:
-            cls._set_protect_subtypes()
-            assert cls._protect_dicts is not None
-        return cls._protect_dicts
+        protect_model = cls._get_protect_model()
+        return set(protect_model.objs) | set(protect_model.lists)
 
     @classmethod
     def _clean_protect_obj(
@@ -327,12 +321,14 @@ class ProtectBaseObject(BaseModel):
             return data
 
         # clean child UFP objs
-        unifi_objs = cls._get_protect_objs()
-        has_unifi_objs = bool(unifi_objs)
-        unifi_lists = cls._get_protect_lists()
-        has_unifi_lists = bool(unifi_lists)
-        unifi_dicts = cls._get_protect_dicts()
-        has_unifi_dicts = bool(unifi_dicts)
+        (
+            unifi_objs,
+            has_unifi_objs,
+            unifi_lists,
+            has_unifi_lists,
+            unifi_dicts,
+            has_unifi_dicts,
+        ) = cls._get_protect_model()
         for key, value in data.items():
             if has_unifi_objs and key in unifi_objs:
                 data[key] = cls._clean_protect_obj(value, unifi_objs[key], api)
@@ -428,15 +424,24 @@ class ProtectBaseObject(BaseModel):
             data = self.dict(exclude=excluded_fields)
             use_obj = True
 
-        for key, klass in self._get_protect_objs().items():
+        (
+            unifi_objs,
+            has_unifi_objs,
+            unifi_lists,
+            has_unifi_lists,
+            unifi_dicts,
+            has_unifi_dicts,
+        ) = self._get_protect_model()
+
+        for key, klass in unifi_objs.items():
             if use_obj or key in data:
                 data[key] = self._unifi_dict_protect_obj(data, key, use_obj, klass)
 
-        for key, klass in self._get_protect_lists().items():
+        for key, klass in unifi_lists.items():
             if use_obj or key in data:
                 data[key] = self._unifi_dict_protect_obj_list(data, key, use_obj, klass)
 
-        for key in self._get_protect_dicts():
+        for key in unifi_dicts:
             if use_obj or key in data:
                 data[key] = self._unifi_dict_protect_obj_dict(data, key, use_obj)
 
@@ -455,11 +460,14 @@ class ProtectBaseObject(BaseModel):
         The api client is injected into each dict for any child
         UFP objects that are detected.
         """
-        unifi_objs = cls._get_protect_objs()
-        has_unifi_objs = bool(unifi_objs)
-        unifi_lists = cls._get_protect_lists()
-        has_unifi_lists = bool(unifi_lists)
-
+        (
+            unifi_objs,
+            has_unifi_objs,
+            unifi_lists,
+            has_unifi_lists,
+            unifi_dicts,
+            has_unifi_dicts,
+        ) = cls._get_protect_model()
         api = cls._api
         _fields = cls.__fields__
         unifi_obj: ProtectBaseObject | 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.8.dist-info → uiprotect-3.2.0.dist-info}/METADATA

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

{uiprotect-3.1.8.dist-info → uiprotect-3.2.0.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=OefiljoofvG7Hp3cEp3DOabKDHW86qBXjiQnI_OUONg,35499
-uiprotect/data/bootstrap.py,sha256=aF6BJ8qgE7sEDsTKPdRXsrMsL_CTmo8Xr-TUNZjfU6I,21810
+uiprotect/data/base.py,sha256=7V66U1DJdUIvDw6DhtPaOGBd6rZGzVD_84-tpTVSBLY,34963
+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.8.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-3.1.8.dist-info/METADATA,sha256=jCQ1ApyriOckFH-YS0__L8A25XZbG_CtQv4P9aifOMs,10982
-uiprotect-3.1.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-3.1.8.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-3.1.8.dist-info/RECORD,,
+uiprotect-3.2.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-3.2.0.dist-info/METADATA,sha256=91rjXK4o3FasHP0kjLaGfvWki16MEQXoyZnxsZunYN8,10982
+uiprotect-3.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-3.2.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-3.2.0.dist-info/RECORD,,