pyezvizapi 1.0.0.2__tar.gz → 1.0.0.3__tar.gz

{pyezvizapi-1.0.0.2/pyezvizapi.egg-info → pyezvizapi-1.0.0.3}/PKG-INFO

@@ -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 → pyezvizapi-1.0.0.3}/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-1.0.0.2 → pyezvizapi-1.0.0.3}/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-1.0.0.2 → pyezvizapi-1.0.0.3}/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 → pyezvizapi-1.0.0.3/pyezvizapi.egg-info}/PKG-INFO

@@ -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 → pyezvizapi-1.0.0.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name='pyezvizapi',
-    version="1.0.0.2",
+    version="1.0.0.3",
     license='Apache Software License 2.0',
     author='Renier Moorcroft',
     author_email='RenierM26@users.github.com',