python-dali 0.14__py3-none-any.whl → 0.16__py3-none-any.whl

dali/driver/serial.py

@@ -660,18 +660,30 @@ class DriverLubaRs232(DriverSerialBase):
                     )
                     if confirm.error_code is not None:
                         raise TransmissionError(confirm.error_code)
+                    if (
+                        hasattr(confirm.message, "frame")
+                        and confirm.message.frame != tx.frame
+                    ):
+                        # A confirmation for a different frame can only be a
+                        # stale one for an earlier send whose confirmation
+                        # arrived after it had already timed out: sends are
+                        # serialised under '_tx_lock', so nothing later is in
+                        # flight yet. Drop it and keep waiting for this frame's
+                        # own confirmation, otherwise every subsequent send
+                        # inherits the one-off mismatch and the stream never
+                        # resynchronises.
+                        _LOG.warning(
+                            "Discarding stale LUBA confirmation for '%s' "
+                            "while awaiting '%s'",
+                            confirm.message,
+                            tx,
+                        )
+                        continue
                     if hasattr(confirm.message, "frame"):
-                        if confirm.message.frame == tx.frame:
-                            _LOG.trace(
-                                f"LUBA device reports message '{tx}' sent, "
-                                f"with ID {confirm.tx_id}"
-                            )
-                        else:
-                            _LOG.error(
-                                "Expected LUBA device to confirm transmission "
-                                f"of message '{tx}', but got a confirmation "
-                                f"for '{confirm.message}'"
-                            )
+                        _LOG.trace(
+                            f"LUBA device reports message '{tx}' sent, "
+                            f"with ID {confirm.tx_id}"
+                        )
                     else:
                         _LOG.debug(
                             f"Unable to decode message id {confirm.tx_id}, but "
@@ -1317,7 +1329,13 @@ class DriverLubaRs232(DriverSerialBase):
         self._transport: Optional[serialx.SerialTransport] = None
         self._protocol: Optional[DriverLubaRs232.LubaProtocol] = None
 
-    async def connect(self, *, scan_dev_inst: bool = False) -> None:
+    async def connect(
+        self, *, scan_dev_inst: bool = False, apply_settings: bool = True
+    ) -> None:
+        # ``apply_settings=False`` connects without writing the device settings,
+        # leaving the interface's hardware configuration (including its bus-power
+        # state) untouched. Use it to probe a discovered interface read-only so
+        # the probe cannot depower a bus the integrated supply is already driving.
         if self.is_connected:
             _LOG.warning(
                 f"'connect()' called but luba232 driver already connected"
@@ -1346,8 +1364,9 @@ class DriverLubaRs232(DriverSerialBase):
         for attempt in range(1, DriverLubaRs232.handshake_attempts + 1):
             try:
                 await self._protocol.send_device_info_query()
-                self._protocol.bus_power = self.bus_power
-                await self._protocol.send_device_settings()
+                if apply_settings:
+                    self._protocol.bus_power = self.bus_power
+                    await self._protocol.send_device_settings()
                 break
             except (asyncio.TimeoutError, TimeoutError):
                 if attempt >= DriverLubaRs232.handshake_attempts:
@@ -1366,8 +1385,9 @@ class DriverLubaRs232(DriverSerialBase):
 
         # After switching on the integrated power supply the bus voltage takes
         # a moment to rise; sending DALI frames before then fails, so wait for
-        # the bus to be powered before scanning.
-        if self.bus_power:
+        # the bus to be powered before scanning. Skipped when the settings were
+        # not applied, as the bus-power state was then left untouched.
+        if apply_settings and self.bus_power:
             await self._wait_for_bus_power()
 
         # Scan the bus for control devices, and create a mapping of addresses

dali/tests/test_serial_driver.py

@@ -6,11 +6,12 @@ from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 
-from dali.address import DeviceShort, InstanceNumber
+from dali.address import DeviceShort, GearShort, InstanceNumber
 from dali.command import NumericResponse
 from dali.device.general import QueryInstanceType
 from dali.device.helpers import check_bad_rsp
 from dali.driver.serial import _DALI_FRAMING_ERROR, DriverLubaRs232
+from dali.gear.general import QueryActualLevel
 
 
 @pytest.mark.asyncio
@@ -93,6 +94,25 @@ async def test_connect_retries_handshake_on_timeout(monkeypatch):
     assert protocol.reset_luba_response.call_count == 2
 
 
+@pytest.mark.asyncio
+async def test_connect_without_applying_settings_leaves_hardware_untouched(
+    monkeypatch,
+):
+    """connect(apply_settings=False) must not write the device settings.
+
+    A read-only probe of a discovered interface must not overwrite the
+    hardware configuration, otherwise it could depower a bus the integrated
+    supply is already driving.
+    """
+    driver, protocol = _connecting_driver(monkeypatch, [None])
+
+    await driver.connect(apply_settings=False)
+
+    assert driver.is_connected
+    assert protocol.send_device_info_query.await_count == 1
+    assert protocol.send_device_settings.await_count == 0
+
+
 @pytest.mark.asyncio
 async def test_connect_raises_after_exhausting_handshake_attempts(monkeypatch):
     """When every handshake attempt times out, connect must give up and raise."""
@@ -149,6 +169,35 @@ async def test_connect_reopens_the_port_after_a_lost_transport(monkeypatch):
     assert driver._protocol is replacement
 
 
+@pytest.mark.asyncio
+async def test_send_dali_command_resyncs_after_stale_confirmation(caplog):
+    """A stale confirmation must not desync every following transmission.
+
+    A weak bus can let a send's confirmation arrive after it timed out; the
+    next send then finds that stale confirmation queued ahead of its own. It
+    must be discarded and the matching one awaited, so the stream recovers
+    instead of every later frame inheriting the one-off mismatch.
+    """
+    protocol = DriverLubaRs232.LubaProtocol()
+    protocol.transport = MagicMock()
+    protocol.rx_idle.set()
+
+    command = QueryActualLevel(GearShort(0))
+    stale = QueryActualLevel(GearShort(1))
+    protocol._queue_tx_conf.put_nowait(
+        protocol.LubaMsgTxConf(tx_id=1, message=stale)
+    )
+    protocol._queue_tx_conf.put_nowait(
+        protocol.LubaMsgTxConf(tx_id=2, message=command)
+    )
+
+    with caplog.at_level(logging.WARNING, logger="dali.driver"):
+        await protocol.send_dali_command(command)
+
+    assert protocol._queue_tx_conf.empty()
+    assert any("stale LUBA confirmation" in r.getMessage() for r in caplog.records)
+
+
 @pytest.mark.asyncio
 async def test_reset_luba_response_drains_all(caplog):
     """Stale LUBA command replies must be cleared before a handshake retry."""

{python_dali-0.14.dist-info → python_dali-0.16.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: python-dali
-Version: 0.14
+Version: 0.16
 Summary: Interface to DALI lighting systems
 Home-page: https://github.com/sde1000/python-dali
 Author: Stephen Early
 Author-email: steve@assorted.org.uk
-License: "LGPL-3.0-or-later"
+License: LGPL-3.0-or-later
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{python_dali-0.14.dist-info → python_dali-0.16.dist-info}/RECORD

@@ -18,7 +18,7 @@ dali/driver/base.py,sha256=Jd_0PrkVg84CdkVLmGBr5IyK5Sm7N68tqNDdPFRB7-0,3891
 dali/driver/daliserver.py,sha256=YbaTv8glbsPWtXy-m-zakxsPwZBu5FsuXxtVPfE1n78,3120
 dali/driver/hasseb.py,sha256=dQDrkxdpXlXlxmoShsoYOpvXpGzSLqZ8eqG-HMKIGOI,9376
 dali/driver/hid.py,sha256=CyBkCZeyDFumzvfTUeTB3xIjALZkg6dugd3G4DYIeig,33591
-dali/driver/serial.py,sha256=8bERuROWq_Sj5YH3--3Z-IOORXltmlTmqHf8hEGN_vk,81696
+dali/driver/serial.py,sha256=qk58G_6nEONZqS2MRX_A0XmhwBxyy8W4tE_E4z05tCw,82883
 dali/driver/trace_logging.py,sha256=qfkEdgVQsu-dXYKsmPXb6j7VRC6O1JJovuU8ca-KEMs,2366
 dali/driver/tridonic.py,sha256=H-j0u-7oP36uKxm-KdCO35AFuoyVzKu_jQs31jeDW6Y,10889
 dali/driver/unipi.py,sha256=arQ-o8zI-PtyvnyRa6f6kPKYswFtFvvdoKfCNRxTAiY,7399
@@ -54,11 +54,11 @@ dali/tests/test_frame.py,sha256=qd9LzN5ie9zFMTeqzTW5CIsLeuR4n0U4ZqybuG-s4Ck,6035
 dali/tests/test_general_sensor.py,sha256=jQqsjzUJa9rbX5pt1K9oavDiFXzMvqclx7qZ7FHrUos,1818
 dali/tests/test_memory.py,sha256=CGcoyhyd_pVC9C4yY0D7X83RIGs8RzYcDX32VuJvd3A,29526
 dali/tests/test_sequences.py,sha256=VaGy1WbUAXFRh-RU6v0OIOHKAhFwVh4KqU7O0N28zF8,4314
-dali/tests/test_serial_driver.py,sha256=oQ5qYCo93X7qxuhmySmqT5Ym97dkMZrzI-o2HmJsTpk,7531
-python_dali-0.14.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-python_dali-0.14.dist-info/licenses/COPYING.LESSER,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-python_dali-0.14.dist-info/licenses/LICENSE,sha256=HVcO3iFdIg-1DaBsl4fgk3swO0aZDktmHBZPIhhn_5o,168
-python_dali-0.14.dist-info/METADATA,sha256=x7ztPGVIdmPi80odDqzJ_Xtr-fvZiHJNJ1ajVC6N42I,6200
-python_dali-0.14.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_dali-0.14.dist-info/top_level.txt,sha256=VlSHNdAIGn5irB2PYMRKK0POsLocy-YusWmK3GwHViI,5
-python_dali-0.14.dist-info/RECORD,,
+dali/tests/test_serial_driver.py,sha256=rB6PBi-2tJsi9NLo2iTxAg2oD0z2epv9L-YFcUai5gY,9351
+python_dali-0.16.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+python_dali-0.16.dist-info/licenses/COPYING.LESSER,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+python_dali-0.16.dist-info/licenses/LICENSE,sha256=HVcO3iFdIg-1DaBsl4fgk3swO0aZDktmHBZPIhhn_5o,168
+python_dali-0.16.dist-info/METADATA,sha256=cBWW6vSNaCpu-RrUmZp-tw3y0kr3AMgKeO72tnxwhU4,6198
+python_dali-0.16.dist-info/WHEEL,sha256=a-udL2m4V_6Yn8b-uKzWb12RjRxwwMo6ohYFM24tpaY,91
+python_dali-0.16.dist-info/top_level.txt,sha256=VlSHNdAIGn5irB2PYMRKK0POsLocy-YusWmK3GwHViI,5
+python_dali-0.16.dist-info/RECORD,,

{python_dali-0.14.dist-info → python_dali-0.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (84.0.0)
+Generator: setuptools (84.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any