uiprotect 7.21.1__tar.gz → 7.22.0__tar.gz

{uiprotect-7.21.1 → uiprotect-7.22.0}/PKG-INFO

@@ -1,14 +1,14 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: uiprotect
-Version: 7.21.1
+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.1 → uiprotect-7.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uiprotect"
-version = "7.21.1"
+version = "7.22.0"
 license = "MIT"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = [{ name = "UI Protect Maintainers", email = "ui@koston.org" }]
@@ -52,17 +52,17 @@ pydantic-extra-types = ">=2.10.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7,<9"
-pytest-cov = ">=3,<7"
+pytest-cov = ">=3,<8"
 aiosqlite = ">=0.20.0"
 asttokens = ">=2.4.1,<4.0.0"
-pytest-asyncio = ">=0.23.7,<1.2.0"
+pytest-asyncio = ">=0.23.7,<1.3.0"
 pytest-benchmark = ">=4,<6"
-pytest-sugar = "^1.0.0"
+pytest-sugar = "^1.1.1"
 pytest-timeout = "^2.4.0"
 pytest-xdist = "^3.7.0"
 types-aiofiles = ">=23.2.0.20240403,<25.0.0.0"
 types-dateparser = "^1.2.2.20250809"
-mypy = "^1.17.1"
+mypy = "^1.18.2"
 
 [tool.poetry.group.docs]
 optional = true
@@ -73,13 +73,13 @@ sphinx = { version = ">=4.0", python = ">=3.11"}
 furo = { version = ">=2023.5.20", python = ">=3.11"}
 sphinx-autobuild = { version = ">=2024.0.0", python = ">=3.11"}
 mike = "^2.1.1"
-mkdocs-material = "^9.6.16"
+mkdocs-material = "^9.6.21"
 mkdocs-material-extensions = "^1.3.1"
 pymdown-extensions = "^10.16.1"
 mkdocs-git-revision-date-localized-plugin = "^1.4.7"
 mkdocs-include-markdown-plugin = ">=6.1.1,<8.0.0"
 mkdocstrings = ">=0.25.1,<0.31.0"
-mkdocstrings-python = "^1.16.12"
+mkdocstrings-python = "^1.18.2"
 
 [tool.semantic_release]
 version_toml = ["pyproject.toml:project.version"]
@@ -148,7 +148,6 @@ ignore = [
     "S110", # `try`-`except`-`pass` detected, consider logging the exception
     "D106", # Missing docstring in public nested class
     "UP007", # typer needs Optional syntax
-    "UP038", # Use `X | Y` in `isinstance` is slower
     "S603", #  check for execution of untrusted input
     "PERF203", # too many to fix right now
 ]

{uiprotect-7.21.1 → uiprotect-7.22.0}/src/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-7.21.1 → uiprotect-7.22.0}/src/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-7.21.1 → uiprotect-7.22.0}/src/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: