python-selve-new 2.5.2__tar.gz → 2.5.4__tar.gz

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.2
+Version: 2.5.4
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/pyproject.toml

@@ -59,4 +59,7 @@ markers = [
     "unit: marks tests as unit tests",
 ]
 asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "function"
+asyncio_default_fixture_loop_scope = "function"
+filterwarnings = [
+    "ignore:coroutine 'Selve._movement_poll_loop' was never awaited:RuntimeWarning",
+]

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/python_selve_new.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.2
+Version: 2.5.4
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/selve/__init__.py

@@ -12,6 +12,7 @@ except ImportError:
         __version__ = "unknown"
 
 import asyncio
+import logging
 import time
 from collections import deque
 from itertools import chain
@@ -50,7 +51,7 @@ from selve.sensor import SelveSensor
 from selve.util import *
 from selve.util import Command
 from selve.util.errors import *
-from selve.util.protocol import ParameterType
+from selve.util.protocol import ParameterType, SelveTypes, MovementState
 from selve.util.serial_transport import SerialTransport
 
 
@@ -105,11 +106,14 @@ class Selve:
         self._pending_futures = deque()
         self._event_queue = None
 
+        # Active movement polling tasks keyed by device id
+        self._movement_tasks: dict = {}
+
         #Options
         self.reversedStopPosition = 0
 
         #Logger
-        self._LOGGER = logger
+        self._LOGGER: logging.Logger = logger or logging.getLogger(__name__)
 
 
     # Legacy worker was removed in favor of dedicated TX/RX tasks.
@@ -211,16 +215,19 @@ class Selve:
         await asyncio.sleep(5)
         self._LOGGER.debug("(Selve Worker): " + "Recovering")
 
+        # Tear down the broken transport, then rebuild it directly without calling
+        # _probe_port / stopWorker, which would kill the running TX/dispatch tasks.
         await self._teardown_transport()
 
         if self._port is not None:
             try:
-                if await self._probe_port(self._port, fromConfigFlow=False):
-                    if self.rxQ is not None and self._transport is not None:
-                        await self._transport.start_reader(self.rxQ)
-                    return
+                await self._build_transport(self._port)
+                if self.rxQ is not None and self._transport is not None:
+                    await self._transport.start_reader(self.rxQ)
+                self._LOGGER.info("(Selve Worker): Recovery successful on " + str(self._port))
+                return
             except (OSError, IOError) as e:
-                self._LOGGER.debug("(Selve Worker): " + "Configured port not valid, maybe it has changed, trying other ports...")
+                self._LOGGER.debug("(Selve Worker): " + "Configured port not valid, maybe it has changed, trying other ports... " + str(e))
             except Exception as e:
                 self._LOGGER.error("(Selve Worker): " + "Unknown exception: " + str(e))
 
@@ -235,10 +242,12 @@ class Selve:
 
         for p in available_ports:
             try:
-                if await self._probe_port(p.device, fromConfigFlow=False):
-                    if self.rxQ is not None and self._transport is not None:
-                        await self._transport.start_reader(self.rxQ)
-                    return
+                await self._build_transport(p.device)
+                self._port = p.device
+                if self.rxQ is not None and self._transport is not None:
+                    await self._transport.start_reader(self.rxQ)
+                self._LOGGER.info("(Selve Worker): Recovery successful on " + str(p.device))
+                return
             except Exception as e:
                 self._LOGGER.error("(Selve Worker): " + "Error at com port: " + str(e))
         else:
@@ -1004,6 +1013,8 @@ class Selve:
             device.device_type = response.deviceType
 
             self.addOrUpdateDevice(device, SelveTypes.DEVICE)
+            if device.state == MovementState.STOPPED_OFF:
+                self._stop_movement_polling(device.id)
 
         if isinstance(response, SensorEventResponse):
             if self.is_id_registered(response.id, SelveTypes.SENSOR):
@@ -1057,20 +1068,39 @@ class Selve:
             callback(response)
 
 
-    def _handleCommandResult(self, response: IveoResultResponse | CommandResultResponse):
-
-        # if isinstance(response, IveoResultResponse):
-        #     for id in response.executedIds:
-        #         dev = self.getDevice(id, SelveTypes.IVEO)
-
-        #         if response.command is DriveCommandIveo.DOWN:
-        #             dev.state = MovementState.DOWN_ON
-        #         if response.command is DriveCommandIveo.UP:
-        #             dev.state = MovementState.UP_ON
-        #         if response.command is DriveCommandIveo.STOP:
-        #             dev.state = MovementState.STOPPED_OFF
-
-        #         self.addOrUpdateDevice(dev, SelveTypes.IVEO)
+    def _handleCommandResult(self, response):
+        if isinstance(response, IveoResultResponse):
+            for id in response.executedIds:
+                dev = self.getDevice(id, SelveTypes.IVEO)
+                if dev is None:
+                    continue
+                if response.command is DriveCommandIveo.DOWN:
+                    dev.state = MovementState.DOWN_ON
+                elif response.command is DriveCommandIveo.UP:
+                    dev.state = MovementState.UP_ON
+                elif response.command is DriveCommandIveo.STOP:
+                    dev.state = MovementState.STOPPED_OFF
+                self.addOrUpdateDevice(dev, SelveTypes.IVEO)
+
+        elif isinstance(response, CommandResultResponse):
+            for id in response.successIds:
+                dev = self.getDevice(id, SelveTypes.DEVICE)
+                if dev is None:
+                    continue
+                dev.unreachable = False
+                if response.command is DriveCommandCommeo.DRIVEDOWN:
+                    dev.state = MovementState.DOWN_ON
+                elif response.command is DriveCommandCommeo.DRIVEUP:
+                    dev.state = MovementState.UP_ON
+                elif response.command is DriveCommandCommeo.STOP:
+                    dev.state = MovementState.STOPPED_OFF
+                self.addOrUpdateDevice(dev, SelveTypes.DEVICE)
+            for id in response.failedIds:
+                dev = self.getDevice(id, SelveTypes.DEVICE)
+                if dev is None:
+                    continue
+                dev.unreachable = True
+                self.addOrUpdateDevice(dev, SelveTypes.DEVICE)
 
         for callback in self._callbacks:
             callback()
@@ -1350,7 +1380,7 @@ class Selve:
         else:
             dev.targetValue = 100 - response.targetValue if response.targetValue else 0
 
-        dev.unreachable = response.unreachable if response.unreachable else True
+        dev.unreachable = response.unreachable
         dev.overload = response.overload if response.overload else False
         dev.obstructed = response.obstructed if response.obstructed else False
         dev.alarm = response.alarm if response.alarm else False
@@ -1362,6 +1392,8 @@ class Selve:
         dev.freezingAlarm = response.freezingAlarm if response.freezingAlarm else False
         dev.dayMode = response.dayMode if response.dayMode else False
         self.addOrUpdateDevice(dev, SelveTypes.DEVICE)
+        if dev is not None and dev.state == MovementState.STOPPED_OFF:
+            self._stop_movement_polling(id)
 
     def setDeviceValue(self, id: int, value: int, type: SelveTypes):
         dev = self.getDevice(id, type)
@@ -1385,12 +1417,41 @@ class Selve:
         dev.state = state
         self.addOrUpdateDevice(dev, type)
 
+    def _start_movement_polling(self, device_id: int) -> None:
+        """Start a background task that polls device values every 0.5 s during movement."""
+        self._stop_movement_polling(device_id)
+        try:
+            asyncio.get_running_loop()
+        except RuntimeError:
+            return  # no running event loop (unit tests, etc.)
+        task = asyncio.create_task(self._movement_poll_loop(device_id))
+        self._movement_tasks[device_id] = task
+
+    def _stop_movement_polling(self, device_id: int) -> None:
+        """Cancel movement polling task for a device if one is active."""
+        task = self._movement_tasks.pop(device_id, None)
+        if task and not task.done():
+            task.cancel()
+
+    async def _movement_poll_loop(self, device_id: int, interval: float = 0.5, timeout: float = 60.0) -> None:
+        """Poll DeviceGetValues every *interval* seconds until movement stops or timeout."""
+        elapsed = 0.0
+        while not self._stopThread.is_set() and elapsed < timeout:
+            await asyncio.sleep(interval)
+            elapsed += interval
+            dev = self.getDevice(device_id, SelveTypes.DEVICE)
+            if dev is None or dev.state == MovementState.STOPPED_OFF:
+                break
+            await self.updateCommeoDeviceValuesAsync(device_id)
+        self._movement_tasks.pop(device_id, None)
+
     async def moveDeviceUp(self, device: SelveDevice | IveoDevice, type=DeviceCommandType.MANUAL):
         if device.communicationType is CommunicationType.COMMEO:
             await self.executeCommand(CommandDriveUp(device.id, type))
             device.state = MovementState.UP_ON
             self.addOrUpdateDevice(device, SelveTypes.DEVICE)
             await self.updateCommeoDeviceValuesAsync(device.id)
+            self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.UP_ON, SelveTypes.IVEO)
             await self.executeCommand(IveoManual(device.id, DriveCommandIveo.UP))
@@ -1404,6 +1465,7 @@ class Selve:
             device.state = MovementState.DOWN_ON
             self.addOrUpdateDevice(device, SelveTypes.DEVICE)
             await self.updateCommeoDeviceValuesAsync(device.id)
+            self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.DOWN_ON, SelveTypes.IVEO)
             await self.executeCommand(IveoManual(device.id, DriveCommandIveo.DOWN))
@@ -1415,6 +1477,7 @@ class Selve:
         if device.communicationType is CommunicationType.COMMEO:
             await self.executeCommand(CommandDrivePos1(device.id, type))
             await self.updateCommeoDeviceValuesAsync(device.id)
+            self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.UP_ON, SelveTypes.IVEO)
             await self.executeCommand(IveoManual(device.id, DriveCommandIveo.POS1))
@@ -1426,6 +1489,7 @@ class Selve:
         if device.communicationType is CommunicationType.COMMEO:
             await self.executeCommand(CommandDrivePos2(device.id, type))
             await self.updateCommeoDeviceValuesAsync(device.id)
+            self._start_movement_polling(device.id)
         else:
             self.setDeviceState(device.id, MovementState.DOWN_ON, SelveTypes.IVEO)
             await self.executeCommand(IveoManual(device.id, DriveCommandIveo.POS2))
@@ -1436,17 +1500,21 @@ class Selve:
     async def moveDevicePos(self, device: SelveDevice, pos: int = 0, type=DeviceCommandType.MANUAL):
         await self.executeCommand(CommandDrivePos(device.id, type, param=Util.percentageToValue(pos)))
         await self.updateCommeoDeviceValuesAsync(device.id)
+        self._start_movement_polling(device.id)
 
     async def moveDeviceStepUp(self, device: SelveDevice, degrees: int = 0, type=DeviceCommandType.MANUAL):
         await self.executeCommand(CommandDriveStepUp(device.id, type, param=Util.degreesToValue(degrees)))
         await self.updateCommeoDeviceValuesAsync(device.id)
+        self._start_movement_polling(device.id)
 
     async def moveDeviceStepDown(self, device: SelveDevice, degrees: int = 0, type=DeviceCommandType.MANUAL):
         await self.executeCommand(CommandDriveStepDown(device.id, type, param=Util.degreesToValue(degrees)))
         await self.updateCommeoDeviceValuesAsync(device.id)
+        self._start_movement_polling(device.id)
 
     async def stopDevice(self, device: SelveDevice | IveoDevice, type=DeviceCommandType.MANUAL):
         if device.communicationType is CommunicationType.COMMEO:
+            self._stop_movement_polling(device.id)
             await self.executeCommand(CommandStop(device.id, type))
             await self.updateCommeoDeviceValuesAsync(device.id)
         else:

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/selve/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.5.2'
-__version_tuple__ = version_tuple = (2, 5, 2)
+__version__ = version = '2.5.4'
+__version_tuple__ = version_tuple = (2, 5, 4)
 
-__commit_id__ = commit_id = 'g24c865c13'
+__commit_id__ = commit_id = 'g5d6793713'

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/tests/integration/test_selve_gateway_integration.py

@@ -90,6 +90,6 @@ class TestSelveGatewayIntegration:
                     await mock_selve_instance.recover()
                     
                     # Verify logger was called (indicating recover ran)
-                    mock_logger.info.assert_called_with("(Selve Worker): Recover serial connection")
+                    mock_logger.info.assert_any_call("(Selve Worker): Recover serial connection")
                     mock_logger.debug.assert_any_call("(Selve Worker): Waiting 5 seconds before trying...")
                     mock_logger.debug.assert_any_call("(Selve Worker): Recovering")

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/tests/unit/test_selve_edge_cases.py

@@ -18,8 +18,9 @@ class TestSelveEdgeCases:
     def test_init_with_none_logger(self):
         """Test initialization with None logger."""
         selve = Selve(logger=None)
-        # None logger should result in None _LOGGER (implementation allows this)
-        assert selve._LOGGER is None
+        # None logger falls back to a module-level logger, never stays None
+        import logging
+        assert isinstance(selve._LOGGER, logging.Logger)
         
     def test_init_with_invalid_port(self):
         """Test initialization with invalid port."""

{python_selve_new-2.5.2 → python_selve_new-2.5.4}/tests/unit/test_selve_init_comprehensive.py

@@ -60,7 +60,8 @@ class TestSelveInit:
         selve = Selve()
         
         assert selve._port is None
-        assert selve._LOGGER is None
+        import logging
+        assert isinstance(selve._LOGGER, logging.Logger)
         assert selve.loop is None
         assert isinstance(selve._callbacks, set)
         assert isinstance(selve._eventCallbacks, set)