uiprotect 7.21.0__py3-none-any.whl → 7.22.0__py3-none-any.whl

uiprotect/data/base.py

@@ -27,14 +27,12 @@ from ..utils import (
     to_snake_case,
 )
 from .types import (
-    SHAPE_DICT_V1,
-    SHAPE_LIST_V1,
     ModelType,
     PercentFloat,
     PermissionNode,
     ProtectWSPayloadFormat,
     StateType,
-    extract_type_shape,
+    get_field_type,
 )
 from .websocket import (
     WSJSONPacketFrame,
@@ -223,11 +221,11 @@ class ProtectBaseObject(BaseModel):
 
         for name, field in cls.model_fields.items():
             try:
-                type_, shape = extract_type_shape(field.annotation)  # type: ignore[arg-type]
+                origin, type_ = get_field_type(field.annotation)  # type: ignore[arg-type]
                 if _is_protect_base_object(type_):
-                    if shape == SHAPE_LIST_V1:
+                    if origin is list:
                         lists[name] = type_
-                    elif shape == SHAPE_DICT_V1:
+                    elif origin is dict:
                         dicts[name] = type_
                     else:
                         objs[name] = type_
@@ -489,8 +487,8 @@ class ProtectBaseObject(BaseModel):
             has_unifi_objs,
             unifi_lists,
             has_unifi_lists,
-            unifi_dicts,
-            has_unifi_dicts,
+            _unifi_dicts,
+            _has_unifi_dicts,
         ) = self._get_protect_model()
         api = self._api
         _fields = self.__class__.model_fields

uiprotect/data/types.py

@@ -1,18 +1,14 @@
 from __future__ import annotations
 
 import enum
-from collections.abc import Callable, Coroutine
+import types
+from collections.abc import Callable, Coroutine, Sequence
 from functools import cache, lru_cache
-from typing import Annotated, Any, Literal, TypeVar, Union
+from typing import Annotated, Any, Literal, TypeVar, Union, get_args, get_origin
 
 from packaging.version import Version as BaseVersion
 from pydantic import BaseModel, Field
 from pydantic.types import StringConstraints
-from pydantic.v1.config import BaseConfig as BaseConfigV1
-from pydantic.v1.fields import SHAPE_DICT as SHAPE_DICT_V1  # noqa: F401
-from pydantic.v1.fields import SHAPE_LIST as SHAPE_LIST_V1  # noqa: F401
-from pydantic.v1.fields import SHAPE_SET as SHAPE_SET_V1  # noqa: F401
-from pydantic.v1.fields import ModelField as ModelFieldV1
 from pydantic_extra_types.color import Color  # noqa: F401
 
 from .._compat import cached_property
@@ -21,20 +17,34 @@ KT = TypeVar("KT")
 VT = TypeVar("VT")
 
 
-class _BaseConfigV1(BaseConfigV1):
-    arbitrary_types_allowed = True
-    validate_assignment = True
-
-
 @lru_cache(maxsize=512)
-def extract_type_shape(annotation: type[Any] | None) -> tuple[Any, int]:
-    """Extract the type from a type hint."""
+def get_field_type(annotation: type[Any] | None) -> tuple[type | None, Any]:
+    """Extract the origin and type from an annotation."""
     if annotation is None:
         raise ValueError("Type annotation cannot be None")
-    v1_field = ModelFieldV1(
-        name="", type_=annotation, class_validators=None, model_config=_BaseConfigV1
-    )
-    return v1_field.type_, v1_field.shape
+    origin = get_origin(annotation)
+    args: Sequence[Any]
+    if origin in (list, set):
+        if not (args := get_args(annotation)):
+            raise ValueError(f"Unable to determine args of type: {annotation}")
+        return origin, args[0]
+    if origin is dict:
+        if not (args := get_args(annotation)):
+            raise ValueError(f"Unable to determine args of type: {annotation}")
+        return origin, args[1]
+    if origin is Annotated:
+        if not (args := get_args(annotation)):
+            raise ValueError(f"Unable to determine args of type: {annotation}")
+        return None, args[0]
+    if origin is Union or origin is types.UnionType:
+        if not (args := get_args(annotation)):
+            raise ValueError(f"Unable to determine args of type: {annotation}")
+        args = [get_field_type(arg) for arg in args]
+        if len(args) == 2 and type(None) in list(zip(*args, strict=False))[1]:
+            # Strip '| None' type from Union
+            return next(arg for arg in args if arg[1] is not type(None))
+        return None, annotation
+    return origin, annotation
 
 
 DEFAULT = "DEFAULT_VALUE"

uiprotect/test_util/anonymize.py

@@ -3,11 +3,10 @@ from __future__ import annotations
 import secrets
 import string
 import uuid
+import warnings
 from typing import Any
 from urllib.parse import urlparse
 
-import typer
-
 from ..data import ModelType
 
 object_id_mapping: dict[str, str] = {}
@@ -111,7 +110,7 @@ def anonymize_dict(obj: dict[str, Any], name: str | None = None) -> dict[str, An
         if obj["modelKey"] in [m.value for m in ModelType]:
             obj_type = ModelType(obj["modelKey"])
         else:
-            typer.secho(f"Unknown modelKey: {obj['modelKey']}", fg="yellow")
+            warnings.warn(f"Unknown modelKey: {obj['modelKey']}", stacklevel=2)
 
     if obj_type == ModelType.USER:
         return anonymize_user(obj)

uiprotect/utils.py

@@ -32,15 +32,12 @@ from aiohttp import ClientResponse
 from pydantic.fields import FieldInfo
 
 from .data.types import (
-    SHAPE_DICT_V1,
-    SHAPE_LIST_V1,
-    SHAPE_SET_V1,
     Color,
     SmartDetectAudioType,
     SmartDetectObjectType,
     Version,
     VideoMode,
-    extract_type_shape,
+    get_field_type,
 )
 from .exceptions import NvrError
 
@@ -208,22 +205,21 @@ def to_camel_case(name: str) -> str:
 
 
 _EMPTY_UUID = UUID("0" * 32)
-_SHAPE_TYPES = {SHAPE_DICT_V1, SHAPE_SET_V1, SHAPE_LIST_V1}
 
 
 def convert_unifi_data(value: Any, field: FieldInfo) -> Any:
     """Converts value from UFP data into pydantic field class"""
-    type_, shape = extract_type_shape(field.annotation)  # type: ignore[arg-type]
+    origin, type_ = get_field_type(field.annotation)  # type: ignore[arg-type]
 
     if type_ is Any:
         return value
 
-    if shape in _SHAPE_TYPES:
-        if shape == SHAPE_LIST_V1 and isinstance(value, list):
+    if origin is not None:
+        if origin is list and isinstance(value, list):
             return [convert_unifi_data(v, field) for v in value]
-        if shape == SHAPE_SET_V1 and isinstance(value, list):
+        if origin is set and isinstance(value, list):
             return {convert_unifi_data(v, field) for v in value}
-        if shape == SHAPE_DICT_V1 and isinstance(value, dict):
+        if origin is dict and isinstance(value, dict):
             return {k: convert_unifi_data(v, field) for k, v in value.items()}
 
     if value is not None:

{uiprotect-7.21.0.dist-info → uiprotect-7.22.0.dist-info}/METADATA

@@ -1,14 +1,14 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: uiprotect
-Version: 7.21.0
+Version: 7.22.0
 Summary: Python API for Unifi Protect (Unofficial)
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
 Author: UI Protect Maintainers
 Author-email: ui@koston.org
 Requires-Python: >=3.10
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Build Tools
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiofiles (>=24)

{uiprotect-7.21.0.dist-info → uiprotect-7.22.0.dist-info}/RECORD

@@ -16,12 +16,12 @@ uiprotect/cli/nvr.py,sha256=TwxEg2XT8jXAbOqv6gc7KFXELKadeItEDYweSL4_-e8,4260
 uiprotect/cli/sensors.py,sha256=crz_R52X7EFKQtBgL2QzacThExOOoN5NubERQuw5jpk,8119
 uiprotect/cli/viewers.py,sha256=IgJpOzwdo9HVs55Osf3uC5d0raeU19WFIW-RfrnnOug,2137
 uiprotect/data/__init__.py,sha256=audwJBjxRiYdNPeYlP6iofFIOq3gyQzh6VpDsOCM2dQ,2964
-uiprotect/data/base.py,sha256=CXIxaJCJNpavadn6uF7vlhI4wxkfD8MNBGgR-smRA7k,35401
+uiprotect/data/base.py,sha256=siz-EA41JMeyqMsqOsELys9rsmYZdTlDmhS-80iY_O8,35342
 uiprotect/data/bootstrap.py,sha256=arnmmQOfVp9HHSKbKicgl-quA1kT7C6Ub0Ca_n_XgDE,23548
 uiprotect/data/convert.py,sha256=xEN878_hm0HZZCVYGwJSxcSp2as9zpkvsemVIibReOA,2628
 uiprotect/data/devices.py,sha256=QLgMpTt3ui-8hj6PR75UthVUtbZWyM7tomHkuDhu0wQ,117507
 uiprotect/data/nvr.py,sha256=HnknmMmUxe1aPA0PHJZSiEwpvo1phtHBp3wXsU6v_iI,46681
-uiprotect/data/types.py,sha256=RhVqW9mteksrjYMlUqm8YKaVNq5Xc_ksg6-ipSwiR-4,19300
+uiprotect/data/types.py,sha256=szB5vOzLaiJm0o3Lhdtaoawq54kNtiOFMWKjfSVuy4o,19869
 uiprotect/data/user.py,sha256=Del5LUmt5uCfAQMI9-kl_GaKm085oTLjxmcCrlEKXxc,10526
 uiprotect/data/websocket.py,sha256=m4EV1Qfh08eKOihy70ycViYgEQpeNSGZQJWdtGIYJDA,6791
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
@@ -29,11 +29,11 @@ uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,386
 uiprotect/stream.py,sha256=ls65vMOXF4IlJ5axewFITfhcaTh_ihaFeCkCTfhy0Nk,5168
 uiprotect/test_util/__init__.py,sha256=O22HGFX5Mb0j9LPzO48tm4ZqZTqGVBHo0jnye2FdT_I,19803
-uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
-uiprotect/utils.py,sha256=4EIblOcOxlApiXkI2rwram4SkgiMu_JTDRIZOul83Bc,20749
+uiprotect/test_util/anonymize.py,sha256=3YG56B6bJcjrfZLWPfmPNlePr88NTvftTvigvPEMxks,8483
+uiprotect/utils.py,sha256=BjQCia7PZyG6ES8PH-SYRIMja2ldm_ClojkCOB9iGak,20599
 uiprotect/websocket.py,sha256=BedfEVLWhiTP5Il4ULerw2cUNGlr2OLyb_91QOh3iSs,8176
-uiprotect-7.21.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-7.21.0.dist-info/METADATA,sha256=WsSYBAGI5vgbYlXIjZ1bEtzgRMEcgBFow6ev6Bs5QEo,11167
-uiprotect-7.21.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-uiprotect-7.21.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-7.21.0.dist-info/RECORD,,
+uiprotect-7.22.0.dist-info/METADATA,sha256=snSZUY5Zzp9F_gaIW4gZQk8CVysNvKFkOPxL33u-yjE,11200
+uiprotect-7.22.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+uiprotect-7.22.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-7.22.0.dist-info/licenses/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-7.22.0.dist-info/RECORD,,

{uiprotect-7.21.0.dist-info → uiprotect-7.22.0.dist-info}/WHEEL

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