boneIO 0.9.4.dev2__py3-none-any.whl → 0.9.4.dev4__py3-none-any.whl

boneio/example_config/all_binary_sensor.yaml

@@ -0,0 +1,106 @@
+- id: IN_01
+  boneio_input: IN_01
+  actions:
+    pressed:
+      - action: output
+        pin: OUT_01
+- id: IN_02
+  boneio_input: IN_02
+  actions:
+    pressed:
+      - action: output
+        pin: OUT_02
+# - id: IN_03
+#   boneio_input: IN_03
+# - id: IN_04
+#   boneio_input: IN_04
+# - id: IN_05
+#   boneio_input: IN_05
+# - id: IN_06
+#   boneio_input: IN_06
+# - id: IN_07
+#   boneio_input: IN_07
+# - id: IN_08
+#   boneio_input: IN_08
+# - id: IN_09
+#   boneio_input: IN_09
+# - id: IN_10
+#   boneio_input: IN_10
+# - id: IN_11
+#   boneio_input: IN_11
+# - id: IN_12
+#   boneio_input: IN_12
+# - id: IN_13
+#   boneio_input: IN_13
+# - id: IN_14
+#   boneio_input: IN_14
+# - id: IN_15
+#   boneio_input: IN_15
+# - id: IN_16
+#   boneio_input: IN_16
+# - id: IN_17
+#   boneio_input: IN_17
+# - id: IN_18
+#   boneio_input: IN_18
+# - id: IN_19
+#   boneio_input: IN_19
+# - id: IN_20
+#   boneio_input: IN_20
+# - id: IN_21
+#   boneio_input: IN_21
+# - id: IN_22
+#   boneio_input: IN_22
+# - id: IN_23
+#   boneio_input: IN_23
+# - id: IN_24
+#   boneio_input: IN_24
+# - id: IN_25
+#   boneio_input: IN_25
+# - id: IN_26
+#   boneio_input: IN_26
+# - id: IN_27
+#   boneio_input: IN_27
+# - id: IN_28
+#   boneio_input: IN_28
+# - id: IN_29
+#   boneio_input: IN_29
+# - id: IN_30
+#   boneio_input: IN_30
+# - id: IN_31
+#   boneio_input: IN_31
+# - id: IN_32
+#   boneio_input: IN_32
+# - id: IN_33
+#   boneio_input: IN_33
+# - id: IN_34
+#   boneio_input: IN_34
+# - id: IN_35
+#   boneio_input: IN_35
+# - id: IN_36
+#   boneio_input: IN_36
+# - id: IN_37
+#   boneio_input: IN_37
+# - id: IN_38
+#   boneio_input: IN_38
+# - id: IN_39
+#   boneio_input: IN_39
+# - id: IN_40
+#   boneio_input: IN_40
+# - id: IN_41
+#   boneio_input: IN_41
+# - id: IN_42
+#   boneio_input: IN_42
+# - id: IN_43
+#   boneio_input: IN_43
+# - id: IN_44
+#   boneio_input: IN_44
+# - id: IN_45
+#   boneio_input: IN_45
+# - id: IN_46
+#   boneio_input: IN_46
+# - id: IN_47
+#   boneio_input: IN_47
+# - id: IN_48
+#   boneio_input: IN_48
+# - id: IN_49
+#   boneio_input: IN_49

boneio/example_config/config.yaml

@@ -15,7 +15,7 @@ lm75:
 event: !include event.yaml
 binary_sensor: !include binary_sensor.yaml
 
-output: !include output32x5A.yaml
+output: !include output32x10A_new.yaml
 
 boneio:
   name: "boneIO Black 32x10A"

boneio/helper/queue.py

@@ -4,29 +4,55 @@ If MQTT is down then regular queue can append multiple ON/OFF for same topic.
 After re-connection it would send all messages. It's not necessary, last payload of same topic is enough.
 """
 import asyncio
+from typing import Any, Dict, Tuple
 
 
 class UniqueQueue(asyncio.Queue):
-    """Unique implementation of asyncio.Queue."""
+    """Unique implementation of asyncio.Queue that handles MQTT connection state."""
 
-    def _init(self, maxsize):
-        """Create unique dict of tuple[0]."""
+    def __init__(self, maxsize: int = 0):
+        """Initialize the queue."""
+        super().__init__(maxsize=maxsize)
+        self._unique_items: Dict[str, Tuple[Any, ...]] = {}
+        self._is_connected = False
+
+    def set_connected(self, state: bool) -> None:
+        """Set the connection state."""
+        self._is_connected = state
+
+    def _init(self, maxsize: int) -> None:
+        """Initialize the internal queue storage."""
         super()._init(maxsize=maxsize)
-        self._unique_set = {}
+        self._unique_items = {}
 
-    def _put(self, item):
-        """If item does not exists add it.
-        If exists remove old one and put new one in the beginning of the queue."""
-        if item[0] not in self._unique_set:
+    def _put(self, item: Tuple[str, Any, bool]) -> None:
+        """Put an item into the queue.
+        
+        If MQTT is not connected:
+            - If topic exists, replace the old message
+            - If topic doesn't exist, add new message
+        If MQTT is connected:
+            - Add all messages to queue
+        
+        Args:
+            item: Tuple of (topic, payload, retain)
+        """
+        topic = item[0]
+        
+        if not self._is_connected:
+            # When disconnected, replace existing messages for same topic
+            if topic in self._unique_items:
+                self._queue.remove(self._unique_items[topic])
             super()._put(item)
-            self._unique_set[item[0]] = item
+            self._unique_items[topic] = item
         else:
-            self._queue.remove(self._unique_set[item[0]])
+            # When connected, queue all messages
             super()._put(item)
-            self._unique_set[item[0]] = item
+            self._unique_items[topic] = item
 
-    def _get(self):
-        """Get item and remove it."""
+    def _get(self) -> Tuple[str, Any, bool]:
+        """Get an item from the queue and remove it from unique items tracking."""
         item = super()._get()
-        del self._unique_set[item[0]]
+        if item[0] in self._unique_items:
+            del self._unique_items[item[0]]
         return item

boneio/manager.py

@@ -778,13 +778,17 @@ class Manager:
         """Callback for receiving action from Mqtt."""
         _LOGGER.debug("Processing topic %s with message %s.", topic, message)
         if topic.startswith(
-            f"{self._config_helper.topic_prefix}/status"
+            f"{self._config_helper.ha_discovery_prefix}/status"
         ):
             if message == ONLINE:
                 self.resend_autodiscovery()
                 self._event_bus.signal_ha_online()
             return
-        assert topic.startswith(self._config_helper.cmd_topic_prefix)
+        try:
+            assert topic.startswith(self._config_helper.cmd_topic_prefix)
+        except AssertionError as err:
+            _LOGGER.error("Wrong topic %s. Error %s", topic, err)
+            return
         topic_parts_raw = topic[
             len(self._config_helper.cmd_topic_prefix) :
         ].split("/")

boneio/mqtt_client.py

@@ -19,10 +19,10 @@ from paho.mqtt.properties import Properties
 from paho.mqtt.subscribeoptions import SubscribeOptions
 
 from boneio.const import OFFLINE, PAHO, STATE
-from boneio.helper import UniqueQueue
 from boneio.helper.config import ConfigHelper
 from boneio.helper.events import GracefulExit
 from boneio.helper.message_bus import MessageBus
+from boneio.helper.queue import UniqueQueue
 from boneio.manager import Manager
 
 _LOGGER = logging.getLogger(__name__)
@@ -174,7 +174,7 @@ class MQTTClient(MessageBus):
                     await self._subscribe_manager(self._manager)
                 except MqttError as err:
                     self.reconnect_interval = min(
-                        self.reconnect_interval * 2, 600
+                        self.reconnect_interval * 2, 60
                     )
                     _LOGGER.error(
                         "MQTT error: %s. Reconnecting in %s seconds",
@@ -182,6 +182,7 @@ class MQTTClient(MessageBus):
                         self.reconnect_interval,
                     )
                     self._connection_established = False
+                    self.publish_queue.set_connected(False)
                     await asyncio.sleep(self.reconnect_interval)
                     self.create_client()  # reset connect/reconnect futures
         except (asyncio.CancelledError, GracefulExit):
@@ -194,21 +195,19 @@ class MQTTClient(MessageBus):
 
     async def _subscribe_manager(self, manager: Manager) -> None:
         """Connect and subscribe to manager topics + host stats."""
-        # Create a new future for this run
-        self._cancel_future = asyncio.Future()
-        
-        async def wait_for_cancel():
-            await self._cancel_future
-            # When future completes, raise CancelledError to stop other tasks
-            raise asyncio.CancelledError("Stop requested")
-        
         async with AsyncExitStack() as stack:
-            tasks: Set[asyncio.Task] = set()
-
-            # Connect to the MQTT broker.
             await stack.enter_async_context(self.asyncio_client)
-            # Reset the reconnect interval after successful connection.
-            self.reconnect_interval = 1
+            self._connection_established = True
+            self.publish_queue.set_connected(True)
+            # Create a new future for this run
+            self._cancel_future = asyncio.Future()
+            
+            async def wait_for_cancel():
+                await self._cancel_future
+                # When future completes, raise CancelledError to stop other tasks
+                raise asyncio.CancelledError("Stop requested")
+            
+            tasks: Set[asyncio.Task] = set()
 
             publish_task = asyncio.create_task(self._handle_publish())
             tasks.add(publish_task)

boneio/version.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.9.4dev2"
+__version__ = "0.9.4dev4"

{boneio-0.9.4.dev2.dist-info → boneio-0.9.4.dev4.dist-info}/METADATA

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

{boneio-0.9.4.dev2.dist-info → boneio-0.9.4.dev4.dist-info}/RECORD

@@ -10,9 +10,10 @@ boneio/const.py,sha256=ZYy0z_2cPDWH0zkIw4bO-UBYXgXVNLoBAefgDOBV7Mw,5134
 boneio/cover.py,sha256=Cz9s92YciEvrE7iAB3aoP38ABN90HjG1U5v5rM9oeA8,8620
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boneio/example_config/adc.yaml,sha256=GKNpl2t7ebsH57UhJlJioXNuBflsL6eO4JMnyYwZrFs,168
+boneio/example_config/all_binary_sensor.yaml,sha256=f8jsCMVUZYD0PE6bDfYm6k7BTNXsmzAobDd9X98L-A4,1987
 boneio/example_config/binary_sensor.yaml,sha256=4oErCX-5t6e9e0KVo5GkkFplKkgKs0st-wTmyiCZNzM,286
 boneio/example_config/binary_sensor_v_0_7.yaml,sha256=uaIDVV7t4drhlBDu_IK-ZK1DiMqqCP9tCi_HfS7KP5I,185
-boneio/example_config/config.yaml,sha256=C-NtH372Q9Ifv6boLSKimALpPQQt3zeEcZqQzEuo3wI,405
+boneio/example_config/config.yaml,sha256=miGRJU9gzTYry3uEibfCwXMomi994ngBoQ-ApgoyMjk,410
 boneio/example_config/cover.yaml,sha256=rs7lv3vIEgAb3q96RKsJL7VMRsEvSNHG848dzZzSKsI,150
 boneio/example_config/event.yaml,sha256=9TMKXGLTAz4umSJCiMs53ReFmhY84LtmEPnanIIw-uY,2692
 boneio/example_config/event_all.yaml,sha256=9TMKXGLTAz4umSJCiMs53ReFmhY84LtmEPnanIIw-uY,2692
@@ -46,7 +47,7 @@ boneio/helper/onewire/__init__.py,sha256=4djH-uxiq5XhAiFTOxyqjvWVoJe0c8U8iN0BfmH
 boneio/helper/onewire/ds2482.py,sha256=c2t_hdAMtFsHw4Vw41QzO_hEDDNMeb3J71mEwEMUBhM,5169
 boneio/helper/onewire/onewire.py,sha256=tHofTu1l0qG7hH2XoSf-lj8gW7wVKe27j57qQWpVMPg,2497
 boneio/helper/pcf8575.py,sha256=qeNYLqV5foDEQCyAz1WRQRi1CYYxtbPIha06Z5TyZVQ,311
-boneio/helper/queue.py,sha256=7fE7d344-BEW8sljN40wmqsbBr4kPLvz4ShBjkT04p8,1066
+boneio/helper/queue.py,sha256=p0MGzgFnsLgpc98FNHCoQdIS75IJnO9qkCMFsTA2Hvk,2067
 boneio/helper/schema_converter.py,sha256=1kT0i5ofqYT0TSbdRftBgsiww13u6bpy4q3_TZXx4iI,7919
 boneio/helper/sensor/ina_219_smbus.py,sha256=eXp2epjUgsqaXamTSWSn3LMow5X_YxAxdREaWD7N3mk,6170
 boneio/helper/state_manager.py,sha256=T-1kPZlMqo05jCRE7widQeO5zXV08nsvmZh8k9HJJEk,2522
@@ -57,7 +58,7 @@ boneio/helper/yaml_util.py,sha256=SW7u6i4Re_u4bm-aW-_Wk9piQz949kgjiwk8Y3kTObY,18
 boneio/input/__init__.py,sha256=8Hcps-wCCl6bCAMoEmDJecR-Q9giFL29AvG1ZGe0dZw,200
 boneio/input/gpio.py,sha256=vdQuvWlwV41mbLgLRi-z1vpmRj61HDsmbJrYUoCOHkM,2675
 boneio/input/gpio_new.py,sha256=Br2Lw5bci1_qb_UO63tJr4uBSjCkBvjGdzla4s1ctS8,3050
-boneio/manager.py,sha256=XC-gWMaWJPnDkAcZSWB_sU8LYOHc6YWDcrGUoZ73Viw,32887
+boneio/manager.py,sha256=Ezqv_SkIGImpaCUMpTRmUzBr-i_hvGKc4qqjfXXSOtM,33034
 boneio/modbus/__init__.py,sha256=yeHIxZ0_u7eCL7CqScvob5Utcru6Iza0LEtTagEtNtw,116
 boneio/modbus/client.py,sha256=v_w6HOFH4e-CWcSjpyBojLhglIqJ6kPVXOLEDAEmsI0,8137
 boneio/modbus/cwt.json,sha256=PCn9t5wQkNCD8AqwXSoJ3cEm50bKAX4FmPw6fWCvLrg,908
@@ -80,7 +81,7 @@ boneio/modbus/utils.py,sha256=RQFLNGHkT3mFsNmYKR34uaZr33ZnFa_j0BN7qnI5-uQ,1765
 boneio/models/__init__.py,sha256=RiXQsIBXKaS0LkZ085EppB99MIp-eKZZbQ8XpS2Urnk,1181
 boneio/models/files.py,sha256=-L39YexEkfaXszjc1-3Nc7MBtGZljS8_Z1t8KHE__1o,294
 boneio/models/logs.py,sha256=0IELpySgOv5BxqLZr_Q4p9jPbFcC8N0yvVccZIbeW3g,192
-boneio/mqtt_client.py,sha256=QsrfoFkh027_ZwNeiPJOhJ96gP8-csH4Ez4OA1RNSK4,9689
+boneio/mqtt_client.py,sha256=l27iBoAOqG5iMAwBH_AnIFbeawB07NGHL1DG0ovskJw,9730
 boneio/oled.py,sha256=RAQInYUHyDq3Qe1VD03QBSiIz8UIzVfvh4h_t8aR4pU,11492
 boneio/relay/__init__.py,sha256=Cz6D37GKHxm8DiuPuxE2EMaey2wdUdJYVet_hfR0lzA,231
 boneio/relay/basic.py,sha256=oaSwSZhASfopmeyo8Ti1KRdw7o4w0CDAMw2fy9O2Jdc,5373
@@ -108,7 +109,7 @@ boneio/sensor/temp/__init__.py,sha256=XA0Jew4CJqyOCn06D6pXTELhT60885UaTxFdIqtXE-
 boneio/sensor/temp/dallas.py,sha256=qOhoZvBqgwDTy3Q7r1UUFbGoteUKMFsqpjBQgPm16rw,2690
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=hFc5nzKzhRB3ECxi8iXusf9NHuTCGShZNbWGN4KIw3s,41
+boneio/version.py,sha256=z81Mox2_hiJJ34z3NEJn7GQoaVmX49eCPmL1UzgYTy4,41
 boneio/webui/app.py,sha256=JG6oi0QcQua4jk8uYpSXoDyhMCiLxx3WRzs9PLLOIKo,33323
 boneio/webui/frontend-dist/assets/abap-BrgZPUOV.js,sha256=o-KiQdqDx6qAg2rOn7OyokL0WP-Rffnxk2Py5kMN0Fk,14409
 boneio/webui/frontend-dist/assets/apex-DyP6w7ZV.js,sha256=nm1bQzOU_JCzp8WFFKtYxrtJ50DvA-FGkoo_0Ala62g,4198
@@ -229,8 +230,8 @@ boneio/webui/schema/sensor.schema.json,sha256=OGRunW_aAOfp2q0IU1aD3WRO7wEFsSknCl
 boneio/webui/schema/web.schema.json,sha256=hoixKf8J51D-UxGawcnD1UsgQFY07bqCQNereTaaNqw,1342
 boneio/webui/web_server.py,sha256=CDB19_yZpStAnrbFjucE7AN8i_pShMXjAbBCmNwdaCE,5102
 boneio/webui/websocket_manager.py,sha256=K9KXIT0OvK_ILNmM5GIH1f7FiYkk0vTNM0iJQh5Jdfg,5365
-boneio-0.9.4.dev2.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneio-0.9.4.dev2.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-boneio-0.9.4.dev2.dist-info/METADATA,sha256=A1tu94El04iuUEBv8BgUht4zGbt08gwaZQ0duUCtcbo,1977
-boneio-0.9.4.dev2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneio-0.9.4.dev2.dist-info/RECORD,,
+boneio-0.9.4.dev4.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneio-0.9.4.dev4.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneio-0.9.4.dev4.dist-info/METADATA,sha256=53He1zuA4dl4b6t8bjH3KZAsq0646kKuWSaxRGFkp1E,1977
+boneio-0.9.4.dev4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneio-0.9.4.dev4.dist-info/RECORD,,