uiprotect 0.5.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

uiprotect/__init__.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.exceptions import Invalid, NotAuthorized, NvrError
+from .api import ProtectApiClient
+from .exceptions import Invalid, NotAuthorized, NvrError
 
 __all__ = [
     "Invalid",

uiprotect/__main__.py

@@ -7,7 +7,7 @@ try:
 except ImportError:
     load_dotenv = None  # type: ignore[assignment]
 
-from uiprotect.cli import app
+from .cli import app
 
 
 def start() -> None:

uiprotect/api.py

@@ -25,7 +25,7 @@ from aiohttp import CookieJar, client_exceptions
 from platformdirs import user_cache_dir, user_config_dir
 from yarl import URL
 
-from uiprotect.data import (
+from .data import (
     NVR,
     Bootstrap,
     Bridge,
@@ -50,11 +50,11 @@ from uiprotect.data import (
     WSSubscriptionMessage,
     create_from_unifi_dict,
 )
-from uiprotect.data.base import ProtectModelWithId
-from uiprotect.data.devices import Chime
-from uiprotect.data.types import IteratorCallback, ProgressCallback, RecordingMode
-from uiprotect.exceptions import BadRequest, NotAuthorized, NvrError
-from uiprotect.utils import (
+from .data.base import ProtectModelWithId
+from .data.devices import Chime
+from .data.types import IteratorCallback, ProgressCallback, RecordingMode
+from .exceptions import BadRequest, NotAuthorized, NvrError
+from .utils import (
     decode_token_cookie,
     get_response_reason,
     ip_from_host,
@@ -62,7 +62,7 @@ from uiprotect.utils import (
     to_js_time,
     utc_now,
 )
-from uiprotect.websocket import Websocket
+from .websocket import Websocket
 
 TOKEN_COOKIE_MAX_EXP_SECONDS = 60
 

uiprotect/cli/__init__.py

@@ -12,23 +12,24 @@ import typer
 from rich.progress import track
 
 from uiprotect.api import ProtectApiClient
-from uiprotect.cli.base import CliContext, OutputFormatEnum
-from uiprotect.cli.cameras import app as camera_app
-from uiprotect.cli.chimes import app as chime_app
-from uiprotect.cli.doorlocks import app as doorlock_app
-from uiprotect.cli.events import app as event_app
-from uiprotect.cli.lights import app as light_app
-from uiprotect.cli.liveviews import app as liveview_app
-from uiprotect.cli.nvr import app as nvr_app
-from uiprotect.cli.sensors import app as sensor_app
-from uiprotect.cli.viewers import app as viewer_app
-from uiprotect.data import Version, WSPacket
-from uiprotect.test_util import SampleDataGenerator
-from uiprotect.utils import RELEASE_CACHE, get_local_timezone, run_async
-from uiprotect.utils import profile_ws as profile_ws_job
+
+from ..data import Version, WSPacket
+from ..test_util import SampleDataGenerator
+from ..utils import RELEASE_CACHE, get_local_timezone, run_async
+from ..utils import profile_ws as profile_ws_job
+from .base import CliContext, OutputFormatEnum
+from .cameras import app as camera_app
+from .chimes import app as chime_app
+from .doorlocks import app as doorlock_app
+from .events import app as event_app
+from .lights import app as light_app
+from .liveviews import app as liveview_app
+from .nvr import app as nvr_app
+from .sensors import app as sensor_app
+from .viewers import app as viewer_app
 
 try:
-    from uiprotect.cli.backup import app as backup_app
+    from .backup import app as backup_app
 except ImportError:
     backup_app = None  # type: ignore[assignment]
 

uiprotect/cli/backup.py

@@ -32,10 +32,10 @@ from sqlalchemy import event as saevent
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from sqlalchemy.orm import Mapped, declarative_base, relationship
 
-from uiprotect import data as d
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.utils import (
+from .. import data as d
+from ..api import ProtectApiClient
+from ..cli import base
+from ..utils import (
     format_duration,
     get_local_timezone,
     local_datetime,

uiprotect/cli/base.py

@@ -9,10 +9,10 @@ import orjson
 import typer
 from pydantic.v1 import ValidationError
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.data import NVR, ProtectAdoptableDeviceModel, ProtectBaseObject
-from uiprotect.exceptions import BadRequest, NvrError, StreamError
-from uiprotect.utils import run_async
+from ..api import ProtectApiClient
+from ..data import NVR, ProtectAdoptableDeviceModel, ProtectBaseObject
+from ..exceptions import BadRequest, NvrError, StreamError
+from ..utils import run_async
 
 try:
     from pydantic.v1 import ValidationError

uiprotect/cli/cameras.py

@@ -8,9 +8,9 @@ from typing import Optional, cast
 import typer
 from rich.progress import Progress
 
-from uiprotect import data as d
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
+from .. import data as d
+from ..api import ProtectApiClient
+from ..cli import base
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/chimes.py

@@ -5,9 +5,9 @@ from typing import Optional
 
 import typer
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.data import Chime
+from ..api import ProtectApiClient
+from ..cli import base
+from ..data import Chime
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/doorlocks.py

@@ -6,9 +6,9 @@ from typing import Optional
 
 import typer
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.data import Doorlock
+from ..api import ProtectApiClient
+from ..cli import base
+from ..data import Doorlock
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/events.py

@@ -9,11 +9,11 @@ from typing import Optional
 import typer
 from rich.progress import Progress
 
-from uiprotect import data as d
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.exceptions import NvrError
-from uiprotect.utils import local_datetime
+from .. import data as d
+from ..api import ProtectApiClient
+from ..cli import base
+from ..exceptions import NvrError
+from ..utils import local_datetime
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/lights.py

@@ -6,9 +6,9 @@ from typing import Optional
 
 import typer
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.data import Light
+from ..api import ProtectApiClient
+from ..cli import base
+from ..data import Light
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/liveviews.py

@@ -5,9 +5,9 @@ from typing import Optional
 
 import typer
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.data import Liveview
+from ..api import ProtectApiClient
+from ..cli import base
+from ..data import Liveview
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/nvr.py

@@ -6,8 +6,8 @@ from datetime import timedelta
 import orjson
 import typer
 
-from uiprotect.cli import base
-from uiprotect.data import NVR, AnalyticsOption
+from ..cli import base
+from ..data import NVR, AnalyticsOption
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/sensors.py

@@ -5,9 +5,9 @@ from typing import Optional
 
 import typer
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.data import MountType, Sensor
+from ..api import ProtectApiClient
+from ..cli import base
+from ..data import MountType, Sensor
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/cli/viewers.py

@@ -5,9 +5,9 @@ from typing import Optional
 
 import typer
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.cli import base
-from uiprotect.data import Viewer
+from ..api import ProtectApiClient
+from ..cli import base
+from ..data import Viewer
 
 app = typer.Typer(rich_markup_mode="rich")
 

uiprotect/data/__init__.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
-from uiprotect.data.base import (
+from .base import (
     ProtectAdoptableDeviceModel,
     ProtectBaseObject,
     ProtectDeviceModel,
     ProtectModel,
     ProtectModelWithId,
 )
-from uiprotect.data.bootstrap import Bootstrap
-from uiprotect.data.convert import create_from_unifi_dict
-from uiprotect.data.devices import (
+from .bootstrap import Bootstrap
+from .convert import create_from_unifi_dict
+from .devices import (
     Bridge,
     Camera,
     CameraChannel,
@@ -21,7 +21,7 @@ from uiprotect.data.devices import (
     Sensor,
     Viewer,
 )
-from uiprotect.data.nvr import (
+from .nvr import (
     NVR,
     DoorbellMessage,
     Event,
@@ -30,7 +30,7 @@ from uiprotect.data.nvr import (
     SmartDetectItem,
     SmartDetectTrack,
 )
-from uiprotect.data.types import (
+from .types import (
     DEFAULT,
     DEFAULT_TYPE,
     AnalyticsOption,
@@ -69,8 +69,8 @@ from uiprotect.data.types import (
     VideoMode,
     WDRLevel,
 )
-from uiprotect.data.user import CloudAccount, Group, Permission, User, UserLocation
-from uiprotect.data.websocket import (
+from .user import CloudAccount, Group, Permission, User, UserLocation
+from .websocket import (
     WS_HEADER_SIZE,
     WSAction,
     WSJSONPacketFrame,

uiprotect/data/base.py

@@ -11,28 +11,28 @@ from ipaddress import IPv4Address
 from typing import TYPE_CHECKING, Any, ClassVar, TypeVar
 from uuid import UUID
 
-from uiprotect.data.types import (
+from ..exceptions import BadRequest, ClientError, NotAuthorized
+from ..utils import (
+    asyncio_timeout,
+    convert_unifi_data,
+    dict_diff,
+    is_debug,
+    process_datetime,
+    serialize_unifi_obj,
+    to_snake_case,
+)
+from .types import (
     ModelType,
     PercentFloat,
     PermissionNode,
     ProtectWSPayloadFormat,
     StateType,
 )
-from uiprotect.data.websocket import (
+from .websocket import (
     WSJSONPacketFrame,
     WSPacket,
     WSPacketFrameHeader,
 )
-from uiprotect.exceptions import BadRequest, ClientError, NotAuthorized
-from uiprotect.utils import (
-    asyncio_timeout,
-    convert_unifi_data,
-    dict_diff,
-    is_debug,
-    process_datetime,
-    serialize_unifi_obj,
-    to_snake_case,
-)
 
 try:
     from pydantic.v1 import BaseModel
@@ -50,17 +50,16 @@ if TYPE_CHECKING:
 
     from typing_extensions import Self  # requires Python 3.11+
 
-    from uiprotect.api import ProtectApiClient
-    from uiprotect.data.devices import Bridge
-    from uiprotect.data.nvr import Event
-    from uiprotect.data.user import User
+    from ..api import ProtectApiClient
+    from ..data.devices import Bridge
+    from ..data.nvr import Event
+    from ..data.user import User
 
     try:
-        from pydantic.v1.typing import DictStrAny, SetStr
+        from pydantic.v1.typing import DictStrAny
     except ImportError:
         from pydantic.typing import (  # type: ignore[assignment, no-redef]
             DictStrAny,
-            SetStr,
         )
 
 
@@ -88,11 +87,8 @@ class ProtectBaseObject(BaseModel):
     _api: ProtectApiClient | None = PrivateAttr(None)
 
     _protect_objs: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_objs_set: ClassVar[SetStr | None] = None
     _protect_lists: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_lists_set: ClassVar[SetStr | None] = None
     _protect_dicts: ClassVar[dict[str, type[ProtectBaseObject]] | None] = None
-    _protect_dicts_set: ClassVar[SetStr | None] = None
     _to_unifi_remaps: ClassVar[DictStrAny | None] = None
 
     class Config:
@@ -140,7 +136,7 @@ class ProtectBaseObject(BaseModel):
 
     @classmethod
     def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
-        api = values.pop("api", None)
+        api: ProtectApiClient | None = values.pop("api", None)
         values_set = set(values)
 
         unifi_objs = cls._get_protect_objs()
@@ -192,6 +188,12 @@ class ProtectBaseObject(BaseModel):
         """
         return {}
 
+    @classmethod
+    @cache
+    def _get_unifi_remaps_set(self) -> set[str]:
+        """Helper method to get set of all child UFP objects."""
+        return set(self._get_unifi_remaps())
+
     @classmethod
     def _get_to_unifi_remaps(cls) -> dict[str, str]:
         """
@@ -231,63 +233,49 @@ class ProtectBaseObject(BaseModel):
                 pass
 
     @classmethod
+    @cache
     def _get_protect_objs(cls) -> dict[str, type[ProtectBaseObject]]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_objs is not None:
-            return cls._protect_objs
-
-        cls._set_protect_subtypes()
-        return cls._protect_objs  # type: ignore[return-value]
+        if cls._protect_objs is None:
+            cls._set_protect_subtypes()
+            assert cls._protect_objs is not None
+        return cls._protect_objs
 
     @classmethod
+    @cache
     def _get_protect_objs_set(cls) -> set[str]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_objs_set is None:
-            cls._protect_objs_set = set(cls._get_protect_objs().keys())
-
-        return cls._protect_objs_set
+        return set(cls._get_protect_objs())
 
     @classmethod
+    @cache
     def _get_protect_lists(cls) -> dict[str, type[ProtectBaseObject]]:
         """Helper method to get all child of UFP objects (lists)"""
-        if cls._protect_lists is not None:
-            return cls._protect_lists
-
-        cls._set_protect_subtypes()
-        return cls._protect_lists  # type: ignore[return-value]
+        if cls._protect_lists is None:
+            cls._set_protect_subtypes()
+            assert cls._protect_lists is not None
+        return cls._protect_lists
 
     @classmethod
+    @cache
     def _get_protect_lists_set(cls) -> set[str]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_lists_set is None:
-            cls._protect_lists_set = set(cls._get_protect_lists().keys())
-
-        return cls._protect_lists_set
+        return set(cls._get_protect_lists())
 
     @classmethod
+    @cache
     def _get_protect_dicts(cls) -> dict[str, type[ProtectBaseObject]]:
         """Helper method to get all child of UFP objects (dicts)"""
-        if cls._protect_dicts is not None:
-            return cls._protect_dicts
-
-        cls._set_protect_subtypes()
-        return cls._protect_dicts  # type: ignore[return-value]
+        if cls._protect_dicts is None:
+            cls._set_protect_subtypes()
+            assert cls._protect_dicts is not None
+        return cls._protect_dicts
 
     @classmethod
+    @cache
     def _get_protect_dicts_set(cls) -> set[str]:
         """Helper method to get all child UFP objects"""
-        if cls._protect_dicts_set is None:
-            cls._protect_dicts_set = set(cls._get_protect_dicts().keys())
-
-        return cls._protect_dicts_set
-
-    @classmethod
-    def _get_api(cls, api: ProtectApiClient | None) -> ProtectApiClient | None:
-        """Helper method to try to find and the current ProjtectAPIClient instance from given data"""
-        if api is None and isinstance(cls, ProtectBaseObject) and hasattr(cls, "_api"):  # type: ignore[unreachable]
-            api = cls._api  # type: ignore[unreachable]
-
-        return api
+        return set(cls._get_protect_dicts())
 
     @classmethod
     def _clean_protect_obj(
@@ -340,11 +328,13 @@ class ProtectBaseObject(BaseModel):
 
         """
         # get the API client instance
-        api = cls._get_api(data.get("api"))
+        api: ProtectApiClient | None = data.get("api") or (
+            cls._api if isinstance(cls, ProtectBaseObject) else None
+        )
 
         # remap keys that will not be converted correctly by snake_case convert
         remaps = cls._get_unifi_remaps()
-        for from_key in set(remaps).intersection(data):
+        for from_key in cls._get_unifi_remaps_set().intersection(data):
             data[remaps[from_key]] = data.pop(from_key)
 
         # convert to snake_case and remove extra fields

uiprotect/data/bootstrap.py

@@ -7,7 +7,7 @@ import logging
 from copy import deepcopy
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from aiohttp.client_exceptions import ServerDisconnectedError
 
@@ -16,14 +16,16 @@ try:
 except ImportError:
     from pydantic import PrivateAttr, ValidationError  # type: ignore[assignment]
 
-from uiprotect.data.base import (
+from ..exceptions import ClientError
+from ..utils import utc_now
+from .base import (
     RECENT_EVENT_MAX,
     ProtectBaseObject,
     ProtectModel,
     ProtectModelWithId,
 )
-from uiprotect.data.convert import create_from_unifi_dict
-from uiprotect.data.devices import (
+from .convert import create_from_unifi_dict
+from .devices import (
     Bridge,
     Camera,
     Chime,
@@ -33,17 +35,19 @@ from uiprotect.data.devices import (
     Sensor,
     Viewer,
 )
-from uiprotect.data.nvr import NVR, Event, Liveview
-from uiprotect.data.types import EventType, FixSizeOrderedDict, ModelType
-from uiprotect.data.user import Group, User
-from uiprotect.data.websocket import (
+from .nvr import NVR, Event, Liveview
+from .types import EventType, FixSizeOrderedDict, ModelType
+from .user import Group, User
+from .websocket import (
     WSAction,
     WSJSONPacketFrame,
     WSPacket,
     WSSubscriptionMessage,
 )
-from uiprotect.exceptions import ClientError
-from uiprotect.utils import utc_now
+
+if TYPE_CHECKING:
+    from ..api import ProtectApiClient
+
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -198,7 +202,9 @@ class Bootstrap(ProtectBaseObject):
 
     @classmethod
     def unifi_dict_to_dict(cls, data: dict[str, Any]) -> dict[str, Any]:
-        api = cls._get_api(data.get("api"))
+        api: ProtectApiClient | None = data.get("api") or (
+            cls._api if isinstance(cls, ProtectBaseObject) else None
+        )
         data["macLookup"] = {}
         data["idLookup"] = {}
         for model_type in ModelType.bootstrap_models():

uiprotect/data/convert.py

@@ -4,7 +4,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from uiprotect.data.devices import (
+from ..exceptions import DataDecodeError
+from .devices import (
     Bridge,
     Camera,
     Chime,
@@ -13,14 +14,13 @@ from uiprotect.data.devices import (
     Sensor,
     Viewer,
 )
-from uiprotect.data.nvr import NVR, Event, Liveview
-from uiprotect.data.types import ModelType
-from uiprotect.data.user import CloudAccount, Group, User, UserLocation
-from uiprotect.exceptions import DataDecodeError
+from .nvr import NVR, Event, Liveview
+from .types import ModelType
+from .user import CloudAccount, Group, User, UserLocation
 
 if TYPE_CHECKING:
-    from uiprotect.api import ProtectApiClient
-    from uiprotect.data.base import ProtectModel
+    from ..api import ProtectApiClient
+    from ..data.base import ProtectModel
 
 
 MODEL_TO_CLASS: dict[str, type[ProtectModel]] = {

uiprotect/data/devices.py

@@ -17,13 +17,26 @@ try:
 except ImportError:
     from pydantic.fields import PrivateAttr
 
-from uiprotect.data.base import (
+from ..exceptions import BadRequest, NotAuthorized, StreamError
+from ..stream import TalkbackStream
+from ..utils import (
+    clamp_value,
+    convert_smart_audio_types,
+    convert_smart_types,
+    convert_video_modes,
+    from_js_time,
+    process_datetime,
+    serialize_point,
+    to_js_time,
+    utc_now,
+)
+from .base import (
     EVENT_PING_INTERVAL,
     ProtectAdoptableDeviceModel,
     ProtectBaseObject,
     ProtectMotionDeviceModel,
 )
-from uiprotect.data.types import (
+from .types import (
     DEFAULT,
     DEFAULT_TYPE,
     AudioCodecs,
@@ -65,23 +78,10 @@ from uiprotect.data.types import (
     VideoMode,
     WDRLevel,
 )
-from uiprotect.data.user import User
-from uiprotect.exceptions import BadRequest, NotAuthorized, StreamError
-from uiprotect.stream import TalkbackStream
-from uiprotect.utils import (
-    clamp_value,
-    convert_smart_audio_types,
-    convert_smart_types,
-    convert_video_modes,
-    from_js_time,
-    process_datetime,
-    serialize_point,
-    to_js_time,
-    utc_now,
-)
+from .user import User
 
 if TYPE_CHECKING:
-    from uiprotect.data.nvr import Event, Liveview
+    from .nvr import Event, Liveview
 
 PRIVACY_ZONE_NAME = "pyufp_privacy_zone"
 LUX_MAPPING_VALUES = [

uiprotect/data/nvr.py

@@ -16,12 +16,14 @@ import aiofiles
 import orjson
 from aiofiles import os as aos
 
-from uiprotect.data.base import (
+from ..exceptions import BadRequest, NotAuthorized
+from ..utils import RELEASE_CACHE, process_datetime
+from .base import (
     ProtectBaseObject,
     ProtectDeviceModel,
     ProtectModelWithId,
 )
-from uiprotect.data.devices import (
+from .devices import (
     Camera,
     CameraZone,
     Light,
@@ -30,7 +32,7 @@ from uiprotect.data.devices import (
     Sensor,
     SmartDetectSettings,
 )
-from uiprotect.data.types import (
+from .types import (
     AnalyticsOption,
     DoorbellMessageType,
     DoorbellText,
@@ -53,9 +55,7 @@ from uiprotect.data.types import (
     StorageType,
     Version,
 )
-from uiprotect.data.user import User, UserLocation
-from uiprotect.exceptions import BadRequest, NotAuthorized
-from uiprotect.utils import RELEASE_CACHE, process_datetime
+from .user import User, UserLocation
 
 try:
     from pydantic.v1.fields import PrivateAttr

uiprotect/data/user.py

@@ -11,8 +11,8 @@ try:
 except ImportError:
     from pydantic.fields import PrivateAttr
 
-from uiprotect.data.base import ProtectBaseObject, ProtectModel, ProtectModelWithId
-from uiprotect.data.types import ModelType, PermissionNode
+from .base import ProtectBaseObject, ProtectModel, ProtectModelWithId
+from .types import ModelType, PermissionNode
 
 
 class Permission(ProtectBaseObject):

uiprotect/data/websocket.py

@@ -11,11 +11,11 @@ from typing import TYPE_CHECKING, Any
 
 import orjson
 
-from uiprotect.data.types import ProtectWSPayloadFormat
-from uiprotect.exceptions import WSDecodeError, WSEncodeError
+from ..exceptions import WSDecodeError, WSEncodeError
+from .types import ProtectWSPayloadFormat
 
 if TYPE_CHECKING:
-    from uiprotect.data.base import ProtectModelWithId
+    from .base import ProtectModelWithId
 
 WS_HEADER_SIZE = 8
 

uiprotect/stream.py

@@ -11,10 +11,10 @@ from urllib.parse import urlparse
 
 from aioshutil import which
 
-from uiprotect.exceptions import BadRequest, StreamError
+from .exceptions import BadRequest, StreamError
 
 if TYPE_CHECKING:
-    from uiprotect.data import Camera
+    from .data import Camera
 
 _LOGGER = logging.getLogger(__name__)
 

uiprotect/test_util/__init__.py

@@ -15,14 +15,14 @@ from typing import Any, overload
 import aiohttp
 from PIL import Image
 
-from uiprotect.api import ProtectApiClient
-from uiprotect.data import EventType, WSJSONPacketFrame, WSPacket
-from uiprotect.exceptions import BadRequest
-from uiprotect.test_util.anonymize import (
+from ..api import ProtectApiClient
+from ..data import EventType, WSJSONPacketFrame, WSPacket
+from ..exceptions import BadRequest
+from ..test_util.anonymize import (
     anonymize_data,
     anonymize_prefixed_event_id,
 )
-from uiprotect.utils import from_js_time, is_online, run_async, write_json
+from ..utils import from_js_time, is_online, run_async, write_json
 
 BLANK_VIDEO_CMD = "ffmpeg -y -hide_banner -loglevel error -f lavfi -i color=size=1280x720:rate=25:color=black -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=44100 -t {length} {filename}"
 

uiprotect/test_util/anonymize.py

@@ -8,7 +8,7 @@ from urllib.parse import urlparse
 
 import typer
 
-from uiprotect.data import ModelType
+from ..data import ModelType
 
 object_id_mapping: dict[str, str] = {}
 

uiprotect/utils.py

@@ -29,14 +29,14 @@ from uuid import UUID
 import jwt
 from aiohttp import ClientResponse
 
-from uiprotect.data.types import (
+from .data.types import (
     Color,
     SmartDetectAudioType,
     SmartDetectObjectType,
     Version,
     VideoMode,
 )
-from uiprotect.exceptions import NvrError
+from .exceptions import NvrError
 
 try:
     from pydantic.v1.fields import SHAPE_DICT, SHAPE_LIST, SHAPE_SET, ModelField

{uiprotect-0.5.0.dist-info → uiprotect-0.7.0.dist-info}/METADATA

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

uiprotect-0.7.0.dist-info/RECORD

@@ -0,0 +1,37 @@
+uiprotect/__init__.py,sha256=llnQNtiBfwQG8IkQXovvFz4LZeFjrJx7XdmmUhu3a9E,289
+uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
+uiprotect/api.py,sha256=1eIAuA4GC32-mpibk-Avd4vU59fT_UgxqjKVP9ISTkY,65943
+uiprotect/cli/__init__.py,sha256=sSLW9keVQOkgFcMW18HTDjRrt9sJ0KWjn9DJDA6f9Pc,8658
+uiprotect/cli/backup.py,sha256=SxUyFFwLHcU60qsI8qBS_Xw7RLJeqUEdMAyjwk30MKw,36715
+uiprotect/cli/base.py,sha256=zpTm2kyJe_GLixnv3Uadke__iRLh64AEwQzp-2hqS7g,7730
+uiprotect/cli/cameras.py,sha256=YvvMccQEYG3Wih0Ix8tan1R1vfaJ6cogg6YKWLzMUV8,16973
+uiprotect/cli/chimes.py,sha256=XANn21bQVkestkKOm9HjxSM8ZGrRrqvUXLouaQ3LTqs,5326
+uiprotect/cli/doorlocks.py,sha256=Go_Tn68bAcmrRAnUIi4kBiR7ciKQsu_R150ubPTjUAs,3523
+uiprotect/cli/events.py,sha256=D5SRejKzsPpKlZ9O2J4wkJRigFRVEymiLyU8VQ43fqI,7186
+uiprotect/cli/lights.py,sha256=RxP1ebYEn2o5812OfrovmJLaNuIDoSNWiX1FvCbcdDw,3314
+uiprotect/cli/liveviews.py,sha256=GU5z-ZLRBXHyspDKiJpiv-kbaBcvxK_-K70rPoqx2Ms,1863
+uiprotect/cli/nvr.py,sha256=TwxEg2XT8jXAbOqv6gc7KFXELKadeItEDYweSL4_-e8,4260
+uiprotect/cli/sensors.py,sha256=fQtcDJCVxs4VbAqcavgBy2ABiVxAW3GXtna6_XFBp2k,8153
+uiprotect/cli/viewers.py,sha256=2cyrp104ffIvgT0wYGIO0G35QMkEbFe7fSVqLwDXQYQ,2171
+uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,2938
+uiprotect/data/base.py,sha256=f032w_AnTT3Hd85eBVs2XdnyzHpckdCwiJrsMQyLsR8,37192
+uiprotect/data/bootstrap.py,sha256=ibfCHqNhH44iw-JsuQs41zBCjb9ksSXz_QQq7qDbLsQ,21876
+uiprotect/data/convert.py,sha256=rOQplUMIdTMD2SbAx_iI9BNPDscnhDvyRVLEMDhtADg,2047
+uiprotect/data/devices.py,sha256=AsCQCoOpswdIU7X5ty1XhhOl2v6CkQCXu2Y-lIS_6_k,111712
+uiprotect/data/nvr.py,sha256=c8WxXpBcMaZ5REzCUb8aqmlLkttFYO1O5jLMhus5rkw,47605
+uiprotect/data/types.py,sha256=MTi9dVzKTp_8XtAmWKtbZujwE5plKGHdjglFGcJ4Yxs,15789
+uiprotect/data/user.py,sha256=yBnUQ3qpHL745hLhR41WjWv_Yx51RlmfHapgvK0KSgM,7067
+uiprotect/data/websocket.py,sha256=lkdobRh5SPu7YzLHyhZVe7qlh5W3L8LKzS63Md-4DOk,6048
+uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
+uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,386
+uiprotect/stream.py,sha256=McV3XymKyjn-1uV5jdQHcpaDjqLS4zWyMASQ8ubcyb4,4924
+uiprotect/test_util/__init__.py,sha256=d2g7afa0LSdixQ0kjEDYwafDFME_UlW2LzxpamZ2BC0,18556
+uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
+uiprotect/utils.py,sha256=gCLoZBQ94Yi9PqefiqTZK7WrvT3Byue79a4jvDc0k44,18226
+uiprotect/websocket.py,sha256=iMTdchymaCgVHsmY1bRbxkcymqt6WQircIHYNxCu178,7289
+uiprotect-0.7.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-0.7.0.dist-info/METADATA,sha256=RDKJOvu9_P8mVZTKOBwzBBfZhxXdU_KdMHbUrMQEnZ4,10984
+uiprotect-0.7.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-0.7.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-0.7.0.dist-info/RECORD,,

uiprotect-0.5.0.dist-info/RECORD

@@ -1,37 +0,0 @@
-uiprotect/__init__.py,sha256=tzcxK6cOIIkFEtST4Zjq3bafYTFWtwnaL92DgypjFi8,307
-uiprotect/__main__.py,sha256=T69KE5W4zek6qeNEL8_Fq2DEfBc04SqSuIOJpiW4ydE,471
-uiprotect/api.py,sha256=G2cvwLuanzvZ7dGfJOlAMvbKSBIsb7t3uOPB-KyT8gk,66006
-uiprotect/cli/__init__.py,sha256=tmwtYrhM8rjOw8noKD6NALl_2Nu3xIycDuQyEKD5oMk,8832
-uiprotect/cli/backup.py,sha256=Mtjd2f0w7zjIeLkJILKxiBnZJYXypzC9gpyAmBZ8sq0,36746
-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
-uiprotect/cli/events.py,sha256=Ni_igTOdOf11pklpNEocBdwd3EW6O0wD8Iz-lN2zMJA,7225
-uiprotect/cli/lights.py,sha256=EgJsQ37c3QzSKoYf6h-rCaQoiftNh2igY1bTB_tQz14,3338
-uiprotect/cli/liveviews.py,sha256=TrLAqG2_GpNoWyw9IRY-4mJmlFwxGZxUuIdi-YU_NuM,1887
-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=YJ0iofoy1K3EG55npokU3T2CLRC8kctutfIy0Sq_6Sg,37850
-uiprotect/data/bootstrap.py,sha256=fyC6CoYnm90r1VAWSuOe8FFh8ULaGSv6jNMQcpKPBZA,21821
-uiprotect/data/convert.py,sha256=f8QkwZnlNbV_W-YognlDvZ1gQKp5yFuC50396hcu6DU,2127
-uiprotect/data/devices.py,sha256=3UOOzFXgJP7AOPKTE1SgPcLy37W4DmSNflIFiyi8tSE,111792
-uiprotect/data/nvr.py,sha256=JZja0QiT91Eu8-lw_M0Ora1KGNXhbG5dVNLN8YdeSw0,47677
-uiprotect/data/types.py,sha256=MTi9dVzKTp_8XtAmWKtbZujwE5plKGHdjglFGcJ4Yxs,15789
-uiprotect/data/user.py,sha256=HZJh9IOXS23kM-szTn7dGGsRZz9w2_9DqltL90gcMoE,7095
-uiprotect/data/websocket.py,sha256=3iU8hcH5GsVrGLoDjhXcv7zOKmXrMuQUqUud_ZsF6vw,6084
-uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
-uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,386
-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=1HB-rtzdTxsRzEY_vnzdJZOzyruci7lOkQDfr8D1L_8,18244
-uiprotect/websocket.py,sha256=iMTdchymaCgVHsmY1bRbxkcymqt6WQircIHYNxCu178,7289
-uiprotect-0.5.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-0.5.0.dist-info/METADATA,sha256=lofryisrm6u9ASPQ0r77MqHKRqWNUE1XkAzuUrlBBYI,10984
-uiprotect-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-0.5.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-0.5.0.dist-info/RECORD,,