boneio 1.4.0.dev9__tar.gz → 1.4.0.dev11__tar.gz

{boneio-1.4.0.dev9/boneio.egg-info → boneio-1.4.0.dev11}/PKG-INFO

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

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/components/output/remote.py

@@ -15,7 +15,7 @@ import logging
 import time
 from typing import TYPE_CHECKING, Any
 
-from boneio.const import OFF, ON, SWITCH
+from boneio.const import OFF, ON, OUTPUT, STATE, SWITCH
 from boneio.core.events import EventBus, async_track_point_in_time, utcnow
 from boneio.core.utils import callback
 from boneio.core.utils.timeperiod import TimePeriod, parse_time_to_seconds
@@ -23,6 +23,7 @@ from boneio.models import OutputState
 from boneio.models.events import OutputEvent
 
 if TYPE_CHECKING:
+    from boneio.core.messaging import MessageBus
     from boneio.integration.interlock import SoftwareInterlockManager
 
 _LOGGER = logging.getLogger(__name__)
@@ -62,6 +63,8 @@ class RemoteOutputBase:
         output_id: str,
         remote_source: str,
         event_bus: EventBus,
+        message_bus: MessageBus | None = None,
+        topic_prefix: str = "",
         output_type: str = SWITCH,
         show_in_ha: bool = False,
         area: str | None = None,
@@ -83,6 +86,8 @@ class RemoteOutputBase:
         self._output_id = output_id
         self._remote_source = remote_source
         self._event_bus = event_bus
+        self._message_bus: MessageBus | None = message_bus
+        self._send_topic = f"{topic_prefix}/{OUTPUT}/{id}" if topic_prefix else ""
         self._output_type = output_type
         self.show_in_ha = show_in_ha
         self.area: str | None = area
@@ -376,10 +381,21 @@ class RemoteOutputBase:
     async def async_set_brightness(self, brightness: int, timestamp: float | None = None) -> None:
         """Set brightness on the remote light output.
 
+        Checks interlock before sending the brightness command. Setting
+        brightness implicitly turns the light ON, so interlock rules apply.
+
         Args:
             brightness: Brightness value (0-255).
             timestamp: Optional timestamp for state tracking.
         """
+        # Brightness > 0 effectively turns ON — must check interlock
+        if brightness > 0 and not self.check_interlock():
+            _LOGGER.warning(
+                "Interlock active: cannot set brightness on remote output '%s'",
+                self._id,
+            )
+            return
+
         if not self._resolve_device_manager():
             _LOGGER.error("Remote output '%s' has no device manager, cannot set brightness", self._id)
             return
@@ -466,7 +482,22 @@ class RemoteOutputBase:
     # ------------------------------------------------------------------
 
     def _emit_state_event(self) -> None:
-        """Emit OutputEvent on EventBus for WebSocket/state tracking."""
+        """Emit OutputEvent on EventBus for WebSocket/state tracking.
+
+        Also publishes the current state to the MQTT state topic so that
+        Home Assistant (and any other MQTT consumer) sees the updated state.
+        """
+        # Publish state to MQTT so HA sees the update
+        if self._message_bus and self._send_topic:
+            payload: dict[str, Any] = {STATE: self._state}
+            if self._brightness is not None:
+                payload["brightness"] = self._brightness
+            self._message_bus.send_message(
+                topic=self._send_topic,
+                payload=payload,
+                retain=True,
+            )
+
         output_state = OutputState(
             id=self._id,
             name=self._name,

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/core/config/yaml_util.py

@@ -1118,6 +1118,9 @@ def strip_default_values(data: Any, schema: dict | None = None, section: str | N
         """Remove keys with default values from dict."""
         cleaned = {}
         for key, value in obj.items():
+            # Skip empty strings and None values — they are never valid config
+            if value is None or value == "":
+                continue
             # Special handling for nested structures
             if key == "actions" and isinstance(value, dict):
                 # Clean actions recursively

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/core/manager/irrigation.py

@@ -276,17 +276,21 @@ class IrrigationManager:
         # Build list of discovery IDs to remove
         discovery_ids: list[tuple[str, str]] = [
             (f"{ctrl.id}", "switch"),
-            (f"{ctrl.id}_auto_advance", "switch"),
-            (f"{ctrl.id}_reverse", "switch"),
             (f"{ctrl.id}_skip_next_run", "switch"),
             (f"{ctrl.id}_standby", "switch"),
             (f"{ctrl.id}_multiplier", "number"),
             (f"{ctrl.id}_repeat", "number"),
-            (f"{ctrl.id}_next_valve", "button"),
             (f"{ctrl.id}_pause", "button"),
             (f"{ctrl.id}_resume", "button"),
             (f"{ctrl.id}_event", "event"),
         ]
+        # Multi-zone-only entities
+        if len(ctrl.zones) > 1:
+            discovery_ids.extend([
+                (f"{ctrl.id}_auto_advance", "switch"),
+                (f"{ctrl.id}_reverse", "switch"),
+                (f"{ctrl.id}_next_valve", "button"),
+            ])
         for zone in ctrl.zones:
             discovery_ids.append((f"{ctrl.id}_zone_{zone.id}", "valve"))
             discovery_ids.append((f"{ctrl.id}_zone_{zone.id}_enabled", "switch"))
@@ -338,8 +342,10 @@ class IrrigationManager:
         async def handle_standby(_topic: str, payload: str, _ctrl: IrrigationController = ctrl) -> None:
             await _ctrl.set_standby(payload.strip().upper() == ON)
 
-        await self._subscribe_topic(ctrl._setting_cmd_topic("auto_advance"), handle_auto_advance)
-        await self._subscribe_topic(ctrl._setting_cmd_topic("reverse"), handle_reverse)
+        # Subscribe multi-zone-only MQTT handlers
+        if len(ctrl.zones) > 1:
+            await self._subscribe_topic(ctrl._setting_cmd_topic("auto_advance"), handle_auto_advance)
+            await self._subscribe_topic(ctrl._setting_cmd_topic("reverse"), handle_reverse)
         await self._subscribe_topic(ctrl._setting_cmd_topic("multiplier"), handle_multiplier)
         await self._subscribe_topic(ctrl._setting_cmd_topic("repeat"), handle_repeat)
         await self._subscribe_topic(ctrl._setting_cmd_topic("skip_next_run"), handle_skip_next)
@@ -401,29 +407,31 @@ class IrrigationManager:
             payload=ha_irrigation_main_switch_message(ctrl.id, ctrl.name, cfg),
         )
 
-        _pub(
-            id=f"{ctrl.id}_auto_advance",
-            ha_type="switch",
-            payload=ha_irrigation_switch_message(
-                ctrl.id,
-                ctrl.name,
-                suffix="auto_advance",
-                name=f"{ctrl.name} Auto Advance",
-                config_helper=cfg,
-            ),
-        )
+        # Multi-zone-only switches: auto_advance, reverse
+        if len(ctrl.zones) > 1:
+            _pub(
+                id=f"{ctrl.id}_auto_advance",
+                ha_type="switch",
+                payload=ha_irrigation_switch_message(
+                    ctrl.id,
+                    ctrl.name,
+                    suffix="auto_advance",
+                    name=f"{ctrl.name} Auto Advance",
+                    config_helper=cfg,
+                ),
+            )
 
-        _pub(
-            id=f"{ctrl.id}_reverse",
-            ha_type="switch",
-            payload=ha_irrigation_switch_message(
-                ctrl.id,
-                ctrl.name,
-                suffix="reverse",
-                name=f"{ctrl.name} Reverse",
-                config_helper=cfg,
-            ),
-        )
+            _pub(
+                id=f"{ctrl.id}_reverse",
+                ha_type="switch",
+                payload=ha_irrigation_switch_message(
+                    ctrl.id,
+                    ctrl.name,
+                    suffix="reverse",
+                    name=f"{ctrl.name} Reverse",
+                    config_helper=cfg,
+                ),
+            )
 
         _pub(
             id=f"{ctrl.id}_skip_next_run",
@@ -481,18 +489,20 @@ class IrrigationManager:
             ),
         )
 
-        _pub(
-            id=f"{ctrl.id}_next_valve",
-            ha_type="button",
-            payload=ha_irrigation_button_message(
-                ctrl.id,
-                ctrl.name,
-                suffix="next_valve",
-                name=f"{ctrl.name} Next Valve",
-                payload_press=NEXT_VALVE,
-                config_helper=cfg,
-            ),
-        )
+        # Multi-zone-only button: next_valve
+        if len(ctrl.zones) > 1:
+            _pub(
+                id=f"{ctrl.id}_next_valve",
+                ha_type="button",
+                payload=ha_irrigation_button_message(
+                    ctrl.id,
+                    ctrl.name,
+                    suffix="next_valve",
+                    name=f"{ctrl.name} Next Valve",
+                    payload_press=NEXT_VALVE,
+                    config_helper=cfg,
+                ),
+            )
 
         _pub(
             id=f"{ctrl.id}_pause",

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/core/manager/manager.py

@@ -1426,6 +1426,8 @@ class Manager:
                 output_id=output_id,
                 remote_source=remote_source,
                 event_bus=self._event_bus,
+                message_bus=self._message_bus,
+                topic_prefix=self._topic_prefix,
                 output_type=output_type,
                 show_in_ha=show_in_ha,
                 area=area,
@@ -1765,7 +1767,15 @@ class Manager:
         if msg_type == OUTPUT and command == SET_BRIGHTNESS:
             target_device = self.outputs.get_output(device_id)
             if target_device and target_device.output_type != "none" and message != "":
-                target_device.set_brightness(int(message))
+                brightness_val = int(message)
+                # Brightness > 0 effectively turns ON — must respect interlock
+                if brightness_val > 0 and hasattr(target_device, "check_interlock") and not target_device.check_interlock():
+                    _LOGGER.warning(
+                        "Interlock active: cannot set brightness on '%s'",
+                        device_id,
+                    )
+                    return
+                target_device.set_brightness(brightness_val)
             else:
                 _LOGGER.debug("Target device not found %s.", device_id)
             return

boneio-1.4.0.dev11/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "1.4.0dev11"

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/webui/dashboard_cards.py

@@ -184,7 +184,9 @@ def slider_tile(
         "entity": entity,
         "name": name,
         "icon": icon,
-        "features": [{"type": "numeric-input", "style": "buttons"}],
+        "vertical": False,
+        "features": [{"type": "numeric-input", "style": "slider"}],
+        "features_position": "inline",
     }
 
 

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/webui/routes/config.py

@@ -137,6 +137,13 @@ def invalidate_config_cache():
     """
     _config_cache["data"] = None
     _config_cache["mtime"] = 0
+    # Also invalidate ConfigHelper's internal cache so GET /api/config
+    # re-reads from disk instead of returning stale data.
+    try:
+        app_state = _get_app_state()
+        app_state.manager.config_helper._config_cache = None
+    except Exception:
+        pass
     try:
         config_file = _get_app_state().yaml_config_file
         clear_config_cache(config_file)

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11}/boneio/webui/routes/irrigation.py

@@ -609,22 +609,14 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
         badges=[entity_badge(main_switch), entity_badge(next_run)],
     ))
 
-    # ── 2. Podlewanie ręczne — valve tiles in rows of 2 ──────────────
+    # ── 2. Podlewanie ręczne — valve tiles ──────────────────────────
     cards.append(heading_card("Podlewanie ręczne", style="subtitle"))
-    zone_tiles: list[dict] = []
     for zone in ctrl.zones:
         zone_valve = eid("valve", f"zone_{zone.id}")
-        zone_tiles.append(tile_card(
+        cards.append(tile_card(
             zone_valve, zone.name, "mdi:sprinkler-variant",
             state_content=["last_changed", "state"],
         ))
-    # Pack tiles into horizontal-stacks of 2
-    for i in range(0, len(zone_tiles), 2):
-        pair = zone_tiles[i : i + 2]
-        if len(pair) == 1:
-            cards.append(pair[0])
-        else:
-            cards.append(horizontal_stack(pair))
 
     # ── 3. Czasy podlewania — tile cards with +/- buttons ──────────
     cards.append(heading_card("Czasy podlewania", style="subtitle"))
@@ -634,8 +626,13 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
 
     # ── 4. Ustawienia ─────────────────────────────────────────────────
     cards.append(heading_card("Ustawienia", style="subtitle"))
-    for s in ("auto_advance", "standby", "skip_next_run", "reverse"):
-        cards.append(inline_tile(eid("switch", s)))
+    # Multi-zone-only switches
+    if len(ctrl.zones) > 1:
+        for s in ("auto_advance", "standby", "skip_next_run", "reverse"):
+            cards.append(inline_tile(eid("switch", s)))
+    else:
+        for s in ("standby", "skip_next_run"):
+            cards.append(inline_tile(eid("switch", s)))
     cards.append(inline_tile(
         eid("number", "multiplier"),
         features=[{"type": "numeric-input", "style": "buttons"}],
@@ -650,11 +647,12 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
 
     # ── 5. Sterowanie ─────────────────────────────────────────────────
     cards.append(heading_card("Sterowanie", style="subtitle"))
-    cards.append(horizontal_stack([
-        tile_card(eid("button", "next_valve"), "Next valve", "mdi:skip-next"),
-        tile_card(eid("button", "pause"), "Pause", "mdi:pause"),
-        tile_card(eid("button", "resume"), "Resume", "mdi:play"),
-    ]))
+    control_tiles = []
+    if len(ctrl.zones) > 1:
+        control_tiles.append(tile_card(eid("button", "next_valve"), "Next valve", "mdi:skip-next"))
+    control_tiles.append(tile_card(eid("button", "pause"), "Pause", "mdi:pause"))
+    control_tiles.append(tile_card(eid("button", "resume"), "Resume", "mdi:play"))
+    cards.append(horizontal_stack(control_tiles))
 
     # Water source select (if multiple)
     if len(ctrl.water_sources) > 1:

{boneio-1.4.0.dev9 → boneio-1.4.0.dev11/boneio.egg-info}/PKG-INFO

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

boneio-1.4.0.dev9/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "1.4.0dev9"