uiprotect 1.19.1__tar.gz → 1.19.3__tar.gz

{uiprotect-1.19.1 → uiprotect-1.19.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 1.19.1
+Version: 1.19.3
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT
@@ -27,7 +27,7 @@ Requires-Dist: orjson (>=3.9.15)
 Requires-Dist: packaging (>=23)
 Requires-Dist: pillow (>=10)
 Requires-Dist: platformdirs (>=4)
-Requires-Dist: pydantic (>=1.10.13)
+Requires-Dist: pydantic (>=1.10.17)
 Requires-Dist: pyjwt (>=2.6)
 Requires-Dist: rich (>=10)
 Requires-Dist: typer (>=0.12.3)

{uiprotect-1.19.1 → uiprotect-1.19.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "1.19.1"
+version = "1.19.3"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"
@@ -41,7 +41,7 @@ orjson = ">=3.9.15"
 packaging = ">=23"
 pillow = ">=10"
 platformdirs = ">=4"
-pydantic = "!=1.9.1,>=1.10.13"
+pydantic = "!=1.9.1,>=1.10.17"
 pyjwt = ">=2.6"
 yarl = ">=1.9"
 typer = ">=0.12.3"

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/api.py

@@ -53,7 +53,7 @@ from .data import (
 )
 from .data.base import ProtectModelWithId
 from .data.devices import Chime
-from .data.types import IteratorCallback, ProgressCallback, RecordingMode
+from .data.types import IteratorCallback, ProgressCallback
 from .exceptions import BadRequest, NotAuthorized, NvrError
 from .utils import (
     decode_token_cookie,
@@ -1123,23 +1123,6 @@ class ProtectApiClient(BaseApiClient):
         This is a great alternative if you need metadata about the NVR without connecting to the Websocket
         """
         data = await self.api_request_obj("bootstrap")
-        # fix for UniFi Protect bug, some cameras may come back with and old recording mode
-        # "motion" and "smartDetect" recording modes was combined into "detections" in Protect 1.20.0
-        call_again = False
-        for camera_dict in data["cameras"]:
-            if camera_dict.get("recordingSettings", {}).get("mode", "detections") in {
-                "motion",
-                "smartDetect",
-            }:
-                await self.update_device(
-                    ModelType.CAMERA,
-                    camera_dict["id"],
-                    {"recordingSettings": {"mode": RecordingMode.DETECTIONS.value}},
-                )
-                call_again = True
-
-        if call_again:
-            data = await self.api_request_obj("bootstrap")
         return Bootstrap.from_unifi_dict(**data, api=self)
 
     async def get_devices_raw(self, model_type: ModelType) -> list[dict[str, Any]]:

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/cli/base.py

@@ -14,11 +14,6 @@ from ..data import NVR, ProtectAdoptableDeviceModel, ProtectBaseObject
 from ..exceptions import BadRequest, NvrError, StreamError
 from ..utils import run_async
 
-try:
-    from pydantic.v1 import ValidationError
-except ImportError:
-    from pydantic import ValidationError  # type: ignore[assignment]
-
 T = TypeVar("T")
 
 OPTION_FORCE = typer.Option(False, "-f", "--force", help="Skip confirmation prompt")

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/data/base.py

@@ -11,6 +11,9 @@ from ipaddress import IPv4Address
 from typing import TYPE_CHECKING, Any, ClassVar, TypeVar
 from uuid import UUID
 
+from pydantic.v1 import BaseModel
+from pydantic.v1.fields import SHAPE_DICT, SHAPE_LIST, PrivateAttr
+
 from ..exceptions import BadRequest, ClientError, NotAuthorized
 from ..utils import (
     asyncio_timeout,
@@ -34,17 +37,6 @@ from .websocket import (
     WSPacketFrameHeader,
 )
 
-try:
-    from pydantic.v1 import BaseModel
-    from pydantic.v1.fields import SHAPE_DICT, SHAPE_LIST, PrivateAttr
-except ImportError:
-    from pydantic import BaseModel  # type: ignore[assignment, no-redef]
-    from pydantic.fields import (  # type: ignore[attr-defined, assignment, no-redef]
-        SHAPE_DICT,
-        SHAPE_LIST,
-        PrivateAttr,
-    )
-
 if TYPE_CHECKING:
     from asyncio.events import TimerHandle
 
@@ -483,7 +475,7 @@ class ProtectBaseObject(BaseModel):
                 if (unifi_obj := getattr(cls, key)) is not None:
                     value = unifi_obj.update_from_dict(item)
                 else:
-                    value = None
+                    value = unifi_objs[key](**item, api=api)
             elif has_unifi_lists and key in unifi_lists and isinstance(item, list):
                 klass = unifi_lists[key]
                 value = [

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/data/bootstrap.py

@@ -10,11 +10,7 @@ from datetime import datetime
 from typing import TYPE_CHECKING, Any
 
 from aiohttp.client_exceptions import ServerDisconnectedError
-
-try:
-    from pydantic.v1 import PrivateAttr, ValidationError
-except ImportError:
-    from pydantic import PrivateAttr, ValidationError  # type: ignore[assignment]
+from pydantic.v1 import PrivateAttr, ValidationError
 
 from ..exceptions import ClientError
 from ..utils import normalize_mac, utc_now

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/data/devices.py

@@ -12,10 +12,7 @@ from ipaddress import IPv4Address
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, cast
 
-try:
-    from pydantic.v1.fields import PrivateAttr
-except ImportError:
-    from pydantic.fields import PrivateAttr
+from pydantic.v1.fields import PrivateAttr
 
 from ..exceptions import BadRequest, NotAuthorized, StreamError
 from ..stream import TalkbackStream

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/data/nvr.py

@@ -16,6 +16,7 @@ from uuid import UUID
 import aiofiles
 import orjson
 from aiofiles import os as aos
+from pydantic.v1.fields import PrivateAttr
 
 from ..exceptions import BadRequest, NotAuthorized
 from ..utils import RELEASE_CACHE, convert_to_datetime
@@ -58,16 +59,8 @@ from .types import (
 )
 from .user import User, UserLocation
 
-try:
-    from pydantic.v1.fields import PrivateAttr
-except ImportError:
-    from pydantic.fields import PrivateAttr
-
 if TYPE_CHECKING:
-    try:
-        from pydantic.v1.typing import SetStr
-    except ImportError:
-        from pydantic.typing import SetStr  # type: ignore[assignment, no-redef]
+    from pydantic.v1.typing import SetStr
 
 
 _LOGGER = logging.getLogger(__name__)

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/data/types.py

@@ -6,18 +6,9 @@ from functools import cache, cached_property
 from typing import Any, Literal, Optional, TypeVar, Union
 
 from packaging.version import Version as BaseVersion
-
-try:
-    from pydantic.v1 import BaseModel, ConstrainedInt
-    from pydantic.v1.color import Color as BaseColor
-    from pydantic.v1.types import ConstrainedFloat, ConstrainedStr
-except ImportError:
-    from pydantic import BaseModel, ConstrainedInt  # type: ignore[assignment, no-redef]
-    from pydantic.color import Color as BaseColor  # type: ignore[assignment, no-redef]
-    from pydantic.types import (  # type: ignore[assignment, no-redef]
-        ConstrainedFloat,
-        ConstrainedStr,
-    )
+from pydantic.v1 import BaseModel, ConstrainedInt
+from pydantic.v1.color import Color as BaseColor
+from pydantic.v1.types import ConstrainedFloat, ConstrainedStr
 
 KT = TypeVar("KT")
 VT = TypeVar("VT")

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/data/user.py

@@ -6,10 +6,7 @@ from datetime import datetime
 from functools import cache
 from typing import Any
 
-try:
-    from pydantic.v1.fields import PrivateAttr
-except ImportError:
-    from pydantic.fields import PrivateAttr
+from pydantic.v1.fields import PrivateAttr
 
 from .base import ProtectBaseObject, ProtectModel, ProtectModelWithId
 from .types import ModelType, PermissionNode

{uiprotect-1.19.1 → uiprotect-1.19.3}/src/uiprotect/utils.py

@@ -28,6 +28,8 @@ from uuid import UUID
 
 import jwt
 from aiohttp import ClientResponse
+from pydantic.v1.fields import SHAPE_DICT, SHAPE_LIST, SHAPE_SET, ModelField
+from pydantic.v1.utils import to_camel
 
 from .data.types import (
     Color,
@@ -38,18 +40,6 @@ from .data.types import (
 )
 from .exceptions import NvrError
 
-try:
-    from pydantic.v1.fields import SHAPE_DICT, SHAPE_LIST, SHAPE_SET, ModelField
-    from pydantic.v1.utils import to_camel
-except ImportError:
-    from pydantic.fields import (  # type: ignore[assignment, no-redef, attr-defined]
-        SHAPE_DICT,
-        SHAPE_LIST,
-        SHAPE_SET,
-        ModelField,
-    )
-    from pydantic.utils import to_camel  # type: ignore[assignment, no-redef]
-
 if TYPE_CHECKING:
     from uiprotect.api import ProtectApiClient
     from uiprotect.data import CoordType, Event