pyezvizapi 1.0.0.1__py3-none-any.whl → 1.0.0.3__py3-none-any.whl

pyezvizapi/api_endpoints.py

@@ -26,6 +26,7 @@ API_ENDPOINT_DETECTION_SENSIBILITY = "/api/device/configAlgorithm"
 API_ENDPOINT_DETECTION_SENSIBILITY_GET = "/api/device/queryAlgorithmConfig"
 API_ENDPOINT_SET_DEFENCE_SCHEDULE = "/api/device/defence/plan2"
 API_ENDPOINT_CAM_ENCRYPTKEY = "/api/device/query/encryptkey"
+API_ENDPOINT_CAM_AUTH_CODE = "/v3/devconfig/authcode/query/"
 API_ENDPOINT_CANCEL_ALARM = "/api/device/cancelAlarm"
 API_ENDPOINT_DEVICE_SYS_OPERATION = "/api/device/v2/sysOper/"
 API_ENDPOINT_DEVICE_STORAGE_STATUS = "/api/device/queryStorageStatus"

pyezvizapi/client.py

@@ -15,6 +15,7 @@ import requests
 from .api_endpoints import (
     API_ENDPOINT_ALARM_SOUND,
     API_ENDPOINT_ALARMINFO_GET,
+    API_ENDPOINT_CAM_AUTH_CODE,
     API_ENDPOINT_CAM_ENCRYPTKEY,
     API_ENDPOINT_CANCEL_ALARM,
     API_ENDPOINT_CHANGE_DEFENCE_STATUS,
@@ -340,7 +341,6 @@ class EzvizClient:
 
         return data
 
-
     def get_alarminfo(self, serial: str, limit: int = 1, max_retries: int = 0) -> dict:
         """Get data from alarm info API for camera serial."""
         if max_retries > MAX_RETRIES:
@@ -950,15 +950,11 @@ class EzvizClient:
         if max_retries > MAX_RETRIES:
             raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
 
-        device_token_info = self.get_user_id()
-        cookies = {
-            "clientType": "3",
-            "clientVersion": "5.12.1.0517",
-            "userId": device_token_info["userId"],
-            "ASG_DisplayName": "home",
-            "C_SS": self._session.headers["sessionId"],
-            "lang": "en_US",
-        }
+        if enable == 2 and not old_password:
+            raise PyEzvizError("Old password is required when changing password.")
+
+        if new_password and not enable == 2:
+            raise PyEzvizError("New password is only required when changing password.")
 
         try:
             req = self._session.put(
@@ -968,14 +964,13 @@ class EzvizClient:
                 + API_ENDPOINT_VIDEO_ENCRYPT,
                 data={
                     "deviceSerial": serial,
-                    "isEncrypt": enable,
-                    "oldPassword": old_password,
+                    "isEncrypt": enable,  # 1 = enable, 0 = disable, 2 = change password
+                    "oldPassword": old_password,  # required if changing.
                     "password": new_password,
                     "featureCode": FEATURE_CODE,
                     "validateCode": camera_verification_code,
                     "msgType": -1,
                 },
-                cookies=cookies,
                 timeout=self._timeout,
             )
 
@@ -1368,6 +1363,64 @@ class EzvizClient:
 
         return json_output["encryptkey"]
 
+    def get_cam_auth_code(
+        self,
+        serial: str,
+        encrypt_pwd: str | None = None,
+        msg_auth_code: int | None = None,
+        max_retries: int = 0,
+    ) -> Any:
+        """Get Camera auth code. This is the verification code on the camera sticker."""
+
+        if max_retries > MAX_RETRIES:
+            raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
+
+        params: dict[str, int | str | None] = {
+            "encrptPwd": encrypt_pwd,
+            "msgAuthCode": msg_auth_code,
+            "senderType": 0,
+        }
+
+        try:
+            req = self._session.get(
+                "https://"
+                + self._token["api_url"]
+                + API_ENDPOINT_CAM_AUTH_CODE
+                + serial,
+                params=params,
+                timeout=self._timeout,
+            )
+
+            req.raise_for_status()
+
+        except requests.HTTPError as err:
+            if err.response.status_code == 401:
+                # session is wrong, need to relogin
+                self.login()
+                return self.get_cam_auth_code(
+                    serial, encrypt_pwd, msg_auth_code, max_retries + 1
+                )
+
+            raise HTTPError from err
+
+        try:
+            json_output = req.json()
+
+        except ValueError as err:
+            raise PyEzvizError(
+                "Impossible to decode response: "
+                + str(err)
+                + "\nResponse was: "
+                + str(req.text)
+            ) from err
+
+        if json_output["meta"]["code"] != 200:
+            raise PyEzvizError(
+                f"Could not get camera verification key: Got {json_output})"
+            )
+
+        return json_output["devAuthCode"]
+
     def create_panoramic(self, serial: str, max_retries: int = 0) -> Any:
         """Create panoramic image."""
 
@@ -1720,7 +1773,7 @@ class EzvizClient:
         self,
         serial: str,
         enable: int = 1,
-        channelno: int = 1,
+        channelno: str = "1",
         max_retries: int = 0,
     ) -> bool:
         """Set do not disturb on camera with specified serial."""
@@ -2044,9 +2097,7 @@ class EzvizClient:
 
     def get_connection(self) -> Any:
         """Get ezviz connection infos filter."""
-        return self._api_get_pagelist(
-            page_filter="CONNECTION", json_key="CONNECTION"
-        )
+        return self._api_get_pagelist(page_filter="CONNECTION", json_key="CONNECTION")
 
     def _get_status(self) -> Any:
         """Get ezviz status infos filter."""
@@ -2054,9 +2105,7 @@ class EzvizClient:
 
     def get_switch(self) -> Any:
         """Get ezviz switch infos filter."""
-        return self._api_get_pagelist(
-            page_filter="SWITCH", json_key="SWITCH"
-        )
+        return self._api_get_pagelist(page_filter="SWITCH", json_key="SWITCH")
 
     def _get_wifi(self) -> Any:
         """Get ezviz wifi infos filter."""
@@ -2064,9 +2113,7 @@ class EzvizClient:
 
     def _get_nodisturb(self) -> Any:
         """Get ezviz nodisturb infos filter."""
-        return self._api_get_pagelist(
-            page_filter="NODISTURB", json_key="NODISTURB"
-        )
+        return self._api_get_pagelist(page_filter="NODISTURB", json_key="NODISTURB")
 
     def _get_p2p(self) -> Any:
         """Get ezviz P2P infos filter."""

pyezvizapi/light_bulb.py

@@ -66,7 +66,7 @@ class EzvizLightBulb:
 
         return json_output
 
-    def get_feature_item(self, key: str, default_value: Any = None) -> Any:
+    def get_feature_item(self, key: str, default_value: Any = { "dataValue" : "" }) -> Any:
         """Get items fron FEATURE."""
         items = self._feature_json["featureItemDtos"]
         for item in items:

pyezvizapi/utils.py

@@ -114,7 +114,12 @@ def decrypt_image(input_data: bytes, password: str) -> bytes:
     return output_data
 
 
-def deep_merge(dict1, dict2):
+def return_password_hash(password: str) -> str:
+    """Return the password hash."""
+    return md5(str.encode(md5(str.encode(password)).hexdigest())).hexdigest()
+
+
+def deep_merge(dict1: Any, dict2: Any) -> Any:
     """Recursively merges two dictionaries, handling lists as well.
 
     Args:

{pyezvizapi-1.0.0.1.dist-info → pyezvizapi-1.0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pyezvizapi
-Version: 1.0.0.1
+Version: 1.0.0.3
 Summary: Pilot your Ezviz cameras
 Home-page: https://github.com/RenierM26/pyEzvizApi/
 Author: Renier Moorcroft
@@ -14,5 +14,13 @@ Requires-Dist: pandas
 Requires-Dist: paho-mqtt
 Requires-Dist: xmltodict
 Requires-Dist: pycryptodome
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Pilot your Ezviz cameras with this module. Please view readme on github

pyezvizapi-1.0.0.3.dist-info/RECORD

@@ -0,0 +1,19 @@
+pyezvizapi/__init__.py,sha256=2YnR6s7OOOpV8QfxI6hdBKfc6WFerT55jqV8A1tDRSs,1167
+pyezvizapi/__main__.py,sha256=a0JxEmkevYPmWK8V9cHt-7i8MtpztOl2IrrZ2SfEsrM,15718
+pyezvizapi/api_endpoints.py,sha256=ZJ9rTfFOWVgxEZP3enaWwgiH4576eBLrVwiaOrLFvIQ,2303
+pyezvizapi/camera.py,sha256=asP-PNoRPWR2KdlBir2NtLy4UpsLdOXzh2KyRfsir9s,11008
+pyezvizapi/cas.py,sha256=d31ZflYSD9P40MnsNRNZbT0HVLvlnHokKpLbdAjWQ74,5631
+pyezvizapi/client.py,sha256=Tb8CQWQ1Jlwa5sGypOEj2rbpUyDP7PtcVIWQFmrtfH4,70111
+pyezvizapi/constants.py,sha256=NWOsr57VIh3t_3it-d6hDVDYHEFiQ2MjupBj6FMte4Y,10049
+pyezvizapi/exceptions.py,sha256=TBJGh12s4UAMVY4k3jibfjEt9D4NVgKnv-397HmfEws,608
+pyezvizapi/light_bulb.py,sha256=2v92JEQuItC8rtjxTC6qyvJaBDlcsEiVNXcNyQRltpc,5044
+pyezvizapi/mqtt.py,sha256=Y4X99Z0Avm32SE8vog7CNsv6tGUPmPYUZUgPDGS0QJA,7866
+pyezvizapi/test_cam_rtsp.py,sha256=w7GPcYIeK78TxL8zFDihdGSDQNWcYrurwZOr6uFzzgo,4902
+pyezvizapi/utils.py,sha256=5J10o3h-y8prWDvl3LSAF-9wS1jBgBMg5cpAEebcuSM,4936
+pyezvizapi-1.0.0.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.0.3.dist-info/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.0.3.dist-info/METADATA,sha256=bDBDDH0uRwT5opvgxL7LMAG9Xr23YdtZHUibEwsaVOg,672
+pyezvizapi-1.0.0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyezvizapi-1.0.0.3.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
+pyezvizapi-1.0.0.3.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
+pyezvizapi-1.0.0.3.dist-info/RECORD,,

{pyezvizapi-1.0.0.1.dist-info → pyezvizapi-1.0.0.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.7.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pyezvizapi-1.0.0.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-pyezvizapi/__init__.py,sha256=2YnR6s7OOOpV8QfxI6hdBKfc6WFerT55jqV8A1tDRSs,1167
-pyezvizapi/__main__.py,sha256=a0JxEmkevYPmWK8V9cHt-7i8MtpztOl2IrrZ2SfEsrM,15718
-pyezvizapi/api_endpoints.py,sha256=RqfLIOzj7FkzdbIixjhkJajjzmyZmaLjkOxcTOq86n4,2242
-pyezvizapi/camera.py,sha256=asP-PNoRPWR2KdlBir2NtLy4UpsLdOXzh2KyRfsir9s,11008
-pyezvizapi/cas.py,sha256=d31ZflYSD9P40MnsNRNZbT0HVLvlnHokKpLbdAjWQ74,5631
-pyezvizapi/client.py,sha256=GLId80AGlc75RPzy34zXYd39m5M_QIow4pfLOQtJ-ww,68444
-pyezvizapi/constants.py,sha256=NWOsr57VIh3t_3it-d6hDVDYHEFiQ2MjupBj6FMte4Y,10049
-pyezvizapi/exceptions.py,sha256=TBJGh12s4UAMVY4k3jibfjEt9D4NVgKnv-397HmfEws,608
-pyezvizapi/light_bulb.py,sha256=harFSyhnowS9doFjUASI5fcIubE_buRg3c_J2jkY4ho,5028
-pyezvizapi/mqtt.py,sha256=Y4X99Z0Avm32SE8vog7CNsv6tGUPmPYUZUgPDGS0QJA,7866
-pyezvizapi/test_cam_rtsp.py,sha256=w7GPcYIeK78TxL8zFDihdGSDQNWcYrurwZOr6uFzzgo,4902
-pyezvizapi/utils.py,sha256=VKtxTVjreIybCp9EAhjJks6ySq4M0HsKpQAoBNDS2io,4755
-pyezvizapi-1.0.0.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.0.1.dist-info/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.0.1.dist-info/METADATA,sha256=_TISRVqLUCWjxfinPUUSrM0sr72RYofJWmDk0_DNe7s,512
-pyezvizapi-1.0.0.1.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-pyezvizapi-1.0.0.1.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
-pyezvizapi-1.0.0.1.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
-pyezvizapi-1.0.0.1.dist-info/RECORD,,