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

pyezvizapi/client.py

@@ -1363,23 +1363,31 @@ class EzvizClient:
 
         return json_output["encryptkey"]
 
-    def get_cam_auth_code(self, serial: str, max_retries: int = 0) -> Any:
+    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={
-                    "encrptPwd": "",
-                    "msgAuthCode": "",
-                    "senderType": 0,
-                },
+                params=params,
                 timeout=self._timeout,
             )
 
@@ -1389,7 +1397,9 @@ class EzvizClient:
             if err.response.status_code == 401:
                 # session is wrong, need to relogin
                 self.login()
-                return self.get_cam_auth_code(serial, max_retries + 1)
+                return self.get_cam_auth_code(
+                    serial, encrypt_pwd, msg_auth_code, max_retries + 1
+                )
 
             raise HTTPError from err
 
@@ -1763,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."""

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.2.dist-info → pyezvizapi-1.0.0.3.dist-info}/METADATA

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

{pyezvizapi-1.0.0.2.dist-info → pyezvizapi-1.0.0.3.dist-info}/RECORD

@@ -3,17 +3,17 @@ 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=aXPxenDU3Pao7Zln4XPGslIIIo3waj8s9PInfznF-UE,69888
+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=harFSyhnowS9doFjUASI5fcIubE_buRg3c_J2jkY4ho,5028
+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=VKtxTVjreIybCp9EAhjJks6ySq4M0HsKpQAoBNDS2io,4755
-pyezvizapi-1.0.0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.0.2.dist-info/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.0.2.dist-info/METADATA,sha256=0Ptacan7YaF3SICwuab-iB_ntNC-gDOXZW5P6CC_S6c,672
-pyezvizapi-1.0.0.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyezvizapi-1.0.0.2.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
-pyezvizapi-1.0.0.2.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
-pyezvizapi-1.0.0.2.dist-info/RECORD,,
+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,,