pyezvizapi 1.0.3.5__tar.gz → 1.0.3.7__tar.gz

{pyezvizapi-1.0.3.5/pyezvizapi.egg-info → pyezvizapi-1.0.3.7}/PKG-INFO

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

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/__init__.py

@@ -57,6 +57,9 @@ from .feature import (
     port_security_has_port,
     port_security_port_enabled,
     resolve_channel,
+    supplement_light_available,
+    supplement_light_enabled,
+    supplement_light_params,
     support_ext_value,
 )
 from .light_bulb import EzvizLightBulb
@@ -118,5 +121,8 @@ __all__ = [
     "port_security_has_port",
     "port_security_port_enabled",
     "resolve_channel",
+    "supplement_light_available",
+    "supplement_light_enabled",
+    "supplement_light_params",
     "support_ext_value",
 ]

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/__main__.py

@@ -421,7 +421,7 @@ def _handle_devices_light(args: argparse.Namespace, client: EzvizClient) -> int:
 
 def _handle_pagelist(client: EzvizClient) -> int:
     """Output full pagelist (raw JSON) for exploration in editors like Notepad++."""
-    data = client._get_page_list()  # noqa: SLF001
+    data = client.get_page_list()
     _write_json(data)
     return 0
 
@@ -611,7 +611,7 @@ def main(argv: list[str] | None = None) -> int:
         return 2
     finally:
         if args.save_token and args.token_file:
-            _save_token_file(args.token_file, cast(dict[str, Any], client._token))  # noqa: SLF001
+            _save_token_file(args.token_file, client.export_token())
         client.close_session()
 
 

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/client.py

@@ -1615,6 +1615,35 @@ class EzvizClient:
             error_message="Could not fetch device feature value",
         )
 
+    def set_intelligent_fill_light(
+        self,
+        serial: str,
+        *,
+        enabled: bool,
+        local_index: str = "1",
+        max_retries: int = 0,
+    ) -> dict:
+        """Toggle the intelligent fill light mode via the IoT feature API."""
+
+        payload = {
+            "value": {
+                "enabled": bool(enabled),
+                "supplementLightSwitchMode": "eventIntelligence"
+                if enabled
+                else "irLight",
+            }
+        }
+        body = self._normalize_json_payload(payload)
+        return self.set_iot_feature(
+            serial,
+            resource_identifier="Video",
+            local_index=local_index,
+            domain_id="SupplementLightMgr",
+            action_id="ImageSupplementLightModeSwitchParams",
+            value=body,
+            max_retries=max_retries,
+        )
+
     def set_image_flip_iot(
         self,
         serial: str,
@@ -2074,6 +2103,7 @@ class EzvizClient:
                         # Create camera object
                         cam = EzvizCamera(self, device, dict(rec.raw))
                         self._cameras[device] = cam.status(refresh=refresh)
+
                     except (
                         PyEzvizError,
                         KeyError,
@@ -4368,6 +4398,16 @@ class EzvizClient:
             json_key=None,
         )
 
+    def get_page_list(self) -> Any:
+        """Return the full pagelist payload without filtering."""
+
+        return self._get_page_list()
+
+    def export_token(self) -> dict[str, Any]:
+        """Return a shallow copy of the current authentication token."""
+
+        return dict(self._token)
+
     def get_device(self) -> Any:
         """Get ezviz devices filter."""
         return self._api_get_pagelist(page_filter="CLOUD", json_key="deviceInfos")

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/constants.py

@@ -13,6 +13,7 @@ FEATURE_CODE = generate_unique_code()
 XOR_KEY = b"\x0c\x0eJ^X\x15@Rr"
 DEFAULT_TIMEOUT = 25
 MAX_RETRIES = 3
+HIK_ENCRYPTION_HEADER = b"hikencodepicture"
 REQUEST_HEADER = {
     "featureCode": FEATURE_CODE,
     "clientType": "3",

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/feature.py

@@ -5,23 +5,61 @@ from __future__ import annotations
 from collections.abc import Iterable, Iterator, Mapping, MutableMapping
 from typing import Any, cast
 
-from .utils import coerce_int, decode_json
+from .utils import WILDCARD_STEP, coerce_int, decode_json, first_nested
 
 
 def _feature_video_section(camera_data: Mapping[str, Any]) -> dict[str, Any]:
     """Return the nested Video feature section from feature info payload."""
 
-    feature = camera_data.get("FEATURE_INFO")
-    if not isinstance(feature, Mapping):
+    video = first_nested(
+        camera_data,
+        ("FEATURE_INFO", WILDCARD_STEP, "Video"),
+    )
+    if isinstance(video, MutableMapping):
+        return cast(dict[str, Any], video)
+    return {}
+
+
+def supplement_light_params(camera_data: Mapping[str, Any]) -> dict[str, Any]:
+    """Return SupplementLightMgr parameters if present."""
+
+    video = _feature_video_section(camera_data)
+    if not video:
         return {}
 
-    for group in feature.values():
-        if isinstance(group, Mapping):
-            video = group.get("Video")
-            if isinstance(video, MutableMapping):
-                return cast(dict[str, Any], video)
+    manager: Any = video.get("SupplementLightMgr")
+    manager = decode_json(manager)
+    if not isinstance(manager, Mapping):
+        return {}
 
-    return {}
+    params: Any = manager.get("ImageSupplementLightModeSwitchParams")
+    params = decode_json(params)
+    return dict(params) if isinstance(params, Mapping) else {}
+
+
+def supplement_light_enabled(camera_data: Mapping[str, Any]) -> bool:
+    """Return True when intelligent fill light is enabled."""
+
+    params = supplement_light_params(camera_data)
+    if not params:
+        return False
+
+    enabled = params.get("enabled")
+    if isinstance(enabled, bool):
+        return enabled
+    if isinstance(enabled, str):
+        lowered = enabled.strip().lower()
+        if lowered in {"true", "1", "yes", "on"}:
+            return True
+        if lowered in {"false", "0", "no", "off"}:
+            return False
+    return bool(enabled)
+
+
+def supplement_light_available(camera_data: Mapping[str, Any]) -> bool:
+    """Return True when intelligent fill light parameters are present."""
+
+    return bool(supplement_light_params(camera_data))
 
 
 def lens_defog_config(camera_data: Mapping[str, Any]) -> dict[str, Any]:

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/mqtt.py

@@ -247,7 +247,7 @@ class MQTTClient:
                 # Stop background thread and disconnect
                 self.mqtt_client.loop_stop()
                 self.mqtt_client.disconnect()
-            except Exception as err:  # noqa: BLE001
+            except (OSError, ValueError, RuntimeError) as err:
                 _LOGGER.debug("MQTT disconnect failed: %s", err)
         # Always attempt to stop push on server side
         self._stop_ezviz_push()

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/test_mqtt.py

@@ -125,7 +125,7 @@ def main(argv: list[str] | None = None) -> int:
         print("Stopped.")
 
     if args.save_token and args.token_file:
-        _save_token_file(args.token_file, cast(dict[str, Any], client._token))  # noqa: SLF001
+        _save_token_file(args.token_file, client.export_token())
 
     return 0
 

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi/utils.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable, Iterator
 import datetime
 from hashlib import md5
 import json
@@ -13,6 +14,7 @@ from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 from Crypto.Cipher import AES
 
+from .constants import HIK_ENCRYPTION_HEADER
 from .exceptions import PyEzvizError
 
 _LOGGER = logging.getLogger(__name__)
@@ -74,6 +76,49 @@ def string_to_list(data: Any, separator: str = ",") -> Any:
     return data
 
 
+PathComponent = str | int
+WILDCARD_STEP = "*"
+_MISSING = object()
+
+
+def iter_nested(data: Any, path: Iterable[PathComponent]) -> Iterator[Any]:
+    """Yield values reachable by following a dotted path with optional wildcards."""
+
+    current: list[Any] = [data]
+
+    for step in path:
+        next_level: list[Any] = []
+        for candidate in current:
+            if step == WILDCARD_STEP:
+                if isinstance(candidate, dict):
+                    next_level.extend(candidate.values())
+                elif isinstance(candidate, (list, tuple)):
+                    next_level.extend(candidate)
+                continue
+
+            if isinstance(candidate, dict) and step in candidate:
+                next_level.append(candidate[step])
+                continue
+
+            if isinstance(candidate, (list, tuple)) and isinstance(step, int):
+                if -len(candidate) <= step < len(candidate):
+                    next_level.append(candidate[step])
+
+        current = next_level
+        if not current:
+            break
+
+    yield from current
+
+
+def first_nested(
+    data: Any, path: Iterable[PathComponent], default: Any = None
+) -> Any:
+    """Return the first value produced by iter_nested or ``default``."""
+
+    return next(iter_nested(data, path), default)
+
+
 def fetch_nested_value(data: Any, keys: list, default_value: Any = None) -> Any:
     """Fetch the value corresponding to the given nested keys in a dictionary.
 
@@ -88,14 +133,8 @@ def fetch_nested_value(data: Any, keys: list, default_value: Any = None) -> Any:
         The value corresponding to the nested keys or the default value.
 
     """
-    try:
-        for key in keys:
-            data = data[key]
-
-    except (KeyError, TypeError):
-        return default_value
-
-    return data
+    value = first_nested(data, keys, _MISSING)
+    return default_value if value is _MISSING else value
 
 
 def decrypt_image(input_data: bytes, password: str) -> bytes:
@@ -116,8 +155,10 @@ def decrypt_image(input_data: bytes, password: str) -> bytes:
         raise PyEzvizError("Invalid image data")
 
     # check header
-    if input_data[:16] != b"hikencodepicture":
-        _LOGGER.debug("Image header doesn't contain 'hikencodepicture'")
+    header_len = len(HIK_ENCRYPTION_HEADER)
+
+    if input_data[:header_len] != HIK_ENCRYPTION_HEADER:
+        _LOGGER.debug("Image header doesn't contain %s", HIK_ENCRYPTION_HEADER)
         return input_data
 
     file_hash = input_data[16:48]
@@ -132,7 +173,7 @@ def decrypt_image(input_data: bytes, password: str) -> bytes:
     next_chunk = b""
     output_data = b""
     finished = False
-    i = 48  # offset hikencodepicture + hash
+    i = 48  # offset HIK header + hash
     chunk_size = 1024 * AES.block_size
     while not finished:
         chunk, next_chunk = next_chunk, cipher.decrypt(input_data[i : i + chunk_size])

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7/pyezvizapi.egg-info}/PKG-INFO

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

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/pyezvizapi.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 LICENSE.md
 MANIFEST.in
 README.md
+pyproject.toml
 setup.py
 pyezvizapi/__init__.py
 pyezvizapi/__main__.py

pyezvizapi-1.0.3.7/pyproject.toml

@@ -0,0 +1,45 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+
+[tool.ruff]
+line-length = 100
+target-version = "py312"
+src = ["pyezvizapi"]
+
+[tool.ruff.lint]
+select = ["E","F","I","UP","B","SIM","PL","RUF","SLF"]
+ignore = ["E501"] # long URLs ok
+
+# Per-file tuning
+[tool.ruff.lint.per-file-ignores]
+# CLI files are naturally branchy/return-heavy; quiet those here:
+"pyezvizapi/__main__.py" = ["PLR0911","PLR0912","PLR0915"]
+# Re-export noise in __init__ (if applicable):
+"pyezvizapi/__init__.py" = ["F401"]
+
+# Import sorting to match HA expectations
+[tool.ruff.lint.isort]
+known-first-party = ["pyezvizapi"]
+known-third-party = ["homeassistant", "aiohttp", "voluptuous", "yarl", "pandas", "xmltodict", "Crypto"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+combine-as-imports = true
+force-sort-within-sections = true
+
+# Pylint-like thresholds (only if you prefer global relaxation instead of per-file ignores)
+[tool.ruff.lint.pylint]
+allow-magic-value-types = ["int", "str"]
+max-args = 10
+
+[tool.mypy]
+python_version = "3.12"
+files = ["pyezvizapi"]
+ignore_missing_imports = true
+strict_optional = true
+warn_unused_ignores = true
+warn_redundant_casts = true
+warn_no_return = true
+no_implicit_optional = true
+check_untyped_defs = true
+
+[tool.coverage.run]
+source = ["pyezvizapi"]

{pyezvizapi-1.0.3.5 → pyezvizapi-1.0.3.7}/setup.py

@@ -1,11 +1,11 @@
+from pathlib import Path
 import setuptools
 
-with open("README.md", "r") as fh:
-    long_description = fh.read()
+long_description = Path("README.md").read_text(encoding="utf-8")
 
 setuptools.setup(
     name='pyezvizapi',
-    version="1.0.3.5",
+    version="1.0.3.7",
     license='Apache Software License 2.0',
     author='Renier Moorcroft',
     author_email='RenierM26@users.github.com',