uiprotect 6.0.2__py3-none-any.whl → 6.2.0__py3-none-any.whl

uiprotect/api.py

@@ -11,13 +11,13 @@ import sys
 import time
 from collections.abc import Callable
 from datetime import datetime, timedelta
-from functools import cached_property, partial
+from functools import partial
 from http import HTTPStatus
 from http.cookies import Morsel, SimpleCookie
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from typing import Any, Literal, cast
-from urllib.parse import urljoin
+from urllib.parse import SplitResult
 
 import aiofiles
 import aiohttp
@@ -25,6 +25,7 @@ import orjson
 from aiofiles import os as aos
 from aiohttp import CookieJar, client_exceptions
 from platformdirs import user_cache_dir, user_config_dir
+from propcache import cached_property
 from yarl import URL
 
 from .data import (
@@ -327,7 +328,9 @@ class BaseApiClient:
         if require_auth:
             await self.ensure_authenticated()
 
-        request_url = self._url.joinpath(url[1:])
+        request_url = self._url.join(
+            URL(SplitResult("", "", url, "", ""), encoded=True)
+        )
         headers = kwargs.get("headers") or self.headers
         _LOGGER.debug("Request url: %s", request_url)
         if not self._verify_ssl:
@@ -387,10 +390,9 @@ class BaseApiClient:
         **kwargs: Any,
     ) -> bytes | None:
         """Make a request to UniFi Protect API"""
-        url = urljoin(self.api_path, url)
         response = await self.request(
             method,
-            url,
+            f"{self.api_path}{url}",
             require_auth=require_auth,
             auto_close=False,
             **kwargs,
@@ -1542,7 +1544,7 @@ class ProtectApiClient(BaseApiClient):
 
         r = await self.request(
             "get",
-            urljoin(self.api_path, path),
+            f"{self.api_path}{path}",
             auto_close=False,
             timeout=0,
             params=params,

uiprotect/data/base.py

@@ -6,12 +6,13 @@ import asyncio
 import logging
 from collections.abc import Callable
 from datetime import datetime, timedelta
-from functools import cache, cached_property
+from functools import cache
 from ipaddress import IPv4Address
 from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar
 from uuid import UUID
 
 from convertertools import pop_dict_set_if_none, pop_dict_tuple
+from propcache import cached_property
 from pydantic.v1 import BaseModel
 from pydantic.v1.fields import SHAPE_DICT, SHAPE_LIST, PrivateAttr
 

uiprotect/data/types.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 import enum
 from collections.abc import Callable, Coroutine
-from functools import cache, cached_property
+from functools import cache
 from typing import Any, Literal, Optional, TypeVar, Union
 
 from packaging.version import Version as BaseVersion
+from propcache import cached_property
 from pydantic.v1 import BaseModel, ConstrainedInt
 from pydantic.v1.color import Color as BaseColor
 from pydantic.v1.types import ConstrainedFloat, ConstrainedStr
@@ -274,6 +275,8 @@ class EventType(str, ValuesEnumMixin, enum.Enum):
             EventType.MOTION.value,
             EventType.RING.value,
             EventType.SMART_DETECT.value,
+            EventType.SMART_AUDIO_DETECT.value,
+            EventType.SMART_DETECT_LINE.value,
         ]
 
     @staticmethod

uiprotect/data/websocket.py

@@ -7,10 +7,11 @@ import enum
 import struct
 import zlib
 from dataclasses import dataclass
-from functools import cache, cached_property
+from functools import cache
 from typing import TYPE_CHECKING, Any
 
 import orjson
+from propcache import cached_property
 
 from ..exceptions import WSDecodeError, WSEncodeError
 from .types import ProtectWSPayloadFormat

{uiprotect-6.0.2.dist-info → uiprotect-6.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 6.0.2
+Version: 6.2.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers
@@ -27,6 +27,7 @@ Requires-Dist: orjson (>=3.9.15)
 Requires-Dist: packaging (>=23)
 Requires-Dist: pillow (>=10)
 Requires-Dist: platformdirs (>=4)
+Requires-Dist: propcache (>=0.0.0)
 Requires-Dist: pydantic (>=1.10.17)
 Requires-Dist: pyjwt (>=2.6)
 Requires-Dist: rich (>=10)

{uiprotect-6.0.2.dist-info → uiprotect-6.2.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 uiprotect/__init__.py,sha256=GDRM9WvWUBbOyBVgltq6Qv8i7LVdWEbG8q5EzYvOFbE,636
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
-uiprotect/api.py,sha256=8kC9v6EM67kfdtPDIW8dlqjZl_s5Lffj4o-Z_dOMmdQ,67894
+uiprotect/api.py,sha256=n3pdvVR9B7_qs19pylI8S-NlXUVluTCZHnTMfRpcZis,67955
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=k-_qGuNT7br0iV0KE5F4wYXF75iyLLjBEckTqxC71xM,7591
@@ -14,14 +14,14 @@ 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=J2ytJqWJIsFq7vXYG4gfp2c-mrj5gqa3UhmItF0MWbI,35033
+uiprotect/data/base.py,sha256=36hd_aRh58DOkxZVEmCfsFDdMeHC3292ogiRtNRcBJ8,35054
 uiprotect/data/bootstrap.py,sha256=OSPHu08p7Ys9KqEb8sq_LFufuECtF4lY7OnAYK27ngo,20454
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=0l8eiTCwacdHCmOc7qNzeUMpHLxvd6FeB7DOqZKycdA,110880
 uiprotect/data/nvr.py,sha256=8M-62AG4q1k71eX-DaFcdO52QWG4zO9X5Voj0Tj9D5A,46598
-uiprotect/data/types.py,sha256=zYQjmFDqxjVzaan-vihOzHaBirWsW_C0Q3Pd9xTH33I,18214
+uiprotect/data/types.py,sha256=IucBrw8rKEB1ia2r1HttdL5QHUDxGUUZhXpTE0kcaM8,18330
 uiprotect/data/user.py,sha256=1o5gyPHafn4lHARpoSMD_NWbo5IbzGPfiSASwqqDvWs,7002
-uiprotect/data/websocket.py,sha256=5-yM6yr8NrxKJjBPQlGVXXQUTcksF-UavligKYjJQ3k,6770
+uiprotect/data/websocket.py,sha256=gjgey5OcnRPJByD4Z3jW-nLN_jDM_nkQSYdGOkuV5IU,6791
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
 uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,386
@@ -30,8 +30,8 @@ uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwTo
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=jIWT7n_reL90oY91svBfQ4naRxo28qHzP5jNOL12mQE,20342
 uiprotect/websocket.py,sha256=xCeEGB49IIBoAh1S8dqi6e8GM-SH66joTkf1BItq9vY,8093
-uiprotect-6.0.2.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-6.0.2.dist-info/METADATA,sha256=Fnj72kFn6o1TD8jkN2ZDTaqtl-dmBk8RlcH0-nHB6RI,11010
-uiprotect-6.0.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-6.0.2.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-6.0.2.dist-info/RECORD,,
+uiprotect-6.2.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-6.2.0.dist-info/METADATA,sha256=LX_6VisKf6gv9YqqkFrbRP4tdO9fr0ALrnTSpx0epOs,11045
+uiprotect-6.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-6.2.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-6.2.0.dist-info/RECORD,,