pyezvizapi 1.0.2.8__py3-none-any.whl → 1.0.2.9__py3-none-any.whl

pyezvizapi/api_endpoints.py

@@ -39,6 +39,7 @@ API_ENDPOINT_DETECTION_SENSIBILITY = "/api/device/configAlgorithm"
 API_ENDPOINT_DETECTION_SENSIBILITY_GET = "/api/device/queryAlgorithmConfig"
 API_ENDPOINT_SENSITIVITY = "/v3/devconfig/v1/sensitivity/"
 API_ENDPOINT_SET_DEFENCE_SCHEDULE = "/api/device/defence/plan2"
+API_ENDPOINT_DEVICE_SWITCH_STATUS_LEGACY = "/api/device/switchStatus"
 API_ENDPOINT_CAM_ENCRYPTKEY = "/api/device/query/encryptkey"
 API_ENDPOINT_OFFLINE_NOTIFY = "/api/device/notify/switch"
 API_ENDPOINT_CANCEL_ALARM = "/api/device/cancelAlarm"

pyezvizapi/client.py

@@ -2,13 +2,12 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from datetime import datetime
 import hashlib
 import json
 import logging
 from typing import Any, ClassVar, TypedDict, cast
-import urllib.parse
 from uuid import uuid4
 
 import requests
@@ -28,6 +27,7 @@ from .api_endpoints import (
     API_ENDPOINT_DEVCONFIG_BY_KEY,
     API_ENDPOINT_DEVICE_BASICS,
     API_ENDPOINT_DEVICE_STORAGE_STATUS,
+    API_ENDPOINT_DEVICE_SWITCH_STATUS_LEGACY,
     API_ENDPOINT_DEVICE_SYS_OPERATION,
     API_ENDPOINT_DEVICES,
     API_ENDPOINT_DO_NOT_DISTURB,
@@ -648,26 +648,103 @@ class EzvizClient:
         self._ensure_ok(json_output, "Could not get unified message list")
         return json_output
 
+    def set_switch_v3(
+        self,
+        serial: str,
+        switch_type: int,
+        enable: bool | int,
+        channel: int = 0,
+        max_retries: int = 0,
+    ) -> dict:
+        """Update a device switch via the v3 endpoint."""
+
+        if max_retries > MAX_RETRIES:
+            raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
+
+        enable_flag = 1 if bool(enable) else 0
+        path = (
+            f"{API_ENDPOINT_DEVICES}{serial}/{channel}/{enable_flag}/"
+            f"{switch_type}{API_ENDPOINT_SWITCH_STATUS}"
+        )
+        payload = self._request_json(
+            "PUT",
+            path,
+            retry_401=True,
+            max_retries=max_retries,
+        )
+        self._ensure_ok(payload, "Could not set the switch")
+        return payload
+
+    def set_switch_legacy(
+        self,
+        serial: str,
+        switch_type: int,
+        enable: bool | int,
+        channel: int = 0,
+        max_retries: int = 0,
+    ) -> dict:
+        """Fallback legacy switch endpoint used by older firmware."""
+
+        if max_retries > MAX_RETRIES:
+            raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
+
+        payload = self._request_json(
+            "POST",
+            API_ENDPOINT_DEVICE_SWITCH_STATUS_LEGACY,
+            data={
+                "serial": serial,
+                "enable": "1" if bool(enable) else "0",
+                "type": str(switch_type),
+                "channel": str(channel),
+            },
+            retry_401=True,
+            max_retries=max_retries,
+        )
+        self._ensure_ok(payload, "Could not set the switch (legacy)")
+        return payload
+
+    def set_switch(
+        self,
+        serial: str,
+        switch_type: int,
+        enable: bool | int,
+        channel: int = 0,
+        max_retries: int = 0,
+    ) -> dict:
+        """Try the v3 switch endpoint, falling back to the legacy API if needed."""
+
+        try:
+            return self.set_switch_v3(
+                serial, switch_type, enable, channel, max_retries=max_retries
+            )
+        except PyEzvizError as first_error:
+            try:
+                return self.set_switch_legacy(
+                    serial, switch_type, enable, channel, max_retries=max_retries
+                )
+            except PyEzvizError:
+                raise first_error from None
+
     def switch_status(
         self,
         serial: str,
         status_type: int,
-        enable: int,
+        enable: bool | int,
         channel_no: int = 0,
         max_retries: int = 0,
     ) -> bool:
         """Camera features are represented as switches. Switch them on or off."""
-        if max_retries > MAX_RETRIES:
-            raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
-        json_output = self._request_json(
-            "PUT",
-            f"{API_ENDPOINT_DEVICES}{serial}/{channel_no}/{enable}/{status_type}{API_ENDPOINT_SWITCH_STATUS}",
-            retry_401=True,
+
+        target_state = bool(enable)
+        self.set_switch(
+            serial,
+            status_type,
+            target_state,
+            channel=channel_no,
             max_retries=max_retries,
         )
-        self._ensure_ok(json_output, "Could not set the switch")
         if self._cameras.get(serial):
-            self._cameras[serial]["switches"][status_type] = bool(enable)
+            self._cameras[serial]["switches"][status_type] = target_state
         return True
 
     def switch_status_other(
@@ -793,36 +870,61 @@ class EzvizClient:
             serial, value=f'{{"mode":{mode}}}', key="display_mode"
         )
 
-    def set_device_config_by_key(
+    def set_dev_config_kv(
         self,
         serial: str,
-        value: Any,
+        channel: int,
         key: str,
+        value: Mapping[str, Any] | str | bytes | float | bool,
         max_retries: int = 0,
-    ) -> bool:
-        """Change value on device by setting key."""
+    ) -> dict:
+        """Update a device configuration key/value pair via devconfig."""
+
         if max_retries > MAX_RETRIES:
             raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
 
-        params = {"key": key, "value": value}
-        params_str = urllib.parse.urlencode(
-            params, safe="}{:"
-        )  # not encode curly braces and colon
+        if isinstance(value, Mapping):
+            value_payload = json.dumps(value, separators=(",", ":"))
+        elif isinstance(value, bytes):
+            value_payload = value.decode()
+        elif isinstance(value, bool):
+            value_payload = "1" if value else "0"
+        elif isinstance(value, (int, float)):
+            value_payload = str(value)
+        else:
+            value_payload = str(value)
 
-        full_url = f"https://{self._token['api_url']}{API_ENDPOINT_DEVCONFIG_BY_KEY}{serial}/1/op"
+        data = {
+            "key": key,
+            "value": value_payload,
+        }
 
-        # EZVIZ api request needs {}: in the url, but requests lib doesn't allow it
-        # so we need to manually prepare it
-        req_prep = requests.Request(
-            method="PUT", url=full_url, headers=self._session.headers
-        ).prepare()
-        req_prep.url = full_url + "?" + params_str
+        payload = self._request_json(
+            "PUT",
+            f"{API_ENDPOINT_DEVCONFIG_BY_KEY}{serial}/{channel}/op",
+            data=data,
+            retry_401=True,
+            max_retries=max_retries,
+        )
+        self._ensure_ok(payload, "Could not set devconfig key")
+        return payload
 
-        req = self._send_prepared(req_prep, retry_401=True, max_retries=max_retries)
-        json_output = self._parse_json(req)
-        if not self._meta_ok(json_output):
-            raise PyEzvizError(f"Could not set config key '${key}': Got {json_output})")
+    def set_device_config_by_key(
+        self,
+        serial: str,
+        value: Any,
+        key: str,
+        max_retries: int = 0,
+    ) -> bool:
+        """Change value on device by setting key."""
 
+        self.set_dev_config_kv(
+            serial,
+            1,
+            key,
+            value,
+            max_retries=max_retries,
+        )
         return True
 
     def set_device_feature_by_key(

{pyezvizapi-1.0.2.8.dist-info → pyezvizapi-1.0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyezvizapi
-Version: 1.0.2.8
+Version: 1.0.2.9
 Summary: Pilot your Ezviz cameras
 Home-page: https://github.com/RenierM26/pyEzvizApi/
 Author: Renier Moorcroft

{pyezvizapi-1.0.2.8.dist-info → pyezvizapi-1.0.2.9.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pyezvizapi/__init__.py,sha256=IDnIN_nfIISVwuy0cVBh4wspgAav6MuOJCQGajjyU3g,1881
 pyezvizapi/__main__.py,sha256=9uttTuOfO22tzyomJIV8ebFJ-G-YUNDYOadZ_0AgdNA,20925
-pyezvizapi/api_endpoints.py,sha256=Wn3FtwFChoi4wAymnVCbEtFg-8B01_gKCMc6zNa2mE8,2814
+pyezvizapi/api_endpoints.py,sha256=yC-pSKJ6-JLeoSlF73EOR-i3JNxnf-UR41-Bwd8bkm4,2884
 pyezvizapi/camera.py,sha256=Pl5oIEdrFcv1Hz5sQI1IyyJIDCMjOjQdtExgKzmLoK8,22102
 pyezvizapi/cas.py,sha256=3zHe-_a0KchCmGeAj1of-pV6oMPRUmSCIiDqBFsTK8A,6025
-pyezvizapi/client.py,sha256=LHl00HcAO339KBYS1y4Focgr35mHYpgLiLEnNePv0_A,76202
+pyezvizapi/client.py,sha256=Kc2r8KyXaOZII8GXnfy6Ae0FrV5IhAFv8eccry-SxVk,78800
 pyezvizapi/constants.py,sha256=wSX5nxjZU_8zjedjoPaEjPrF1ddFptox2g_isD_Ku74,12621
 pyezvizapi/exceptions.py,sha256=8rmxEUQdrziqMe-M1SeeRd0HtP2IDQ2xpJVj7wvOQyo,976
 pyezvizapi/light_bulb.py,sha256=9wgycG3dTvBbrsxQjQnXal-GA8VXPsIN1m-CTtRh8i0,7797
@@ -12,10 +12,10 @@ pyezvizapi/mqtt.py,sha256=aOL-gexZgYvCCaNQ03M4vZan91d5p2Fl_qsFykn9NW4,22365
 pyezvizapi/test_cam_rtsp.py,sha256=O9NHh-vcNFfnzNw8jbuhM9a_5TWfNZIMXaJP7Lmkaj4,5162
 pyezvizapi/test_mqtt.py,sha256=Orn-fwZPJIE4G5KROMX0MRAkLwU6nLb9LUtXyb2ZCQs,4147
 pyezvizapi/utils.py,sha256=G8gGjG0ecdN05Y0vxOHvcQMtQXgVB7nHzyvCzz66kLk,12148
-pyezvizapi-1.0.2.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.2.8.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.2.8.dist-info/METADATA,sha256=8yaFfx3GUt93XZuBRmBOqB8jS6-skT_cz97iRWG5r_U,695
-pyezvizapi-1.0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyezvizapi-1.0.2.8.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
-pyezvizapi-1.0.2.8.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
-pyezvizapi-1.0.2.8.dist-info/RECORD,,
+pyezvizapi-1.0.2.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.2.9.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.2.9.dist-info/METADATA,sha256=Pu7OMl5ZW__CgfeoCeiPuhnSDktaHXINE9LdugtpN9U,695
+pyezvizapi-1.0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyezvizapi-1.0.2.9.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
+pyezvizapi-1.0.2.9.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
+pyezvizapi-1.0.2.9.dist-info/RECORD,,