blebox-uniapi 2.3.0__tar.gz → 2.4.0__tar.gz

{blebox_uniapi-2.3.0 → blebox_uniapi-2.4.0}/HISTORY.rst

@@ -1,6 +1,14 @@
 =======
 History
 =======
+2.4.0 (2024-06-03)
+------------------
+* Fix: Refactor sensor_factory by @Pastucha in https://github.com/blebox/blebox_uniapi/pull/163
+* Order in BOX_TYPES by @Pastucha in https://github.com/blebox/blebox_uniapi/pull/164
+* Feature: smart meter by @swistakm in https://github.com/blebox/blebox_uniapi/pull/168
+* Smartmeter by @pvsti in https://github.com/blebox/blebox_uniapi/pull/170
+* fix: resolve regressions in cover and climate due to jmespath introduction by @swistakm in https://github.com/blebox/blebox_uniapi/pull/173
+
 2.3.0 (2024-03-13)
 ------------------
 * feat: add new methods to cover feature enabling handling of tilt open/close actions by @swistakm in https://github.com/blebox/blebox_uniapi/pull/154

{blebox_uniapi-2.3.0 → blebox_uniapi-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blebox_uniapi
-Version: 2.3.0
+Version: 2.4.0
 Summary: Python API for accessing BleBox smart home devices
 Home-page: https://github.com/blebox/blebox_uniapi
 Author: BleBox
@@ -17,6 +17,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: aiohttp>=3
+Requires-Dist: jmespath>1.0.0
 
 ====================
 BleBox Python UniAPI
@@ -68,6 +69,14 @@ Credits
 =======
 History
 =======
+2.4.0 (2024-06-03)
+------------------
+* Fix: Refactor sensor_factory by @Pastucha in https://github.com/blebox/blebox_uniapi/pull/163
+* Order in BOX_TYPES by @Pastucha in https://github.com/blebox/blebox_uniapi/pull/164
+* Feature: smart meter by @swistakm in https://github.com/blebox/blebox_uniapi/pull/168
+* Smartmeter by @pvsti in https://github.com/blebox/blebox_uniapi/pull/170
+* fix: resolve regressions in cover and climate due to jmespath introduction by @swistakm in https://github.com/blebox/blebox_uniapi/pull/173
+
 2.3.0 (2024-03-13)
 ------------------
 * feat: add new methods to cover feature enabling handling of tilt open/close actions by @swistakm in https://github.com/blebox/blebox_uniapi/pull/154

{blebox_uniapi-2.3.0 → blebox_uniapi-2.4.0}/blebox_uniapi/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """BleBox"""
 __email__ = "opensource@blebox.eu"
-__version__ = "2.3.0"
+__version__ = "2.4.0"

{blebox_uniapi-2.3.0 → blebox_uniapi-2.4.0}/blebox_uniapi/box.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-import re
 import asyncio
 import time
 
 from typing import Optional, Any, Dict
 
-from .box_types import default_api_level, get_conf, get_conf_set
+from .box_types import _DEFAULT_API_LEVEL, get_conf, get_conf_set
 from .button import Button
 from .climate import Climate
 from .cover import Cover
@@ -19,7 +18,6 @@ from .switch import Switch
 from .error import (
     UnsupportedBoxResponse,
     UnsupportedBoxVersion,
-    JPathFailed,
     BadFieldExceedsMax,
     BadFieldLessThanMin,
     BadFieldMissing,
@@ -107,7 +105,7 @@ class Box:
                 info, f"{location} has no hardware version"
             ) from ex
 
-        level = int(info.get("apiLevel", default_api_level))
+        level = int(info.get("apiLevel", _DEFAULT_API_LEVEL))
 
         self._data_path = config["api_path"]
         self._type = type
@@ -179,7 +177,7 @@ class Box:
             product = device_type
         if device_type == "wLightBox" and product == "wLightBoxS":
             device_type = "wLightBoxS"
-        level = int(info.get("apiLevel", default_api_level))
+        level = int(info.get("apiLevel", _DEFAULT_API_LEVEL))
         config_set = get_conf_set(device_type)
         if not config_set:
             raise UnsupportedBoxResponse(f"{device_type} is not a supported type")
@@ -282,89 +280,6 @@ class Box:
         self._last_real_update = None  # force update
         return await self._async_api(False, method, *args)
 
-    def follow(self, data: dict, path: str) -> Any:
-        """
-        Return payload from device response json.
-        :param self:
-        :param data:
-        :param path:
-        :return:
-        """
-        if data is None:
-            raise RuntimeError(f"bad argument: data {data}")  # pragma: no cover
-
-        results = path.split("/")
-        current_tree = data
-
-        for chunk in results:
-            with_string_value = re.compile(r"^\[(.*)='(.*)']$")
-            match = with_string_value.match(chunk)
-            if match:
-                name = match.group(1)
-                value = match.group(2)
-
-                found = False
-
-                for item in current_tree:
-                    if item[name] == value:
-                        current_tree = item
-                        found = True
-                        break
-
-                if not found:
-                    raise JPathFailed(f"with: {name}={value}", path, data)
-
-                continue  # pragma: no cover
-
-            with_int_value = re.compile(r"^\[(.*)=(\d+)]$")
-            match = with_int_value.match(chunk)
-            if match:
-                name = match.group(1)
-                value = int(match.group(2))
-
-                found = False
-
-                if not isinstance(current_tree, list):
-                    raise JPathFailed(
-                        f"list expected but got {current_tree}", path, data
-                    )
-
-                for item in current_tree:
-                    if item[name] == value:
-                        current_tree = item
-                        found = True
-                        break
-
-                if not found:
-                    raise JPathFailed(f"with: {name}={value}", path, data)
-                continue  # pragma: no cover
-
-            with_index = re.compile(r"^\[(\d+)]$")
-            match = with_index.match(chunk)
-            if match:
-                index = int(match.group(1))
-                if not isinstance(current_tree, list) or index >= len(current_tree):
-                    raise JPathFailed(f"with value at index {index}", path, data)
-
-                current_tree = current_tree[index]
-                continue
-
-            if isinstance(current_tree, dict):
-                names = current_tree.keys()
-                if chunk not in names:
-                    raise JPathFailed(
-                        f"item '{chunk}' not among {list(names)}", path, data
-                    )
-
-                current_tree = current_tree[chunk]
-            else:
-                raise JPathFailed(
-                    f"unexpected item type: '{chunk}' not in: {current_tree}",
-                    path,
-                    data,
-                )
-        return current_tree
-
     def expect_int(
         self, field: str, raw_value: int, maximum: int = -1, minimum: int = 0
     ) -> int: