uiprotect 6.0.2__tar.gz → 6.1.0__tar.gz

{uiprotect-6.0.2 → uiprotect-6.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 6.0.2
+Version: 6.1.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers

{uiprotect-6.0.2 → uiprotect-6.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "6.0.2"
+version = "6.1.0"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 readme = "README.md"
@@ -52,7 +52,7 @@ pytest = ">=7,<9"
 pytest-cov = ">=3,<6"
 aiosqlite = ">=0.20.0"
 asttokens = "^2.4.1"
-pytest-asyncio = "^0.23.7"
+pytest-asyncio = ">=0.23.7,<0.25.0"
 pytest-benchmark = "^4.0.0"
 pytest-sugar = "^1.0.0"
 pytest-timeout = "^2.3.1"
@@ -75,7 +75,7 @@ mkdocs-material-extensions = "^1.3.1"
 pymdown-extensions = "^10.8.1"
 mkdocs-git-revision-date-localized-plugin = "^1.2.6"
 mkdocs-include-markdown-plugin = "^6.1.1"
-mkdocstrings = "^0.25.1"
+mkdocstrings = ">=0.25.1,<0.27.0"
 mkdocstrings-python = "^1.10.3"
 
 [tool.semantic_release]

{uiprotect-6.0.2 → uiprotect-6.1.0}/src/uiprotect/api.py

@@ -17,7 +17,7 @@ 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
@@ -327,7 +327,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 +389,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 +1543,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-6.0.2 → uiprotect-6.1.0}/src/uiprotect/data/types.py

@@ -274,6 +274,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