boneIO 1.4.0.dev10__py3-none-any.whl → 1.4.0.dev12__py3-none-any.whl

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/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/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/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/version.py

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

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.dist-info → boneio-1.4.0.dev12.dist-info}/METADATA

@@ -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.dist-info → boneio-1.4.0.dev12.dist-info}/RECORD

@@ -3,7 +3,7 @@ boneio/bonecli.py,sha256=MfkiiMkoIZ98davH3L7IrBvugQbiIpAidWEabn5GZmQ,13160
 boneio/const.py,sha256=M981R2gwfjDX3lcoufWOyGlNxvGMESWgXOjVkmJfX60,7208
 boneio/exceptions.py,sha256=cBph-TsLF7FSz6p4wYeMs3pjVmVRaNQRJP82JgYYV-c,810
 boneio/runner.py,sha256=q_3050BKgnDcsT1ChFr9IZrAn2p6EyGp4DFKQy9BVno,17886
-boneio/version.py,sha256=4sfGul1aAJUPadvpf2CD68UZzkAG4IOmKwCqixxOQxo,42
+boneio/version.py,sha256=7wjaubuDGFFEKG9aGo44UORVu7BE6wtkaSzCBGWcKMk,42
 boneio/boards/0.2/input.yaml,sha256=K5EcB44BZ8PxbPnH1izYwJ-ePo8gs4qZttMXhnMnfQ8,1259
 boneio/boards/0.2/output_24_16.yaml,sha256=GQGM3gUK7UobdGL-Ejt9UKdCs1HLPgZ7kziVZ1tjQlA,1462
 boneio/boards/0.2/output_32_10.yaml,sha256=169ubuzRqFLGiOr7zgB1xL1tKdQyOx2FJZvTCkxCA4U,1920
@@ -59,14 +59,14 @@ boneio/components/input/remote/__init__.py,sha256=ZtFTrY9AA4cRef0obcj2zaWIolYP4b
 boneio/components/input/remote/base.py,sha256=T2aWwe8pHEWr0VoNAIrMkSJPxZP_s8NX8lWerZrZxcg,11747
 boneio/components/input/remote/esphome.py,sha256=vNGKrHeq4vvkh_fDgY5IfTSo1ex89fqcWMHVg0_vLx8,2947
 boneio/components/irrigation/__init__.py,sha256=_1p_uMxDI9EIdlE4L8TqtGteTPCRVIoSGvXvAnsq78o,198
-boneio/components/irrigation/controller.py,sha256=VYc-_1kHTEkCnMQhaxPUOxHF-tALsKKWGiEp46veMZ0,42396
+boneio/components/irrigation/controller.py,sha256=s-Kb5PKmdAVUySw2QsaCGrSZgmVZESka5El4Q8cj5UU,43428
 boneio/components/irrigation/water_source.py,sha256=oE9Lz3EI-AH_0FZbG3lt5Uyxo3uCzgNKsi3RDHAti6k,4013
 boneio/components/output/__init__.py,sha256=VzTB3bzR0y2fkWNDdiuNFrfiUDVvWSnwkxiIecaxtOg,351
 boneio/components/output/basic.py,sha256=uLiXW0zVa-trXzEl-j4chQdAMoDRuNrQN6aPBaPN7PE,11910
 boneio/components/output/mcp.py,sha256=T5dfga2Nk2HZRxdWDiAgVMWFIpPfgQdraSsb4LBUygM,2322
 boneio/components/output/pca.py,sha256=JX3ddnh8eBeWcafn4moG1wva8EoXmRxsQ7S4ngO-NtY,3202
 boneio/components/output/pcf.py,sha256=wuQKGlDBbr6mIZpn-KEHtm21pp1CWZCBfd4qsIgTlwg,1826
-boneio/components/output/remote.py,sha256=sEBE4aDc4ST7Rzt5FtcxPMKCd8KRNLZ9QX1mMfrHkNE,27036
+boneio/components/output/remote.py,sha256=lk-4eLcpJ2C5lSDdAZo8BK90xuzg0VIYsCDDzlZTdtc,28356
 boneio/components/sensor/__init__.py,sha256=6HAcMYUS89qtepYuLU2EQ4Zk_7RfQlsW_ODK8d_R4Bw,254
 boneio/components/sensor/virtual_energy.py,sha256=Np4VVTB_MG83PDNraUM4nZEs8aGpVYPx373wg5w923s,11440
 boneio/components/template/__init__.py,sha256=-MYMHjdGeAGkl9XH34-3vwEkzgEBOnVpfk9bGkUFKqU,498
@@ -87,7 +87,7 @@ boneio/core/config/config_helper.py,sha256=7QOqBDMPCMQ9TuSPrAcY5rNM7tQbqgh9k5uUM
 boneio/core/config/package-lock.json,sha256=AeqhAJcsqGoKGJHoF_Qduy0gatmXV6nNesZwZYYrnWM,85
 boneio/core/config/package.json,sha256=yj0WO6sFU4GCciYUBWjzvvfqrBh869doeOC2Pp5EI1Y,3
 boneio/core/config/schema_converter.py,sha256=c1tSuGWMIrKX6eNiZJJLx5QYBTugy6xLIKd5Dc11WYc,13397
-boneio/core/config/yaml_util.py,sha256=0OOe8t6zbWcgcgZPoaYmGSUYviMNYjwBTTWJy7mjFKY,58113
+boneio/core/config/yaml_util.py,sha256=PmsWUlUrTezCTFjlinIt1doTdl-1pU9Fo7tH0pOuchg,58264
 boneio/core/config/migrations/__init__.py,sha256=ZkGWxJ5ebyWPJvl96v72xiJNT-805rdSyMMzCXqtDb4,7212
 boneio/core/config/migrations/v1_proxy_port.py,sha256=MVWhNH9M9_LG92CR9UU7rnGy-LhjHr5_2FxoZihMrHc,2169
 boneio/core/config/migrations/v2_transition.py,sha256=pCpCrmjSHDDz3lXk4ANC9shdTVgvk2Mi9eq7je_EcWo,3742
@@ -100,7 +100,7 @@ boneio/core/manager/covers.py,sha256=es4bxUpUv10XI4S3VmNFXtdXkOn3rcLJnSrjxUYxKr0
 boneio/core/manager/display.py,sha256=MeuCvagebfXsJfr2I3PButkQPhPJQeEAIuTPnn9jMFg,12819
 boneio/core/manager/inputs.py,sha256=0QfLmFu2u-ENtpUglfDYrGTCtR7Neu7iOHlRtbHqPic,41370
 boneio/core/manager/irrigation.py,sha256=kFTmBa6mKOylV6o2gflPFCZoztuejxlku4C77ggvYwM,25035
-boneio/core/manager/manager.py,sha256=wLKIANaissYd7Q0ihU9Fh2vfStmAsHM88yuMOjAOFC0,81704
+boneio/core/manager/manager.py,sha256=gGTKLWzBTxGso635EqkIUXHKs9QrTw7Dd4oI14BmSno,82250
 boneio/core/manager/modbus.py,sha256=xkKdn3gQviHubW8VwYq_cW0tCyI31Jna2TcOyxRsNfc,15854
 boneio/core/manager/outputs.py,sha256=XKu4RFcPirdpul89-airVEEBrfQH4ZJlUmCXx6VNNzw,37983
 boneio/core/manager/remote.py,sha256=zHwhIsB20CbzM23OiNSxkmh3nkWY3kEc_qO1zFiR0no,40861
@@ -388,7 +388,7 @@ boneio/webui/routes/__init__.py,sha256=qddXxa09T2Vrzp_wfyh6wkB503rm3A1hp-UxDTRa_
 boneio/webui/routes/auth.py,sha256=5jPKYL7NnXni_r9ssBHppmqtgai6JObd3vqhycPeLdU,1589
 boneio/webui/routes/caddy.py,sha256=zS21OctOueuza_zigWoEz9V9-1S6IN4D77AKI5U7Pd4,24020
 boneio/webui/routes/can.py,sha256=18RVS2pPe_bNeZDcHSmwoLqsdmizjvTf18IdphfmeuU,14660
-boneio/webui/routes/config.py,sha256=Lg70p4CA-k7DcKkSGizTi4IaNWz83O8vT4hr6i9ln9U,52450
+boneio/webui/routes/config.py,sha256=CNd9YaYb_MpUl89wD_ar8kiN3peSbT28mY9raOd5CxA,52721
 boneio/webui/routes/covers.py,sha256=DtT4hSomRjR2MzBrfBiT0e4T0xbwet49hlpjXGv8vuw,3719
 boneio/webui/routes/irrigation.py,sha256=BCJMNtXNqQ0oNGjZJcjlzXS-l17c0x-h_qCYxxe9PQg,26186
 boneio/webui/routes/migrations.py,sha256=Xa2CUg8wvhIRgHkDqd7C9AVVXLfZSLeSA74U62SFkLU,5895
@@ -435,9 +435,9 @@ boneio/webui/schema/virtual_energy_sensor.schema.json,sha256=BN6Egh-CAnXSa80bQ6Y
 boneio/webui/schema/web.schema.json,sha256=cactLq1MVwDL5hu8bLeuq5yiz49BWVS4OtjWLmhbw2M,2592
 boneio/webui/services/__init__.py,sha256=l_L3YUPhc0ZbrWqKH1RurC7UQ4q0k-5ABGTwOSS-YFQ,282
 boneio/webui/services/logs.py,sha256=7n596oxeWNIPDyKYdMJXFpH-GCvdKb_YrqTLy6kPBWA,11423
-boneio-1.4.0.dev10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneio-1.4.0.dev10.dist-info/METADATA,sha256=bq4xV70Z3ODICX7nS1utyc2hne3GpEuhUQ8fSZvcadI,1962
-boneio-1.4.0.dev10.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-boneio-1.4.0.dev10.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
-boneio-1.4.0.dev10.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
-boneio-1.4.0.dev10.dist-info/RECORD,,
+boneio-1.4.0.dev12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneio-1.4.0.dev12.dist-info/METADATA,sha256=ltQYBEG_wPVpQha4IHwhlpRoUJsn225ZGdZgS_RQYa8,1962
+boneio-1.4.0.dev12.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+boneio-1.4.0.dev12.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
+boneio-1.4.0.dev12.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
+boneio-1.4.0.dev12.dist-info/RECORD,,