PyPlumIO 0.6.4__tar.gz → 0.6.6__tar.gz

{pyplumio-0.6.4 → pyplumio-0.6.6}/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v4

{pyplumio-0.6.4 → pyplumio-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.4
+Version: 0.6.6
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
@@ -25,14 +26,14 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.11.0; extra == "test"
+Requires-Dist: coverage==7.11.3; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
 Requires-Dist: mypy==1.18.2; 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==8.4.2; extra == "test"
 Requires-Dist: pytest-asyncio==1.2.0; extra == "test"
-Requires-Dist: ruff==0.14.3; extra == "test"
+Requires-Dist: ruff==0.14.4; extra == "test"
 Requires-Dist: tox==4.32.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20251001; extra == "test"
 Provides-Extra: docs
@@ -41,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.3.0; extra == "dev"
+Requires-Dist: pre-commit==4.4.0; extra == "dev"
 Requires-Dist: tomli==2.3.0; extra == "dev"
 Dynamic: license-file
 

{pyplumio-0.6.4 → pyplumio-0.6.6}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.6.4
+Version: 0.6.6
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
@@ -25,14 +26,14 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.4.1; extra == "test"
-Requires-Dist: coverage==7.11.0; extra == "test"
+Requires-Dist: coverage==7.11.3; extra == "test"
 Requires-Dist: freezegun==1.5.5; extra == "test"
 Requires-Dist: mypy==1.18.2; 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==8.4.2; extra == "test"
 Requires-Dist: pytest-asyncio==1.2.0; extra == "test"
-Requires-Dist: ruff==0.14.3; extra == "test"
+Requires-Dist: ruff==0.14.4; extra == "test"
 Requires-Dist: tox==4.32.0; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20251001; extra == "test"
 Provides-Extra: docs
@@ -41,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.3.0; extra == "dev"
+Requires-Dist: pre-commit==4.4.0; extra == "dev"
 Requires-Dist: tomli==2.3.0; extra == "dev"
 Dynamic: license-file
 

{pyplumio-0.6.4 → pyplumio-0.6.6}/PyPlumIO.egg-info/requires.txt

@@ -2,7 +2,7 @@ pyserial-asyncio==0.6
 
 [dev]
 pyplumio[docs,test]
-pre-commit==4.3.0
+pre-commit==4.4.0
 tomli==2.3.0
 
 [docs]
@@ -12,13 +12,13 @@ readthedocs-sphinx-search==0.3.2
 
 [test]
 codespell==2.4.1
-coverage==7.11.0
+coverage==7.11.3
 freezegun==1.5.5
 mypy==1.18.2
 numpy<3.0.0,>=2.0.0
 pyserial-asyncio-fast==0.16
 pytest==8.4.2
 pytest-asyncio==1.2.0
-ruff==0.14.3
+ruff==0.14.4
 tox==4.32.0
 types-pyserial==3.5.0.20251001

{pyplumio-0.6.4 → pyplumio-0.6.6}/pyplumio/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.6.4'
-__version_tuple__ = version_tuple = (0, 6, 4)
+__version__ = version = '0.6.6'
+__version_tuple__ = version_tuple = (0, 6, 6)
 
-__commit_id__ = commit_id = 'gc17c7ed5e'
+__commit_id__ = commit_id = 'g40bf0ee75'

{pyplumio-0.6.4 → pyplumio-0.6.6}/pyplumio/devices/__init__.py

@@ -131,7 +131,7 @@ class PhysicalDevice(Device, ABC):
     """Represents a physical device.
 
     Physical device have network address and can have multiple
-    virtual devices associated with them via parent property.
+    logical devices associated with them via parent property.
     """
 
     __slots__ = ("address", "_network_info", "_frame_versions")
@@ -222,8 +222,8 @@ class PhysicalDevice(Device, ABC):
         return await create_instance(get_device_handler(device_type), cls=cls, **kwargs)
 
 
-class VirtualDevice(Device, ABC):
-    """Represents a virtual device associated with physical device."""
+class LogicalDevice(Device, ABC):
+    """Represents a logical device associated with physical device."""
 
     __slots__ = ("parent", "index")
 
@@ -258,7 +258,7 @@ def device_handler(
 __all__ = [
     "Device",
     "PhysicalDevice",
-    "VirtualDevice",
+    "LogicalDevice",
     "device_hander",
     "get_device_handler",
     "is_known_device_type",

{pyplumio-0.6.4 → pyplumio-0.6.6}/pyplumio/devices/mixer.py

@@ -7,7 +7,7 @@ from collections.abc import Coroutine, Generator
 import logging
 from typing import Any
 
-from pyplumio.devices import VirtualDevice
+from pyplumio.devices import LogicalDevice
 from pyplumio.helpers.event_manager import event_listener
 from pyplumio.parameters import ParameterValues
 from pyplumio.parameters.mixer import (
@@ -21,7 +21,7 @@ from pyplumio.structures.product_info import ATTR_PRODUCT, ProductInfo
 _LOGGER = logging.getLogger(__name__)
 
 
-class Mixer(VirtualDevice):
+class Mixer(LogicalDevice):
     """Represents a mixer."""
 
     __slots__ = ()

{pyplumio-0.6.4 → pyplumio-0.6.6}/pyplumio/devices/thermostat.py

@@ -7,7 +7,7 @@ from collections.abc import Coroutine, Generator
 import logging
 from typing import Any
 
-from pyplumio.devices import VirtualDevice
+from pyplumio.devices import LogicalDevice
 from pyplumio.helpers.event_manager import event_listener
 from pyplumio.parameters import ParameterValues
 from pyplumio.parameters.thermostat import (
@@ -20,7 +20,7 @@ from pyplumio.parameters.thermostat import (
 _LOGGER = logging.getLogger()
 
 
-class Thermostat(VirtualDevice):
+class Thermostat(LogicalDevice):
     """Represents a thermostat."""
 
     __slots__ = ()

{pyplumio-0.6.4 → pyplumio-0.6.6}/pyplumio/protocol.py

@@ -231,16 +231,21 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
             self.frame_handler(reader=self.reader, writer=self.writer),
             name="frame_handler_task",
         )
-        for device in self.data.values():
-            device.dispatch_nowait(ATTR_CONNECTED, True)
+        self._mark_connected()
+        self.statistics.reset_transfer_statistics()
 
+    def _mark_connected(self) -> None:
+        """Mark connection as connected."""
         self.connected.set()
-        self.statistics.reset_transfer_statistics()
+        self.network_info.server_status = True
         self.statistics.connected_since = datetime.now()
+        for device in self.data.values():
+            device.dispatch_nowait(ATTR_CONNECTED, True)
 
-    async def _mark_disconnected(self) -> None:
-        """Mark as protocol as disconnected."""
+    def _mark_disconnected(self) -> None:
+        """Mark connection as disconnected."""
         self.connected.clear()
+        self.network_info.server_status = False
         for device in self.data.values():
             device.dispatch_nowait(ATTR_CONNECTED, False)
 
@@ -254,20 +259,19 @@ class AsyncProtocol(Protocol, EventManager[PhysicalDevice]):
     async def connection_lost(self) -> None:
         """Close the connection and call connection lost callbacks."""
         if self.connected.is_set():
-            await self._mark_disconnected()
-            await asyncio.gather(*(callback() for callback in self.on_connection_lost))
+            self._mark_disconnected()
             await self._close_writer()
+            await asyncio.gather(*(callback() for callback in self.on_connection_lost))
 
     async def shutdown(self) -> None:
         """Shutdown the protocol and close the connection."""
-        if self.connected.is_set():
-            await self._mark_disconnected()
-            await asyncio.gather(*(device.shutdown() for device in self.data.values()))
-            await self._close_writer()
-
-        self._clear_write_queue()
         self.cancel_tasks()
+        self._clear_write_queue()
         await self.wait_until_done()
+        if self.connected.is_set():
+            self._mark_disconnected()
+            await self._close_writer()
+            await asyncio.gather(*(device.shutdown() for device in self.data.values()))
 
     async def frame_handler(self, reader: FrameReader, writer: FrameWriter) -> None:
         """Handle frame reads and writes."""

{pyplumio-0.6.4 → pyplumio-0.6.6}/pyproject.toml

@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
     "Topic :: Home Automation",
 ]
@@ -35,14 +36,14 @@ dynamic = ["version"]
 [project.optional-dependencies]
 test = [
     "codespell==2.4.1",
-    "coverage==7.11.0",
+    "coverage==7.11.3",
     "freezegun==1.5.5",
     "mypy==1.18.2",
     "numpy<3.0.0,>=2.0.0",
     "pyserial-asyncio-fast==0.16",
     "pytest==8.4.2",
     "pytest-asyncio==1.2.0",
-    "ruff==0.14.3",
+    "ruff==0.14.4",
     "tox==4.32.0",
     "types-pyserial==3.5.0.20251001"
 ]
@@ -53,7 +54,7 @@ docs = [
 ]
 dev = [
     "pyplumio[test,docs]",
-    "pre-commit==4.3.0",
+    "pre-commit==4.4.0",
     "tomli==2.3.0"
 ]
 
@@ -241,7 +242,7 @@ asyncio_default_fixture_loop_scope = "function"
 [tool.tox]
 legacy_tox_ini = """
     [tox]
-    envlist = lint, type, py{310,311,312,313}
+    envlist = lint, type, py{310,311,312,313,314}
     isolated_build = True
     skip_missing_interpreters = True
     ignore_basepython_conflict = True
@@ -252,6 +253,7 @@ legacy_tox_ini = """
         3.11: py311
         3.12: py312
         3.13: py313, lint, type
+        3.14: py314
 
     [testenv]
     deps =

{pyplumio-0.6.4 → pyplumio-0.6.6}/requirements_test.txt

@@ -1,13 +1,13 @@
 codespell==2.4.1
-coverage==7.11.0
+coverage==7.11.3
 freezegun==1.5.5
 mypy==1.18.2
 numpy<3.0.0,>=2.0.0
-pre-commit==4.3.0
+pre-commit==4.4.0
 pyserial-asyncio-fast==0.16
 pytest-asyncio==1.2.0
 pytest==8.4.2
-ruff==0.14.3
+ruff==0.14.4
 tomli==2.3.0
 tox==4.32.0
 types-pyserial==3.5.0.20251001

{pyplumio-0.6.4 → pyplumio-0.6.6}/tests/devices/test_mixer.py

@@ -1,4 +1,4 @@
-"""Contains tests for the mixer virtual device."""
+"""Contains tests for the mixer logical device."""
 
 import asyncio
 import logging

{pyplumio-0.6.4 → pyplumio-0.6.6}/tests/devices/test_thermostat.py

@@ -1,4 +1,4 @@
-"""Contains tests for the thermostat virtual device."""
+"""Contains tests for the thermostat logical device."""
 
 import asyncio
 from typing import Final

{pyplumio-0.6.4 → pyplumio-0.6.6}/tests/test_protocol.py

@@ -103,6 +103,7 @@ class TestAsyncProtocol:
         assert protocol.statistics.connected_since == NEVER
         protocol.connection_established(reader=mock_reader, writer=mock_writer)
         assert protocol.connected.is_set()
+        assert protocol.network_info.server_status is True
 
         # Test frame handler task was created.
         mock_frame_handler.assert_called_once_with(