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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.5.2
+Version: 2.5.3
 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.3}/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.3
 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.3}/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
@@ -109,7 +110,7 @@ class Selve:
         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 +212,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 +239,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:
@@ -1057,20 +1063,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 +1375,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

{python_selve_new-2.5.2 → python_selve_new-2.5.3}/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.3'
+__version_tuple__ = version_tuple = (2, 5, 3)
 
-__commit_id__ = commit_id = 'g24c865c13'
+__commit_id__ = commit_id = 'ge708968d7'

{python_selve_new-2.5.2 → python_selve_new-2.5.3}/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.3}/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.3}/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)