boneio 1.4.0.dev10__tar.gz → 1.4.0.dev12__tar.gz

{boneio-1.4.0.dev10/boneio.egg-info → boneio-1.4.0.dev12}/PKG-INFO

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

{boneio-1.4.0.dev10 → boneio-1.4.0.dev12}/boneio/components/irrigation/controller.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import datetime as dt
 import logging
 import time
 import traceback
@@ -1058,9 +1059,32 @@ class IrrigationController:
 
             await self.start_full_cycle()
 
+def _local_now() -> datetime:
+    """Return the current time in the system's local timezone.
+
+    Extracted as a module-level function so tests can mock it easily.
+    """
+    local_tz = dt.datetime.now().astimezone().tzinfo
+    return dt.datetime.now(local_tz)
+
 
 def _next_fire_time(time_str: str, days: str) -> datetime:
-    now = utcnow()
+    """Compute next fire time for a schedule entry.
+
+    The user-configured ``time_str`` (e.g. "18:00") is in **local time**.
+    We build the candidate in the system's local timezone and then convert
+    to UTC so that comparisons with ``utcnow()`` and HA's
+    ``device_class: timestamp`` work correctly.
+
+    Args:
+        time_str: Schedule time in "HH:MM" format (local time).
+        days: Day filter string ("daily", "weekdays", "weekends", "mon,wed,fri", etc.).
+
+    Returns:
+        Next fire time as a timezone-aware UTC datetime.
+    """
+    now_local = _local_now()
+
     try:
         hh, mm = time_str.split(":", 1)
         target_h = int(hh)
@@ -1071,18 +1095,21 @@ def _next_fire_time(time_str: str, days: str) -> datetime:
     allowed_days = _DAYS_MAP.get(days, _DAYS_MAP["daily"])
 
     for plus_days in range(0, 8):
-        candidate = (now + timedelta(days=plus_days)).replace(
+        candidate_local = (now_local + timedelta(days=plus_days)).replace(
             hour=target_h,
             minute=target_m,
             second=0,
             microsecond=0,
         )
-        if candidate.weekday() in allowed_days and candidate > now:
-            return candidate
+        if candidate_local.weekday() in allowed_days and candidate_local > now_local:
+            # Convert to UTC for consistent comparison with utcnow()
+            return candidate_local.astimezone(dt.UTC)
 
-    return (now + timedelta(days=1)).replace(
+    fallback_local = (now_local + timedelta(days=1)).replace(
         hour=target_h,
         minute=target_m,
         second=0,
         microsecond=0,
     )
+    return fallback_local.astimezone(dt.UTC)
+

{boneio-1.4.0.dev10 → boneio-1.4.0.dev12}/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.dev10 → boneio-1.4.0.dev12}/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.dev10 → boneio-1.4.0.dev12}/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.dev12/boneio/version.py

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

{boneio-1.4.0.dev10 → boneio-1.4.0.dev12}/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.dev10 → boneio-1.4.0.dev12/boneio.egg-info}/PKG-INFO

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

boneio-1.4.0.dev10/boneio/version.py

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