uiprotect 0.3.6__tar.gz → 0.3.7__tar.gz

{uiprotect-0.3.6 → uiprotect-0.3.7}/PKG-INFO

@@ -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 → uiprotect-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "0.3.6"
+version = "0.3.7"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"

{uiprotect-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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-0.3.6 → uiprotect-0.3.7}/src/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