pyezvizapi 1.0.1.9__py3-none-any.whl → 1.0.2.1__py3-none-any.whl

pyezvizapi/client.py

@@ -167,6 +167,7 @@ class EzvizClient:
         DeviceCatagories.BASE_STATION_DEVICE_CATEGORY.value,
         DeviceCatagories.CAT_EYE_CATEGORY.value,
         DeviceCatagories.LIGHTING.value,
+        DeviceCatagories.W2H_BASE_STATION_DEVICE_CATEGORY.value, # @emeric699 Adding support for W2H Base Station
     ]
 
     def __init__(
@@ -557,7 +558,8 @@ class EzvizClient:
                 page_filter, json_key, group_id, limit, offset, max_retries + 1
             )
 
-        next_page = json_output["page"].get("hasNext", False)
+        page_info = json_output.get("page") or {}
+        next_page = bool(page_info.get("hasNext", False))
 
         data = json_output[json_key] if json_key else json_output
 
@@ -990,10 +992,11 @@ class EzvizClient:
 
         refresh: if True, camera.status() may perform network fetches (e.g. alarms).
         Returns a combined mapping of serial -> status dict for both cameras and bulbs.
+
+        Note: We update in place and do not remove keys for devices that may
+        have disappeared. Users who intentionally remove a device can restart
+        the integration to flush stale entries.
         """
-        # Reset caches to reflect the current device roster
-        self._cameras.clear()
-        self._light_bulbs.clear()
 
         # Build lightweight records for clean gating/selection
         records = cast(dict[str, EzvizDeviceRecord], self.get_device_records(None))
@@ -1033,7 +1036,6 @@ class EzvizClient:
                             "load_error",
                             str(err),
                         )
-
         return {**self._cameras, **self._light_bulbs}
 
     def load_cameras(self, refresh: bool = True) -> dict[Any, Any]:
@@ -1058,7 +1060,7 @@ class EzvizClient:
         result: dict[str, Any] = {}
         _res_id = "NONE"
 
-        for device in devices["deviceInfos"]:
+        for device in devices.get("deviceInfos", []) or []:
             _serial = device["deviceSerial"]
             _res_id_list = {
                 item
@@ -1088,16 +1090,20 @@ class EzvizClient:
                 },
                 "resourceInfos": [
                     item
-                    for item in devices.get("resourceInfos")
-                    if item.get("deviceSerial") == _serial
+                    for item in (devices.get("resourceInfos") or [])
+                    if isinstance(item, dict) and item.get("deviceSerial") == _serial
                 ],  # Could be more than one
                 "WIFI": devices.get("WIFI", {}).get(_serial, {}),
                 "deviceInfos": device,
             }
             # Nested keys are still encoded as JSON strings
-            result[_serial]["deviceInfos"]["supportExt"] = json.loads(
-                result[_serial]["deviceInfos"]["supportExt"]
-            )
+            try:
+                support_ext = result[_serial].get("deviceInfos", {}).get("supportExt")
+                if isinstance(support_ext, str) and support_ext:
+                    result[_serial]["deviceInfos"]["supportExt"] = json.loads(support_ext)
+            except (TypeError, ValueError):
+                # Leave as-is if not valid JSON
+                pass
             convert_to_dict(result[_serial]["STATUS"].get("optionals"))
 
         if not serial:

pyezvizapi/constants.py

@@ -464,3 +464,4 @@ class DeviceCatagories(Enum):
     BASE_STATION_DEVICE_CATEGORY = "XVR"
     CAT_EYE_CATEGORY = "CatEye"
     LIGHTING = "lighting"
+    W2H_BASE_STATION_DEVICE_CATEGORY = "IGateWay" # @emeric699 Adding support for W2H Base Station

{pyezvizapi-1.0.1.9.dist-info → pyezvizapi-1.0.2.1.dist-info}/METADATA

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

{pyezvizapi-1.0.1.9.dist-info → pyezvizapi-1.0.2.1.dist-info}/RECORD

@@ -3,8 +3,8 @@ pyezvizapi/__main__.py,sha256=SeV954H-AV-U1thNxRd7rWTGtSlfWyNzdrjF8gikYus,20777
 pyezvizapi/api_endpoints.py,sha256=rk6VinLVCn-B6DxnhfV79liplNpgUsipNbTEa_MRVwU,2755
 pyezvizapi/camera.py,sha256=Vpuh7RkUBfSmNCFAXaALzfvvL0RD3SzJJyWqwZzWuHk,25191
 pyezvizapi/cas.py,sha256=ISmb-eTPuacI10L87lULbQ-oDMBuygO7Tf-s9f-tvYE,5995
-pyezvizapi/client.py,sha256=dcHAsdtfSTkVCrkaEZKpFggDXX4t5debpuxc76sOy-k,71267
-pyezvizapi/constants.py,sha256=R0zGg8Rv59An36dSXQLl3WU7VbpTbpo2comk9VJc68k,12535
+pyezvizapi/client.py,sha256=Bp5eQbn4-pjsZicfpWy6jD5bDjQeYFw-SN1p0uzKJRY,71782
+pyezvizapi/constants.py,sha256=SqdJRQSRdVYQxMgJa__AgorzdWglgA4MM4H2fq3QLAE,12633
 pyezvizapi/exceptions.py,sha256=8rmxEUQdrziqMe-M1SeeRd0HtP2IDQ2xpJVj7wvOQyo,976
 pyezvizapi/light_bulb.py,sha256=9wgycG3dTvBbrsxQjQnXal-GA8VXPsIN1m-CTtRh8i0,7797
 pyezvizapi/models.py,sha256=NQzwTP0yEe2IWU-Vc6nAn87xulpTuo0MX2Rcf0WxifA,4176
@@ -12,10 +12,10 @@ pyezvizapi/mqtt.py,sha256=aOL-gexZgYvCCaNQ03M4vZan91d5p2Fl_qsFykn9NW4,22365
 pyezvizapi/test_cam_rtsp.py,sha256=WGSM5EiOTl_r1mWHoMb7bXHm_BCn1P9X_669YQ38r6k,4903
 pyezvizapi/test_mqtt.py,sha256=Orn-fwZPJIE4G5KROMX0MRAkLwU6nLb9LUtXyb2ZCQs,4147
 pyezvizapi/utils.py,sha256=o342o3LI9eP8qla1vXM2rqlVbdTiLK0dAqrkyUSXpg8,5939
-pyezvizapi-1.0.1.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.1.9.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.1.9.dist-info/METADATA,sha256=kZWGIVtf7BcQ1WJRCFCDQZmh1NibUNQs_S6TONkU-CQ,695
-pyezvizapi-1.0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyezvizapi-1.0.1.9.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
-pyezvizapi-1.0.1.9.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
-pyezvizapi-1.0.1.9.dist-info/RECORD,,
+pyezvizapi-1.0.2.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.2.1.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.2.1.dist-info/METADATA,sha256=7bfpp78cETKjTT4kfylOsfEqxiLFRBJ2w8X8tcalz5Y,695
+pyezvizapi-1.0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyezvizapi-1.0.2.1.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
+pyezvizapi-1.0.2.1.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
+pyezvizapi-1.0.2.1.dist-info/RECORD,,