uiprotect 7.5.1__py3-none-any.whl → 7.5.3__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
 from ipaddress import IPv4Address
-from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar
+from typing import TYPE_CHECKING, Any, NamedTuple
 from uuid import UUID
 
 from convertertools import pop_dict_set_if_none, pop_dict_tuple
@@ -53,7 +53,6 @@ if TYPE_CHECKING:
     from ..data.user import User
 
 
-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()
@@ -478,7 +477,7 @@ class ProtectBaseObject(BaseModel):
 
         return new_data
 
-    def update_from_dict(cls: ProtectObject, data: dict[str, Any]) -> ProtectObject:
+    def update_from_dict(self, data: dict[str, Any]) -> Self:
         """
         Updates current object from a cleaned UFP JSON dict.
 
@@ -492,15 +491,15 @@ class ProtectBaseObject(BaseModel):
             has_unifi_lists,
             unifi_dicts,
             has_unifi_dicts,
-        ) = cls._get_protect_model()
-        api = cls._api
-        _fields = cls.model_fields
+        ) = self._get_protect_model()
+        api = self._api
+        _fields = self.__class__.model_fields
         unifi_obj: ProtectBaseObject | None
         value: Any
 
         for key, item in data.items():
             if has_unifi_objs and key in unifi_objs and isinstance(item, dict):
-                if (unifi_obj := getattr(cls, key)) is not None:
+                if (unifi_obj := getattr(self, key)) is not None:
                     value = unifi_obj.update_from_dict(item)
                 else:
                     value = unifi_objs[key](**item, api=api)
@@ -514,9 +513,9 @@ class ProtectBaseObject(BaseModel):
             else:
                 value = convert_unifi_data(item, _fields[key])
 
-            setattr(cls, key, value)
+            setattr(self, key, value)
 
-        return cls
+        return self
 
     def dict_with_excludes(self) -> dict[str, Any]:
         """Returns a dict of the current object without any UFP objects converted to dicts."""

uiprotect/data/devices.py

@@ -587,19 +587,22 @@ class VideoStats(ProtectBaseObject):
     @classmethod
     @cache
     def unifi_dict_conversions(cls) -> dict[str, object | Callable[[Any], Any]]:
-        return {
-            key: convert_to_datetime
-            for key in (
-                "recordingStart",
-                "recordingEnd",
-                "recordingStartLQ",
-                "recordingEndLQ",
-                "timelapseStart",
-                "timelapseEnd",
-                "timelapseStartLQ",
-                "timelapseEndLQ",
+        return (
+            dict.fromkeys(
+                (
+                    "recordingStart",
+                    "recordingEnd",
+                    "recordingStartLQ",
+                    "recordingEndLQ",
+                    "timelapseStart",
+                    "timelapseEnd",
+                    "timelapseStartLQ",
+                    "timelapseEndLQ",
+                ),
+                convert_to_datetime,
             )
-        } | super().unifi_dict_conversions()
+            | super().unifi_dict_conversions()
+        )
 
 
 class StorageStats(ProtectBaseObject):

uiprotect/data/nvr.py

@@ -321,10 +321,12 @@ class Event(ProtectModelWithId):
     @classmethod
     @cache
     def unifi_dict_conversions(cls) -> dict[str, object | Callable[[Any], Any]]:
-        return {
-            key: convert_to_datetime
-            for key in ("start", "end", "timestamp", "deletedAt")
-        } | super().unifi_dict_conversions()
+        return (
+            dict.fromkeys(
+                ("start", "end", "timestamp", "deletedAt"), convert_to_datetime
+            )
+            | super().unifi_dict_conversions()
+        )
 
     def unifi_dict(
         self,

uiprotect/data/types.py

@@ -679,7 +679,7 @@ RepeatTimes = Annotated[int, Field(ge=1, le=6)]
 class PTZPositionDegree(BaseModel):
     pan: float
     tilt: float
-    zoom: int
+    zoom: float
 
 
 class PTZPositionSteps(BaseModel):

uiprotect/utils.py

@@ -154,7 +154,7 @@ def to_ms(duration: timedelta | None) -> int | None:
     if duration is None:
         return None
 
-    return int(round(duration.total_seconds() * 1000))
+    return round(duration.total_seconds() * 1000)
 
 
 def utc_now() -> datetime:

{uiprotect-7.5.1.dist-info → uiprotect-7.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uiprotect
-Version: 7.5.1
+Version: 7.5.3
 Summary: Python API for Unifi Protect (Unofficial)
 Author: UI Protect Maintainers
 Author-email: ui@koston.org

{uiprotect-7.5.1.dist-info → uiprotect-7.5.3.dist-info}/RECORD

@@ -16,12 +16,12 @@ 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=audwJBjxRiYdNPeYlP6iofFIOq3gyQzh6VpDsOCM2dQ,2964
-uiprotect/data/base.py,sha256=rXm08mA4W7VErgsjS_lqM9HBhFK5-he1L2N6zFMl5yY,35481
+uiprotect/data/base.py,sha256=5DHHot9uHLBg2quXhf0Q2SdiIuQBnR7tLw_8PgODH6s,35397
 uiprotect/data/bootstrap.py,sha256=ddNaKrTprN7Zq0ZE3O_F5whepUh6z9GqyrUWxLyZ0HE,23570
 uiprotect/data/convert.py,sha256=xEN878_hm0HZZCVYGwJSxcSp2as9zpkvsemVIibReOA,2628
-uiprotect/data/devices.py,sha256=J7tmInERMmC7vUsdBfB83OAr97XYFnwnuvVbOAE90tY,114308
-uiprotect/data/nvr.py,sha256=E18DgE0nXl9VZ_ULotTPcXSi3M1u3mWQsuZbY1gIajs,47490
-uiprotect/data/types.py,sha256=XVNVCqyWJGTAo557sWD8yZ-kr_Z_35IpkUr-IuBjpO4,19218
+uiprotect/data/devices.py,sha256=AuQK0vfs5J370TW7GDa6M8ylhaFZoxlAL-_SGyCOAUk,114391
+uiprotect/data/nvr.py,sha256=fu6bWx2NpsUKhPUg7bZHshAnONp41zOL8tc39lypW4c,47520
+uiprotect/data/types.py,sha256=TDZwSKELUN0smXLB8uQkyNsHlB61j2ByijeblEt2Css,19220
 uiprotect/data/user.py,sha256=Del5LUmt5uCfAQMI9-kl_GaKm085oTLjxmcCrlEKXxc,10526
 uiprotect/data/websocket.py,sha256=m4EV1Qfh08eKOihy70ycViYgEQpeNSGZQJWdtGIYJDA,6791
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
@@ -30,10 +30,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=MWiTRFIhUfFLPA_csSrKl5-SkUbPZ2VhDu0XW2oVr-U,4800
 uiprotect/test_util/__init__.py,sha256=HlQBgIgdtrvT-gQ5OWP92LbgVr_YzsD5NFImLRonUZk,19320
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=p2cnc6G_-MNAXpKxy95Mz0CwwZOMvB6Sat1X626n-gg,20564
+uiprotect/utils.py,sha256=5Z30chqnQhQdtD1vabRtZXjBpeiJagL5KDuALQlWxk8,20559
 uiprotect/websocket.py,sha256=tEyenqblNXHcjWYuf4oRP1E7buNwx6zoECMwpBr-jig,8191
-uiprotect-7.5.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-7.5.1.dist-info/METADATA,sha256=XYRHc8TDS9BbbDIyelO8CuGEAB-MI3JF34xp9L63VNk,11095
-uiprotect-7.5.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-uiprotect-7.5.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-7.5.1.dist-info/RECORD,,
+uiprotect-7.5.3.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-7.5.3.dist-info/METADATA,sha256=S2b2APeP61Vf8K-pm3fiyaljfJsxXIUZu4enkt9pnQk,11095
+uiprotect-7.5.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+uiprotect-7.5.3.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-7.5.3.dist-info/RECORD,,

{uiprotect-7.5.1.dist-info → uiprotect-7.5.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any