PyPlumIO 0.6.7__tar.gz → 0.6.8__tar.gz

{pyplumio-0.6.7 → pyplumio-0.6.8}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.4
+    rev: v0.14.10
     hooks:
       - id: ruff
         args:
@@ -13,6 +13,6 @@ repos:
     hooks:
       - id: codespell
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2
+    rev: v1.19.1
     hooks:
       - id: mypy

{pyplumio-0.6.7 → pyplumio-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.7
+Version: 0.6.8
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -23,17 +23,17 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyserial-asyncio==0.6
+Requires-Dist: pyserial-asyncio-fast==0.16
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.12.0; extra == "test"
+Requires-Dist: coverage==7.13.0; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
-Requires-Dist: mypy==1.19.0; extra == "test"
+Requires-Dist: mypy==1.19.1; extra == "test"
 Requires-Dist: numpy<3.0.0,>=2.0.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.16; extra == "test"
-Requires-Dist: pytest==9.0.1; extra == "test"
+Requires-Dist: pytest==9.0.2; extra == "test"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "test"
-Requires-Dist: ruff==0.14.7; extra == "test"
+Requires-Dist: ruff==0.14.10; extra == "test"
 Requires-Dist: tox==4.32.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20251001; extra == "test"
 Provides-Extra: docs
@@ -42,7 +42,7 @@ Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
 Requires-Dist: readthedocs-sphinx-search==0.3.2; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: pyplumio[docs,test]; extra == "dev"
-Requires-Dist: pre-commit==4.5.0; extra == "dev"
+Requires-Dist: pre-commit==4.5.1; extra == "dev"
 Requires-Dist: tomli==2.3.0; extra == "dev"
 Dynamic: license-file
 

{pyplumio-0.6.7 → pyplumio-0.6.8}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.7
+Version: 0.6.8
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -23,17 +23,17 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyserial-asyncio==0.6
+Requires-Dist: pyserial-asyncio-fast==0.16
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.12.0; extra == "test"
+Requires-Dist: coverage==7.13.0; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
-Requires-Dist: mypy==1.19.0; extra == "test"
+Requires-Dist: mypy==1.19.1; extra == "test"
 Requires-Dist: numpy<3.0.0,>=2.0.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.16; extra == "test"
-Requires-Dist: pytest==9.0.1; extra == "test"
+Requires-Dist: pytest==9.0.2; extra == "test"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "test"
-Requires-Dist: ruff==0.14.7; extra == "test"
+Requires-Dist: ruff==0.14.10; extra == "test"
 Requires-Dist: tox==4.32.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20251001; extra == "test"
 Provides-Extra: docs
@@ -42,7 +42,7 @@ Requires-Dist: sphinx_rtd_theme==3.0.2; extra == "docs"
 Requires-Dist: readthedocs-sphinx-search==0.3.2; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: pyplumio[docs,test]; extra == "dev"
-Requires-Dist: pre-commit==4.5.0; extra == "dev"
+Requires-Dist: pre-commit==4.5.1; extra == "dev"
 Requires-Dist: tomli==2.3.0; extra == "dev"
 Dynamic: license-file
 

{pyplumio-0.6.7 → pyplumio-0.6.8}/PyPlumIO.egg-info/requires.txt

@@ -1,8 +1,8 @@
-pyserial-asyncio==0.6
+pyserial-asyncio-fast==0.16
 
 [dev]
 pyplumio[docs,test]
-pre-commit==4.5.0
+pre-commit==4.5.1
 tomli==2.3.0
 
 [docs]
@@ -12,13 +12,13 @@ readthedocs-sphinx-search==0.3.2
 
 [test]
 codespell==2.4.1
-coverage==7.12.0
+coverage==7.13.0
 freezegun==1.5.5
-mypy==1.19.0
+mypy==1.19.1
 numpy<3.0.0,>=2.0.0
 pyserial-asyncio-fast==0.16
-pytest==9.0.1
+pytest==9.0.2
 pytest-asyncio==1.3.0
-ruff==0.14.7
+ruff==0.14.10
 tox==4.32.0
 types-pyserial==3.5.0.20251001

{pyplumio-0.6.7 → pyplumio-0.6.8}/pyplumio/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.6.7'
-__version_tuple__ = version_tuple = (0, 6, 7)
+__version__ = version = '0.6.8'
+__version_tuple__ = version_tuple = (0, 6, 8)
 
-__commit_id__ = commit_id = 'g6d0ba3b08'
+__commit_id__ = commit_id = 'gbde57b4a1'

{pyplumio-0.6.7 → pyplumio-0.6.8}/pyplumio/connection.py

@@ -11,6 +11,7 @@ from types import MappingProxyType
 from typing import Any, Final
 
 from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE
+import serial_asyncio_fast
 
 from pyplumio.devices import PhysicalDevice
 from pyplumio.exceptions import ConnectionFailedError
@@ -23,13 +24,6 @@ _LOGGER = logging.getLogger(__name__)
 TRY_CONNECT_FOR_SECONDS: Final = 5
 RECONNECT_AFTER_SECONDS: Final = 20
 
-try:
-    import serial_asyncio_fast as pyserial_asyncio
-
-    _LOGGER.info("Using pyserial-asyncio-fast in place of pyserial-asyncio")
-except ImportError:
-    import serial_asyncio as pyserial_asyncio  # type: ignore[no-redef]
-
 
 class Connection(ABC, TaskManager):
     """Represents a connection.
@@ -37,11 +31,12 @@ class Connection(ABC, TaskManager):
     All specific connection classes MUST be inherited from this class.
     """
 
-    __slots__ = ("_protocol", "_reconnect_on_failure", "_options")
+    __slots__ = ("_protocol", "_reconnect_on_failure", "_options", "_retries")
 
     _protocol: Protocol
     _reconnect_on_failure: bool
     _options: dict[str, Any]
+    _retries: int
 
     def __init__(
         self,
@@ -60,6 +55,7 @@ class Connection(ABC, TaskManager):
         self._reconnect_on_failure = reconnect_on_failure
         self._protocol = protocol
         self._options = options
+        self._retries = 0
 
     async def __aenter__(self) -> Connection:
         """Provide an entry point for the context manager."""
@@ -86,11 +82,21 @@ class Connection(ABC, TaskManager):
         """Try to connect and reconnect on failure."""
         try:
             await self._connect()
+            if self._retries > 0:
+                _LOGGER.info(
+                    "Connection to device restored after %i retries", self._retries
+                )
+                self._retries = 0
         except ConnectionFailedError:
-            _LOGGER.error(
-                "Can't connect to the device, retrying in %.1f seconds",
-                RECONNECT_AFTER_SECONDS,
-            )
+            if self._retries == 0:
+                _LOGGER.error(
+                    (
+                        "Unable to connect to the device. Connection we be retried "
+                        "automatically every %i seconds in background."
+                    ),
+                    RECONNECT_AFTER_SECONDS,
+                )
+            self._retries += 1
             await asyncio.sleep(RECONNECT_AFTER_SECONDS)
             self.create_task(self._reconnect(), name="reconnect_task")
 
@@ -209,7 +215,7 @@ class SerialConnection(Connection):
         self,
     ) -> tuple[asyncio.StreamReader, asyncio.StreamWriter]:
         """Open the connection and return reader and writer objects."""
-        return await pyserial_asyncio.open_serial_connection(
+        return await serial_asyncio_fast.open_serial_connection(
             url=self.url,
             baudrate=self.baudrate,
             bytesize=EIGHTBITS,

{pyplumio-0.6.7 → pyplumio-0.6.8}/pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
     "Topic :: Home Automation",
 ]
 dependencies = [
-    "pyserial-asyncio==0.6"
+    "pyserial-asyncio-fast==0.16"
 ]
 dynamic = ["version"]
 
@@ -36,14 +36,14 @@ dynamic = ["version"]
 [project.optional-dependencies]
 test = [
     "codespell==2.4.1",
-    "coverage==7.12.0",
+    "coverage==7.13.0",
     "freezegun==1.5.5",
-    "mypy==1.19.0",
+    "mypy==1.19.1",
     "numpy<3.0.0,>=2.0.0",
     "pyserial-asyncio-fast==0.16",
-    "pytest==9.0.1",
+    "pytest==9.0.2",
     "pytest-asyncio==1.3.0",
-    "ruff==0.14.7",
+    "ruff==0.14.10",
     "tox==4.32.0",
     "types-pyserial==3.5.0.20251001"
 ]
@@ -54,7 +54,7 @@ docs = [
 ]
 dev = [
     "pyplumio[test,docs]",
-    "pre-commit==4.5.0",
+    "pre-commit==4.5.1",
     "tomli==2.3.0"
 ]
 

pyplumio-0.6.8/requirements.txt

@@ -0,0 +1 @@
+pyserial-asyncio-fast==0.16

{pyplumio-0.6.7 → pyplumio-0.6.8}/requirements_test.txt

@@ -1,13 +1,13 @@
 codespell==2.4.1
-coverage==7.12.0
+coverage==7.13.0
 freezegun==1.5.5
-mypy==1.19.0
+mypy==1.19.1
 numpy<3.0.0,>=2.0.0
-pre-commit==4.5.0
+pre-commit==4.5.1
 pyserial-asyncio-fast==0.16
+pytest==9.0.2
 pytest-asyncio==1.3.0
-pytest==9.0.1
-ruff==0.14.7
+ruff==0.14.10
 tomli==2.3.0
 tox==4.32.0
 types-pyserial==3.5.0.20251001

{pyplumio-0.6.7 → pyplumio-0.6.8}/tests/test_connection.py

@@ -3,40 +3,24 @@
 from __future__ import annotations
 
 from asyncio import StreamReader, StreamWriter
-from importlib import reload
 import logging
-import sys
-from typing import Any, Final
+from typing import Final
 from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
 from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE
 
-import pyplumio.connection
-from pyplumio.connection import Connection, SerialConnection, TcpConnection
+from pyplumio.connection import (
+    RECONNECT_AFTER_SECONDS,
+    Connection,
+    SerialConnection,
+    TcpConnection,
+)
 from pyplumio.devices.ecomax import EcoMAX
 from pyplumio.exceptions import ConnectionFailedError
 from pyplumio.protocol import AsyncProtocol, DummyProtocol, Protocol
 
 
-@pytest.fixture(name="use_fast", params=(True, False))
-def fixture_use_fast(request, monkeypatch, caplog) -> Any:
-    """Try with and without serial-asyncio-fast package."""
-    if not request.param:
-        monkeypatch.setitem(sys.modules, "serial_asyncio_fast", None)
-
-    with caplog.at_level(logging.INFO):
-        reload(pyplumio.connection)
-
-    message = "Using pyserial-asyncio-fast in place of pyserial-asyncio"
-    if request.param:
-        assert message in caplog.text
-    else:
-        assert message not in caplog.text
-
-    return request.param
-
-
 @pytest.fixture(name="stream_writer")
 def fixture_stream_writer():
     """Return a mock of asyncio stream writer."""
@@ -64,12 +48,11 @@ def fixture_asyncio_open_connection(
 
 @pytest.fixture(name="serial_asyncio_open_serial_connection")
 def fixture_serial_asyncio_open_serial_connection(
-    use_fast, stream_reader: StreamReader, stream_writer: StreamWriter
+    stream_reader: StreamReader, stream_writer: StreamWriter
 ):
     """Bypass opening serial_asyncio connection."""
-    module = "serial_asyncio_fast" if use_fast else "serial_asyncio"
     with patch(
-        f"{module}.open_serial_connection",
+        "serial_asyncio_fast.open_serial_connection",
         return_value=(stream_reader, stream_writer),
     ) as mock_connection:
         yield mock_connection
@@ -115,33 +98,43 @@ class TestConnection:
         await connection.close()
         mock_protocol.shutdown.assert_called_once()
 
-    @pytest.mark.parametrize(
-        ("reconnect_on_failure", "expected_log"),
-        [
-            (True, "Can't connect to the device"),
-            (False, None),
-        ],
+    @pytest.mark.parametrize("reconnect_on_failure", [True, False])
+    @patch.object(
+        DummyConnection,
+        "_open_connection",
+        side_effect=(OSError, (AsyncMock(), AsyncMock), None),
     )
-    @patch.object(DummyConnection, "_open_connection", side_effect=(OSError, None))
+    @patch("pyplumio.protocol.AsyncProtocol.connection_established")
     async def test_reconnect(
         self,
+        mock_connection_established,
         mock_open_connection,
         caplog,
         reconnect_on_failure: bool,
-        expected_log: str | None,
     ) -> None:
         """Test reconnect logic."""
         connection = DummyConnection(reconnect_on_failure=reconnect_on_failure)
         if reconnect_on_failure:
             with caplog.at_level(logging.ERROR):
                 await connection.connect()
+                assert "Unable to connect to the device." in caplog.text
+                assert (
+                    f"automatically every {RECONNECT_AFTER_SECONDS} seconds"
+                    in caplog.text
+                )
+
+            with caplog.at_level(logging.INFO):
+                await connection.connect()
+                assert "Connection to device restored after 1 retries" in caplog.text
+                mock_connection_established.assert_called_once()
+
+            assert mock_open_connection.await_count == 2
 
-            assert expected_log in caplog.text
         else:
             with pytest.raises(ConnectionFailedError):
                 await connection.connect()
 
-        mock_open_connection.assert_awaited_once()
+            mock_open_connection.assert_awaited_once()
 
     @patch.object(DummyConnection, "close")
     @patch.object(DummyConnection, "connect")

pyplumio-0.6.7/requirements.txt

@@ -1 +0,0 @@
-pyserial-asyncio==0.6