uiprotect 1.7.1__tar.gz → 1.8.0__tar.gz

{uiprotect-1.7.1 → uiprotect-1.8.0}/PKG-INFO

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

{uiprotect-1.7.1 → uiprotect-1.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "1.7.1"
+version = "1.8.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"

{uiprotect-1.7.1 → uiprotect-1.8.0}/src/uiprotect/data/base.py

@@ -55,17 +55,12 @@ if TYPE_CHECKING:
     from ..data.nvr import Event
     from ..data.user import User
 
-    try:
-        from pydantic.v1.typing import DictStrAny
-    except ImportError:
-        from pydantic.typing import (  # type: ignore[assignment, no-redef]
-            DictStrAny,
-        )
-
 
 ProtectObject = TypeVar("ProtectObject", bound="ProtectBaseObject")
 RECENT_EVENT_MAX = timedelta(seconds=30)
 EVENT_PING_INTERVAL = timedelta(seconds=3)
+EVENT_PING_INTERVAL_SECONDS = EVENT_PING_INTERVAL.total_seconds()
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -89,7 +84,6 @@ class ProtectBaseObject(BaseModel):
     _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
-    _to_unifi_remaps: ClassVar[DictStrAny | None] = None
 
     class Config:
         arbitrary_types_allowed = True
@@ -195,6 +189,7 @@ class ProtectBaseObject(BaseModel):
         return set(self._get_unifi_remaps())
 
     @classmethod
+    @cache
     def _get_to_unifi_remaps(cls) -> dict[str, str]:
         """
         Helper method for overriding in child classes for reversing remap UFP
@@ -206,12 +201,9 @@ class ProtectBaseObject(BaseModel):
             "python_name": "ufpJsonName"
         }
         """
-        if cls._to_unifi_remaps is None:
-            cls._to_unifi_remaps = {
-                to_key: from_key for from_key, to_key in cls._get_unifi_remaps().items()
-            }
-
-        return cls._to_unifi_remaps
+        return {
+            to_key: from_key for from_key, to_key in cls._get_unifi_remaps().items()
+        }
 
     @classmethod
     def _set_protect_subtypes(cls) -> None:
@@ -628,6 +620,7 @@ class ProtectModelWithId(ProtectModel):
         return obj
 
     @classmethod
+    @cache
     def _get_read_only_fields(cls) -> set[str]:
         return set()
 
@@ -787,10 +780,14 @@ class ProtectModelWithId(ProtectModel):
             raise
 
         if force_emit:
-            await self.emit_message(updated)
+            self._emit_message(updated)
 
     async def emit_message(self, updated: dict[str, Any]) -> None:
-        """Emites fake WS message for ProtectApiClient to process."""
+        """Emits fake WS message for ProtectApiClient to process."""
+        self._emit_message(updated)
+
+    def _emit_message(self, updated: dict[str, Any]) -> None:
+        """Emits fake WS message for ProtectApiClient to process."""
         if updated == {}:
             _LOGGER.debug("Event ping callback started for %s", self.id)
 
@@ -877,9 +874,9 @@ class ProtectDeviceModel(ProtectModelWithId):
         _LOGGER.debug("Event ping timer started for %s", self.id)
         loop = asyncio.get_event_loop()
         self._callback_ping = loop.call_later(
-            EVENT_PING_INTERVAL.total_seconds(),
-            asyncio.create_task,
-            self.emit_message({}),
+            EVENT_PING_INTERVAL_SECONDS,
+            self._emit_message,
+            {},
         )
 
     async def set_name(self, name: str | None) -> None:

{uiprotect-1.7.1 → uiprotect-1.8.0}/src/uiprotect/data/bootstrap.py

@@ -154,10 +154,6 @@ class ProtectDeviceRef(ProtectBaseObject):
     id: str
 
 
-_ModelType_NVR_value = ModelType.NVR.value
-_ModelType_Event_value = ModelType.EVENT.value
-
-
 class Bootstrap(ProtectBaseObject):
     auth_user_id: str
     access_key: str
@@ -360,14 +356,13 @@ class Bootstrap(ProtectBaseObject):
         elif model_type in ModelType.bootstrap_models_types_set():
             if TYPE_CHECKING:
                 assert isinstance(obj, ProtectAdoptableDeviceModel)
-                assert isinstance(obj.model, ModelType)
-            key = obj.model.devices_key
             if not self._api.ignore_unadopted or (
                 obj.is_adopted and not obj.is_adopted_by_other
             ):
-                getattr(self, key)[obj.id] = obj
-                ref = ProtectDeviceRef(model=obj.model, id=obj.id)
-                self.id_lookup[obj.id] = ref
+                id_ = obj.id
+                getattr(self, model_type.devices_key)[id_] = obj
+                ref = ProtectDeviceRef(model=model_type, id=id_)
+                self.id_lookup[id_] = ref
                 self.mac_lookup[normalize_mac(obj.mac)] = ref
         else:
             _LOGGER.debug("Unexpected bootstrap model type for add: %s", model_type)