blebox-uniapi 2.5.4__tar.gz → 2.5.5__tar.gz

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blebox_uniapi
-Version: 2.5.4
+Version: 2.5.5
 Summary: Python API for accessing BleBox smart home devices
 Home-page: https://github.com/blebox/blebox_uniapi
 Author: BleBox

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/blebox_uniapi/__init__.py

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

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/blebox_uniapi/box_types.py

@@ -380,6 +380,36 @@ BOX_TYPE_CONF: dict[str, dict[int, dict[str, Any]]] = {
                 ]
             ],
         },
+        20220505: {
+            "api_path": "/state/extended",
+            "extended_state_path": "/state/extended",
+            "api": {
+                # note: old control api (i.e. /s/0, /s/1, /s/2) still supported but
+                # now deprecated. switchBox has now API consistent with switchBoxD
+                "on": lambda x=None: ("GET", f"/s/{x}/1", None),
+                "off": lambda x=None: ("GET", f"/s/{x}/0", None),
+            },
+            "switches": [
+                [
+                    "relay",
+                    {"state": lambda x: f"relays[?relay==`{x}`]|[0]|state"},
+                    "relay",
+                ]
+            ],
+            "sensors": [
+                [
+                    "switchBox.energy",
+                    {
+                        # note: switchbox/switchboxD sensors are currently not indexed (singletons)
+                        "powerConsumption": lambda x: "powerMeasuring.powerConsumption[0]|value ",
+                        "activePower": lambda x: "sensors[?type == 'activePower']|[0]|value",
+                        "voltage": lambda x: "sensors[?type == 'voltage']|[0]|value",
+                        "periodS": "powerMeasuring.powerConsumption[0]|periodS",
+                        "measurement_enabled": "powerMeasuring.enabled",
+                    },
+                ]
+            ],
+        },
     },
     # switchBoxD
     "switchBoxD": {
@@ -724,11 +754,15 @@ BOX_TYPE_CONF: dict[str, dict[int, dict[str, Any]]] = {
                         "reactivePower": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'reactivePower']|[0]|value",
                         "reverseActiveEnergy": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'reverseActiveEnergy']|[0]|value",
                         "forwardActiveEnergy": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'forwardActiveEnergy']|[0]|value",
+                        "forwardReactiveEnergy": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'forwardReactiveEnergy']|[0]|value",
+                        "reverseReactiveEnergy": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'reverseReactiveEnergy']|[0]|value",
                         "illuminance": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'illuminance']|[0]|value",
                         "temperature": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'temperature']|[0]|value",
                         "wind": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'wind']|[0]|value",
                         "humidity": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'humidity']|[0]|value",
                         "openStatus": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'openStatus']|[0]|value",
+                        "co2": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'co2']|[0]|value",
+                        "co2Definition": lambda x: f"multiSensor.sensors[?id == `{x}`]|[?type == 'co2Definition']|[0]|value",
                     },
                 ]
             ],

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/blebox_uniapi/cover.py

@@ -101,7 +101,7 @@ class UnifiedCoverType(IntEnum):
 class Gate:
     _control_type: Optional[int]
 
-    def __init__(self, control_type: int):
+    def __init__(self, control_type: int, is_calibrated: bool = False):
         self._control_type = control_type
 
     def read_state(self, alias: str, raw_value: Any, product: "Box") -> int:
@@ -148,6 +148,10 @@ class Gate:
     def close_command(self) -> str:
         return "close"
 
+    @property
+    def is_calibrated(self) -> None:
+        return None
+
     def stop_command(self, has_stop: bool) -> str:
         return "stop"
 
@@ -157,6 +161,11 @@ class Gate:
 
 class Shutter(Gate):
     _control_type: Optional[ShutterBoxControlType]
+    _is_calibrated: bool
+
+    def __init__(self, control_type: int, is_calibrated: bool = False):
+        super().__init__(control_type)
+        self._is_calibrated = is_calibrated
 
     @property
     def min_position(self) -> int:
@@ -185,14 +194,22 @@ class Shutter(Gate):
 
     @property
     def is_slider(self) -> bool:
-        return self._control_type not in (
-            ShutterBoxControlType.NO_CALIBRATION,
-            ShutterBoxControlType.CURTAIN,
-            ShutterBoxControlType.TILT_ONLY,
-            ShutterBoxControlType.PERGOLA_ROOF_TILT_ONLY,
-            ShutterBoxControlType.TILT_SHUTTER_WITHOUT_POSITIONING,
+        return (
+            self._control_type
+            not in (
+                ShutterBoxControlType.NO_CALIBRATION,
+                ShutterBoxControlType.CURTAIN,
+                ShutterBoxControlType.TILT_ONLY,
+                ShutterBoxControlType.PERGOLA_ROOF_TILT_ONLY,
+                ShutterBoxControlType.TILT_SHUTTER_WITHOUT_POSITIONING,
+            )
+            and self.is_calibrated is True
         )
 
+    @property
+    def is_calibrated(self) -> bool:
+        return self._is_calibrated
+
     def read_cover_type(
         self, alias: str, raw_value: Any, product: "Box"
     ) -> UnifiedCoverType:
@@ -355,13 +372,20 @@ class Cover(Feature):
         extended_state: dict,
     ) -> None:
         control_type = None
+        is_calibrated: bool = False
         if extended_state and issubclass(subclass, Shutter):
             control_type = extended_state.get("shutter", {}).get("controlType", None)
+            is_calibrated = bool(
+                extended_state.get("shutter", {})
+                .get("calibrationParameters", {})
+                .get("isCalibrated", False)
+            )
+
         elif extended_state and issubclass(subclass, GateBoxB):
             control_type = extended_state.get("gate", {}).get("openCloseMode", None)
 
         self._device_class = dev_class
-        self._attributes: GateT = subclass(control_type)
+        self._attributes: GateT = subclass(control_type, is_calibrated)
         self._tilt_current = None
         super().__init__(product, alias, methods)
 
@@ -383,6 +407,10 @@ class Cover(Feature):
     def tilt_current(self):
         return self._tilt_current
 
+    @property
+    def is_calibrated(self) -> Optional[bool]:
+        return self._attributes.is_calibrated
+
     @property
     def is_slider(self) -> Any:
         return self._attributes.is_slider

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/blebox_uniapi/sensor.py

@@ -160,12 +160,16 @@ class BaseSensor(Feature):
 @SensorFactory.register("apparentPower", unit="va")
 @SensorFactory.register("reactivePower", unit="var")
 @SensorFactory.register("activePower", unit="W")
+@SensorFactory.register("reverseReactiveEnergy", unit="kvarh", scale=1_000)
+@SensorFactory.register("forwardReactiveEnergy", unit="kvarh", scale=1_000)
 @SensorFactory.register("reverseActiveEnergy", unit="kWh", scale=1_000)
 @SensorFactory.register("forwardActiveEnergy", unit="kWh", scale=1_000)
 @SensorFactory.register("illuminance", unit="lx", scale=100)
 @SensorFactory.register("humidity", unit="percentage", scale=100)
 @SensorFactory.register("wind", unit="m/s", scale=10)
 @SensorFactory.register("openStatus", unit="")
+@SensorFactory.register("co2", unit="ppm")
+@SensorFactory.register("co2Definition", unit="")
 class GenericSensor(BaseSensor):
     def __init__(
         # base sensor params

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/blebox_uniapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blebox-uniapi
-Version: 2.5.4
+Version: 2.5.5
 Summary: Python API for accessing BleBox smart home devices
 Home-page: https://github.com/blebox/blebox_uniapi
 Author: BleBox

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.4
+current_version = 2.5.5
 commit = True
 tag = True
 

{blebox_uniapi-2.5.4 → blebox_uniapi-2.5.5}/setup.py

@@ -23,7 +23,7 @@ test_requirements = [
 ]
 
 setup(
-    version="2.5.4",
+    version="2.5.5",
     author="BleBox",
     author_email="opensource@blebox.eu",
     python_requires=">=3.9",