uiprotect 7.15.0__tar.gz → 7.16.0__tar.gz

{uiprotect-7.15.0 → uiprotect-7.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: uiprotect
-Version: 7.15.0
+Version: 7.16.0
 Summary: Python API for Unifi Protect (Unofficial)
 License: MIT
 Author: UI Protect Maintainers

{uiprotect-7.15.0 → uiprotect-7.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uiprotect"
-version = "7.15.0"
+version = "7.16.0"
 license = "MIT"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = [{ name = "UI Protect Maintainers", email = "ui@koston.org" }]

{uiprotect-7.15.0 → uiprotect-7.16.0}/src/uiprotect/api.py

@@ -1519,6 +1519,14 @@ class ProtectApiClient(BaseApiClient):
             raise_exception=False,
         )
 
+    async def get_public_api_camera_snapshot(self, camera_id: str) -> bytes | None:
+        """Gets snapshot for a camera using public api."""
+        return await self.api_request_raw(
+            public_api=True,
+            url=f"v1/cameras/{camera_id}/snapshot",
+            params={"highQuality": "true"},
+        )
+
     async def get_package_camera_snapshot(
         self,
         camera_id: str,
@@ -2089,15 +2097,9 @@ class ProtectApiClient(BaseApiClient):
         if not name:
             raise BadRequest("API key name cannot be empty")
 
-        user_id = None
-        if self._last_token_cookie_decode is not None:
-            user_id = self._last_token_cookie_decode.get("userId")
-        if not user_id:
-            raise BadRequest("User ID not available for API key creation")
-
         response = await self.api_request(
             api_path="/proxy/users/api/v2",
-            url=f"/user/{user_id}/keys",
+            url="/user/self/keys",
             method="post",
             json={"name": name},
         )

{uiprotect-7.15.0 → uiprotect-7.16.0}/src/uiprotect/data/devices.py

@@ -2085,6 +2085,13 @@ class Camera(ProtectMotionDeviceModel):
 
         return await self._api.get_camera_snapshot(self.id, width, height, dt=dt)
 
+    async def get_public_api_snapshot(self) -> bytes | None:
+        """Gets snapshot for camera using public API."""
+        if self._api._api_key is None:
+            raise NotAuthorized("Cannot get public API snapshot without an API key.")
+
+        return await self._api.get_public_api_camera_snapshot(self.id)
+
     async def get_package_snapshot(
         self,
         width: int | None = None,

{uiprotect-7.15.0 → uiprotect-7.16.0}/src/uiprotect/test_util/__init__.py

@@ -325,6 +325,15 @@ class SampleDataGenerator:
             snapshot = await self.client.get_camera_snapshot(obj["id"], width, height)
             await self.write_image_file(filename, snapshot)
 
+        # public api snapshot
+        pub_filename = "sample_camera_public_api_snapshot"
+        if self.anonymize:
+            self.log(f"Writing {pub_filename}...")
+            placeholder_image(self.output_folder / f"{pub_filename}.png", width, height)
+        else:
+            pub_snapshot = await self.client.get_public_api_camera_snapshot(obj["id"])
+            await self.write_image_file(pub_filename, pub_snapshot)
+
     async def generate_motion_data(
         self,
         motion_event: dict[str, Any] | None,