boneIO 1.2.0.dev23__tar.gz → 1.2.0.dev25__tar.gz

{boneio-1.2.0.dev23/boneio.egg-info → boneio-1.2.0.dev25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.2.0.dev23
+Version: 1.2.0.dev25
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25}/boneio/components/cover/cover.py

@@ -265,6 +265,10 @@ class BaseCover(BaseCoverABC, BasicMqtt):
         _LOGGER.debug("Toggle cover %s from input.", self._id)
         if self._current_operation != IDLE:
             await self.stop()
+        elif self._position >= 100:
+            await self.close()
+        elif self._position <= 0:
+            await self.open()
         elif self._last_operation == CLOSING:
             await self.open()
         else:
@@ -303,6 +307,10 @@ class BaseCover(BaseCoverABC, BasicMqtt):
             await self.stop()
         elif self._position <= always_open_till:
             await self.open()
+        elif self._position >= 100:
+            await self.close()
+        elif self._position <= 0:
+            await self.open()
         elif self._last_operation == CLOSING:
             await self.open()
         else:

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25}/boneio/const.py

@@ -187,6 +187,33 @@ cover_actions = {
     'TILT_CLOSE': 'tilt_close',
 }
 
+# Map of cover action method name -> accepted extra_data keys.
+# Actions not listed here (open, close, toggle, stop, etc.) accept no extra params.
+_COVER_ACTION_PARAMS: dict[str, set[str]] = {
+    "smart_toggle": {"always_open_till"},
+    "set_cover_position": {"position"},
+    "set_tilt": {"tilt_position"},
+    "set_cover_tilt_position": {"tilt_position"},
+}
+
+
+def filter_cover_extra_data(action_name: str, extra_data: dict) -> dict:
+    """Filter extra_data to only include params accepted by the cover action.
+
+    Args:
+        action_name: The cover method name (e.g. 'open', 'toggle', 'smart_toggle')
+        extra_data: Raw extra_data dict from action config
+
+    Returns:
+        Filtered dict with only accepted params for the action.
+    """
+    if not extra_data:
+        return {}
+    allowed = _COVER_ACTION_PARAMS.get(action_name)
+    if allowed is None:
+        return {}
+    return {k: v for k, v in extra_data.items() if k in allowed}
+
 INA219 = "ina219"
 VIRTUAL_ENERGY_SENSOR = "virtual_energy_sensor"
 PINS = {

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25}/boneio/core/manager/covers.py

@@ -13,7 +13,7 @@ import json
 import logging
 from typing import TYPE_CHECKING, Any
 
-from boneio.const import COVER, DEVICE_CLASS, ID, NAME, RESTORE_STATE, SHOW_HA, cover_actions
+from boneio.const import COVER, DEVICE_CLASS, ID, NAME, RESTORE_STATE, SHOW_HA, cover_actions, filter_cover_extra_data
 from boneio.core.utils import TimePeriod, strip_accents
 from boneio.exceptions import CoverConfigurationException
 from boneio.integration import ha_cover_availabilty_message
@@ -387,8 +387,10 @@ class CoverManager:
         
         try:
             _f = getattr(cover, action_to_execute)
-            if extra_data:
-                await _f(**extra_data)
+            # Filter extra_data to only pass params accepted by the action
+            filtered = filter_cover_extra_data(action_to_execute, extra_data or {})
+            if filtered:
+                await _f(**filtered)
             else:
                 await _f()
         except Exception as err:

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25}/boneio/core/manager/manager.py

@@ -28,6 +28,7 @@ from boneio.const import (
     STATE,
     TOGGLE,
     cover_actions,
+    filter_cover_extra_data,
     output_actions,
 )
 from boneio.core.config import ConfigHelper
@@ -669,6 +670,8 @@ class Manager:
                     continue
                 action_to_execute = action_definition.get("action_to_execute")
                 extra_data = action_definition.get("extra_data", {})
+                # Filter extra_data to only pass params accepted by each action
+                filtered_data = filter_cover_extra_data(action_to_execute, extra_data)
                 _LOGGER.debug(
                     "Executing action %s for cover %s. Duration: %s",
                     action_to_execute,
@@ -676,7 +679,7 @@ class Manager:
                     time.time() - start_time,
                 )
                 _f = getattr(cover, action_to_execute)
-                await _f(**extra_data)
+                await _f(**filtered_data)
                 
             elif action == OUTPUT_OVER_MQTT:
                 boneio_id = action_definition.get("boneio_id")

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25}/boneio/core/manager/remote.py

@@ -587,6 +587,7 @@ class RemoteDeviceManager:
             return await device.control_cover(
                 cover_id=cover_id,
                 action=action,
+                **kwargs,
             )
         
         # For MQTT devices, use standard control_cover

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25}/boneio/core/remote/esphome.py

@@ -364,7 +364,10 @@ class ESPHomeRemoteDevice(RemoteDevice):
                             "current_operation": current_op,
                             "last_known_operation": last_op,
                         }
-                        _LOGGER.debug("Cover '%s' position: %.2f", cover_id, state.position)
+                        _LOGGER.debug(
+                            "Cover '%s' state update: position=%.2f, current_op=%s, last_op=%s",
+                            cover_id, state.position, current_op, last_op,
+                        )
                         break
         except Exception as e:
             _LOGGER.debug("Error processing state change: %s", e)
@@ -854,27 +857,52 @@ class ESPHomeRemoteDevice(RemoteDevice):
                 self._client.cover_command(cover_key, position=0.0)
             elif action_upper == "STOP":
                 self._client.cover_command(cover_key, stop=True)
-            elif action_upper == "TOGGLE":
-                # Toggle based on current operation or last known operation
+            elif action_upper in ("TOGGLE", "SMART_TOGGLE"):
+                # Toggle based on current operation, position, or last known operation
                 state = self._cover_states.get(cover_id, {})
                 current_op = state.get("current_operation", 0) # 0=IDLE, 1=OPENING, 2=CLOSING
                 last_op = state.get("last_known_operation", 2)
                 cover_pos = state.get("position")
+                always_open_till = kwargs.get("always_open_till", 50) if action_upper == "SMART_TOGGLE" else None
                 _LOGGER.debug(
-                    "TOGGLE cover '%s': key=%s, state=%s, current_op=%s, last_op=%s, position=%s, all_states=%s",
-                    cover_id, cover_key, state, current_op, last_op, cover_pos,
-                    {k: v for k, v in self._cover_states.items()},
+                    "ESPHome %s cover '%s': current_op=%s, last_op=%s, position=%s, always_open_till=%s",
+                    action_upper, cover_id, current_op, last_op, cover_pos, always_open_till,
                 )
                 
                 if current_op != 0: # If moving, stop it
-                    _LOGGER.debug("TOGGLE -> STOP (cover is moving, current_op=%s)", current_op)
+                    _LOGGER.debug("%s -> STOP (cover is moving, current_op=%s)", action_upper, current_op)
                     self._client.cover_command(cover_key, stop=True)
-                elif last_op == 2: # If last operation was CLOSING, open it
-                    _LOGGER.debug("TOGGLE -> OPEN (last_op=CLOSING)")
-                    self._client.cover_command(cover_key, position=1.0)
-                else: # Otherwise close it
-                    _LOGGER.debug("TOGGLE -> CLOSE (last_op=%s)", last_op)
-                    self._client.cover_command(cover_key, position=0.0)
+                elif cover_pos is not None:
+                    # Position is known — use it for smarter decisions
+                    pos_pct = int(cover_pos * 100)
+                    if always_open_till is not None and pos_pct <= always_open_till:
+                        # SMART_TOGGLE: below threshold → always open
+                        _LOGGER.debug("SMART_TOGGLE -> OPEN (pos=%d%% <= threshold=%d%%)", pos_pct, always_open_till)
+                        self._client.cover_command(cover_key, position=1.0)
+                    elif cover_pos >= 0.99:
+                        # Fully open → close
+                        _LOGGER.debug("%s -> CLOSE (fully open, pos=%.2f)", action_upper, cover_pos)
+                        self._client.cover_command(cover_key, position=0.0)
+                    elif cover_pos <= 0.01:
+                        # Fully closed → open
+                        _LOGGER.debug("%s -> OPEN (fully closed, pos=%.2f)", action_upper, cover_pos)
+                        self._client.cover_command(cover_key, position=1.0)
+                    elif last_op == 2:
+                        # Last was closing → open
+                        _LOGGER.debug("%s -> OPEN (last_op=CLOSING)", action_upper)
+                        self._client.cover_command(cover_key, position=1.0)
+                    else:
+                        # Last was opening → close
+                        _LOGGER.debug("%s -> CLOSE (last_op=%s)", action_upper, last_op)
+                        self._client.cover_command(cover_key, position=0.0)
+                else:
+                    # No position known — use last_op only
+                    if last_op == 2:
+                        _LOGGER.debug("%s -> OPEN (no position, last_op=CLOSING)", action_upper)
+                        self._client.cover_command(cover_key, position=1.0)
+                    else:
+                        _LOGGER.debug("%s -> CLOSE (no position, last_op=%s)", action_upper, last_op)
+                        self._client.cover_command(cover_key, position=0.0)
             elif action_upper == "TOGGLE_OPEN":
                 state = self._cover_states.get(cover_id, {})
                 current_op = state.get("current_operation", 0)

boneio-1.2.0.dev25/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "1.2.0dev25"

{boneio-1.2.0.dev23 → boneio-1.2.0.dev25/boneio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.2.0.dev23
+Version: 1.2.0.dev25
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

boneio-1.2.0.dev23/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "1.2.0dev23"