uiprotect 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

uiprotect/cli/base.py

@@ -14,6 +14,11 @@ from uiprotect.data import NVR, ProtectAdoptableDeviceModel, ProtectBaseObject
 from uiprotect.exceptions import BadRequest, NvrError, StreamError
 from uiprotect.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/data/base.py

@@ -11,9 +11,6 @@ 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 uiprotect.data.types import (
     ModelType,
     PercentFloat,
@@ -37,10 +34,20 @@ from uiprotect.utils import (
     to_snake_case,
 )
 
+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
 
-    from pydantic.v1.typing import DictStrAny, SetStr
     from typing_extensions import Self  # requires Python 3.11+
 
     from uiprotect.api import ProtectApiClient
@@ -48,6 +55,14 @@ if TYPE_CHECKING:
     from uiprotect.data.nvr import Event
     from uiprotect.data.user import User
 
+    try:
+        from pydantic.v1.typing import DictStrAny, SetStr
+    except ImportError:
+        from pydantic.typing import (  # type: ignore[assignment, no-redef]
+            DictStrAny,
+            SetStr,
+        )
+
 
 ProtectObject = TypeVar("ProtectObject", bound="ProtectBaseObject")
 RECENT_EVENT_MAX = timedelta(seconds=30)

uiprotect/data/bootstrap.py

@@ -11,7 +11,11 @@ from typing import Any, cast
 from uuid import UUID
 
 from aiohttp.client_exceptions import ServerDisconnectedError
-from pydantic.v1 import PrivateAttr, ValidationError
+
+try:
+    from pydantic.v1 import PrivateAttr, ValidationError
+except ImportError:
+    from pydantic import PrivateAttr, ValidationError  # type: ignore[assignment]
 
 from uiprotect.data.base import (
     RECENT_EVENT_MAX,

uiprotect/data/devices.py

@@ -12,7 +12,10 @@ from ipaddress import IPv4Address
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, cast
 
-from pydantic.v1.fields import PrivateAttr
+try:
+    from pydantic.v1.fields import PrivateAttr
+except ImportError:
+    from pydantic.fields import PrivateAttr
 
 from uiprotect.data.base import (
     EVENT_PING_INTERVAL,

uiprotect/data/nvr.py

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

uiprotect/data/types.py

@@ -5,9 +5,18 @@ from collections.abc import Callable, Coroutine
 from typing import Any, Literal, Optional, TypeVar, Union
 
 from packaging.version import Version as BaseVersion
-from pydantic.v1 import BaseModel, ConstrainedInt
-from pydantic.v1.color import Color as BaseColor
-from pydantic.v1.types import ConstrainedFloat, ConstrainedStr
+
+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,
+    )
 
 KT = TypeVar("KT")
 VT = TypeVar("VT")

uiprotect/data/user.py

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

uiprotect/utils.py

@@ -28,8 +28,6 @@ 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 uiprotect.data.types import (
     Color,
@@ -40,6 +38,18 @@ from uiprotect.data.types import (
 )
 from uiprotect.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

{uiprotect-0.3.6.dist-info → uiprotect-0.3.7.dist-info}/METADATA

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

{uiprotect-0.3.6.dist-info → uiprotect-0.3.7.dist-info}/RECORD

@@ -3,7 +3,7 @@ uiprotect/__main__.py,sha256=T69KE5W4zek6qeNEL8_Fq2DEfBc04SqSuIOJpiW4ydE,471
 uiprotect/api.py,sha256=mmAmPBs0Zev_2KWLO_l5QU8pFOsFzuYt-OZMvfV3mq0,65694
 uiprotect/cli/__init__.py,sha256=tmwtYrhM8rjOw8noKD6NALl_2Nu3xIycDuQyEKD5oMk,8832
 uiprotect/cli/backup.py,sha256=Mtjd2f0w7zjIeLkJILKxiBnZJYXypzC9gpyAmBZ8sq0,36746
-uiprotect/cli/base.py,sha256=IyK_JZbw7C6m8R46iMzfVOs4on5TpedFxaDrYz_v_0g,7623
+uiprotect/cli/base.py,sha256=dE6vYb4nLAYbUdHwcKkN7I3iXqTjz84jfHGnsLmk_Ds,7762
 uiprotect/cli/cameras.py,sha256=mVLJ5FjZPSbpNXvtd7Yiz17zMDSdLWT0p6Wcaqpt0GQ,16996
 uiprotect/cli/chimes.py,sha256=92kNiZN7FpuCF7CqK9oLPt2jQ96tNhTjP1JcOdJAKhU,5350
 uiprotect/cli/doorlocks.py,sha256=XMftrrK0O0bWZHOuTwg9m4p9U7gC0FzHFb72bSnlUEg,3547
@@ -14,13 +14,13 @@ uiprotect/cli/nvr.py,sha256=PVpUitWzP9HLy2yoj0HP-b-4Te5AFCrahUAmrQJ4z-w,4276
 uiprotect/cli/sensors.py,sha256=CE77weDkYepo9eEs1J0ModIs3pWNWmesjAq3rlmiez0,8177
 uiprotect/cli/viewers.py,sha256=SZlolZH3kkcWKjATrA37TCVZYRpF0t4cCccrC8vIv-M,2195
 uiprotect/data/__init__.py,sha256=38Kb1DVi4kv9FTTwugatPNSWLiIp6uvUlTMZRQp2jTY,3050
-uiprotect/data/base.py,sha256=k65F05OHN2l-nlQ5bVeXxTSYvvGj7pZz_jfe2KmWOSk,37423
-uiprotect/data/bootstrap.py,sha256=d3SmJa4SJkosNc_Ve_ySPnRxtIfxXdioTmAoczuz3YQ,21738
+uiprotect/data/base.py,sha256=YJ0iofoy1K3EG55npokU3T2CLRC8kctutfIy0Sq_6Sg,37850
+uiprotect/data/bootstrap.py,sha256=bRuJ4QhizoVd_dbmpO5Wpd2NlHHkqtrPz4mO-e11A9M,21850
 uiprotect/data/convert.py,sha256=f8QkwZnlNbV_W-YognlDvZ1gQKp5yFuC50396hcu6DU,2127
-uiprotect/data/devices.py,sha256=RMucQXXAyN6VwLvFZwsxauStwXZkdQGUITSZ9h_iQXY,112765
-uiprotect/data/nvr.py,sha256=eDfSAeOvaI1bHrpkZReW76934lrEBz8GKOfxDfq7xlw,47485
-uiprotect/data/types.py,sha256=5eLL2jBl1eHiMwxbL6l0qngsmhg1F0dBrAS5GtDVdgg,15427
-uiprotect/data/user.py,sha256=c-rslssNHhHOYplPE5lGGfuDexvI0mVYhbb6Xyi5dgo,7022
+uiprotect/data/devices.py,sha256=QMIbCEhgMehBemCUPzVJnSQG4O-BfHfnQ88lpOnbDWg,112838
+uiprotect/data/nvr.py,sha256=JZja0QiT91Eu8-lw_M0Ora1KGNXhbG5dVNLN8YdeSw0,47677
+uiprotect/data/types.py,sha256=XYFop75mOip0dbJeejitX9r5MJDFmblCk__QiWuDzCQ,15769
+uiprotect/data/user.py,sha256=HZJh9IOXS23kM-szTn7dGGsRZz9w2_9DqltL90gcMoE,7095
 uiprotect/data/websocket.py,sha256=HKAze9b9soOS03_2zixRTR7jlFIA4ph9wMZEo15q6NY,6107
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
 uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,10 +28,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=V4aJfVWpSUsWE1PQrXH8F7obQQi1ukPAZ7PzwABjt0I,4942
 uiprotect/test_util/__init__.py,sha256=sSEXu6_pwdYNQSCYtftpX1Dy1S8XYOvhrpECYRxeKJE,18596
 uiprotect/test_util/anonymize.py,sha256=AGYELhDC4BrdK0deI6zh5jFp3SuM_HvAWLeoxFHSiwg,8486
-uiprotect/utils.py,sha256=kGh1DcejItZ0_XEoAQNVZMtU1w9JHIeNSvm3T-llSxs,17841
+uiprotect/utils.py,sha256=xP8t0wEBIGS___LUYRNnQuXvUbjKDbsOnnSwWDzphSw,18124
 uiprotect/websocket.py,sha256=iMTdchymaCgVHsmY1bRbxkcymqt6WQircIHYNxCu178,7289
-uiprotect-0.3.6.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-0.3.6.dist-info/METADATA,sha256=M6jZfOWKuUN1s8lZImsBONe7DpPX-BKIx_Ekurbf5kE,10923
-uiprotect-0.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-0.3.6.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-0.3.6.dist-info/RECORD,,
+uiprotect-0.3.7.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-0.3.7.dist-info/METADATA,sha256=HzrXakwpZ4Bsq1dRVIGFBnnc44yzxY97pGtUg329ATw,10923
+uiprotect-0.3.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-0.3.7.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-0.3.7.dist-info/RECORD,,