PyPlumIO 0.5.20__tar.gz → 0.5.21__tar.gz

{pyplumio-0.5.20 → pyplumio-0.5.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.20
+Version: 0.5.21
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -27,11 +27,11 @@ Provides-Extra: test
 Requires-Dist: codespell==2.3.0; extra == "test"
 Requires-Dist: coverage==7.5.3; extra == "test"
 Requires-Dist: mypy==1.10.0; extra == "test"
-Requires-Dist: pyserial-asyncio-fast==0.11; extra == "test"
-Requires-Dist: pytest==8.2.1; extra == "test"
+Requires-Dist: pyserial-asyncio-fast==0.12; extra == "test"
+Requires-Dist: pytest==8.2.2; extra == "test"
 Requires-Dist: pytest-asyncio==0.23.7; extra == "test"
-Requires-Dist: ruff==0.4.7; extra == "test"
-Requires-Dist: tox==4.15.0; extra == "test"
+Requires-Dist: ruff==0.4.9; extra == "test"
+Requires-Dist: tox==4.15.1; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20240527; extra == "test"
 Provides-Extra: docs
 Requires-Dist: sphinx==7.3.7; extra == "docs"

{pyplumio-0.5.20 → pyplumio-0.5.21}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.20
+Version: 0.5.21
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -27,11 +27,11 @@ Provides-Extra: test
 Requires-Dist: codespell==2.3.0; extra == "test"
 Requires-Dist: coverage==7.5.3; extra == "test"
 Requires-Dist: mypy==1.10.0; extra == "test"
-Requires-Dist: pyserial-asyncio-fast==0.11; extra == "test"
-Requires-Dist: pytest==8.2.1; extra == "test"
+Requires-Dist: pyserial-asyncio-fast==0.12; extra == "test"
+Requires-Dist: pytest==8.2.2; extra == "test"
 Requires-Dist: pytest-asyncio==0.23.7; extra == "test"
-Requires-Dist: ruff==0.4.7; extra == "test"
-Requires-Dist: tox==4.15.0; extra == "test"
+Requires-Dist: ruff==0.4.9; extra == "test"
+Requires-Dist: tox==4.15.1; extra == "test"
 Requires-Dist: types-pyserial==3.5.0.20240527; extra == "test"
 Provides-Extra: docs
 Requires-Dist: sphinx==7.3.7; extra == "docs"

{pyplumio-0.5.20 → pyplumio-0.5.21}/PyPlumIO.egg-info/requires.txt

@@ -14,9 +14,9 @@ readthedocs-sphinx-search==0.3.2
 codespell==2.3.0
 coverage==7.5.3
 mypy==1.10.0
-pyserial-asyncio-fast==0.11
-pytest==8.2.1
+pyserial-asyncio-fast==0.12
+pytest==8.2.2
 pytest-asyncio==0.23.7
-ruff==0.4.7
-tox==4.15.0
+ruff==0.4.9
+tox==4.15.1
 types-pyserial==3.5.0.20240527

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.20'
-__version_tuple__ = version_tuple = (0, 5, 20)
+__version__ = version = '0.5.21'
+__version_tuple__ = version_tuple = (0, 5, 21)

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/devices/ecomax.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Generator, Iterable, Sequence
-from contextlib import suppress
 import logging
 import time
 from typing import Any, ClassVar, Final
@@ -18,7 +17,7 @@ from pyplumio.const import (
     DeviceType,
     FrameType,
 )
-from pyplumio.devices import AddressableDevice
+from pyplumio.devices import AddressableDevice, SubDevice
 from pyplumio.devices.mixer import Mixer
 from pyplumio.devices.thermostat import Thermostat
 from pyplumio.filters import on_change
@@ -263,8 +262,12 @@ class EcoMAX(AddressableDevice):
         if not parameters:
             return False
 
-        for mixer in self._mixers(parameters.keys()):
-            await mixer.dispatch(ATTR_MIXER_PARAMETERS, parameters[mixer.index])
+        await asyncio.gather(
+            *[
+                mixer.dispatch(ATTR_MIXER_PARAMETERS, parameters[mixer.index])
+                for mixer in self._mixers(indexes=parameters.keys())
+            ]
+        )
 
         return True
 
@@ -278,14 +281,18 @@ class EcoMAX(AddressableDevice):
         if not sensors:
             return False
 
-        for mixer in self._mixers(sensors.keys()):
-            await mixer.dispatch(ATTR_MIXER_SENSORS, sensors[mixer.index])
+        await asyncio.gather(
+            *[
+                mixer.dispatch(ATTR_MIXER_SENSORS, sensors[mixer.index])
+                for mixer in self._mixers(indexes=sensors.keys())
+            ]
+        )
 
         return True
 
     async def _add_schedules(
         self, schedules: list[tuple[int, list[list[bool]]]]
-    ) -> dict[str, Any]:
+    ) -> dict[str, Schedule]:
         """Add schedules to the dataset."""
         return {
             SCHEDULES[index]: Schedule(
@@ -333,8 +340,9 @@ class EcoMAX(AddressableDevice):
         For each sensor dispatch an event with the sensor's name and
         value.
         """
-        for name, value in sensors.items():
-            await self.dispatch(name, value)
+        await asyncio.gather(
+            *[self.dispatch(name, value) for name, value in sensors.items()]
+        )
 
         return True
 
@@ -371,10 +379,14 @@ class EcoMAX(AddressableDevice):
         if not parameters:
             return False
 
-        for thermostat in self._thermostats(parameters.keys()):
-            await thermostat.dispatch(
-                ATTR_THERMOSTAT_PARAMETERS, parameters[thermostat.index]
-            )
+        await asyncio.gather(
+            *[
+                thermostat.dispatch(
+                    ATTR_THERMOSTAT_PARAMETERS, parameters[thermostat.index]
+                )
+                for thermostat in self._thermostats(indexes=parameters.keys())
+            ]
+        )
 
         return True
 
@@ -401,10 +413,12 @@ class EcoMAX(AddressableDevice):
         if not sensors:
             return False
 
-        for thermostat in self._thermostats(sensors.keys()):
-            await thermostat.dispatch(
-                ATTR_THERMOSTAT_SENSORS, sensors[thermostat.index]
-            )
+        await asyncio.gather(
+            *[
+                thermostat.dispatch(ATTR_THERMOSTAT_SENSORS, sensors[thermostat.index])
+                for thermostat in self._thermostats(indexes=sensors.keys())
+            ]
+        )
 
         return True
 
@@ -438,10 +452,6 @@ class EcoMAX(AddressableDevice):
         """Shutdown tasks for the ecoMAX controller and sub-devices."""
         mixers = self.get_nowait(ATTR_MIXERS, {})
         thermostats = self.get_nowait(ATTR_THERMOSTATS, {})
-        for subdevice in (mixers | thermostats).values():
-            await subdevice.shutdown()
-
-        with suppress(AttributeError):
-            await self.regdata.shutdown()
-
+        devices: Iterable[SubDevice] = (mixers | thermostats).values()
+        await asyncio.gather(*[device.shutdown() for device in devices])
         await super().shutdown()

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/devices/mixer.py

@@ -37,8 +37,9 @@ class Mixer(SubDevice):
         For each sensor dispatch an event with the
         sensor's name and value.
         """
-        for name, value in sensors.items():
-            await self.dispatch(name, value)
+        await asyncio.gather(
+            *[self.dispatch(name, value) for name, value in sensors.items()]
+        )
 
         return True
 

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/devices/thermostat.py

@@ -33,8 +33,9 @@ class Thermostat(SubDevice):
         For each sensor dispatch an event with the
         sensor's name and value.
         """
-        for name, value in sensors.items():
-            await self.dispatch(name, value)
+        await asyncio.gather(
+            *[self.dispatch(name, value) for name, value in sensors.items()]
+        )
 
         return True
 

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/helpers/event_manager.py

@@ -138,16 +138,16 @@ class EventManager(TaskManager):
         """Call a registered callbacks and dispatch the event without waiting."""
         self.create_task(self.dispatch(name, value))
 
-    def load(self, data: dict[str, Any]) -> None:
-        """Load an event data."""
-
-        async def _dispatch_events(data: dict[str, Any]) -> None:
-            """Dispatch events for a loaded data."""
-            for key, value in data.items():
-                await self.dispatch(key, value)
-
+    async def load(self, data: dict[str, Any]) -> None:
+        """Load event data."""
         self.data = data
-        self.create_task(_dispatch_events(data))
+        await asyncio.gather(
+            *[self.dispatch(name, value) for name, value in data.items()]
+        )
+
+    def load_nowait(self, data: dict[str, Any]) -> None:
+        """Load event data without waiting."""
+        self.create_task(self.load(data))
 
     def create_event(self, name: str) -> asyncio.Event:
         """Create an event."""

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/helpers/task_manager.py

@@ -18,15 +18,14 @@ class TaskManager:
 
     def create_task(self, coro: Coroutine[Any, Any, Any]) -> asyncio.Task:
         """Create asyncio task and store a reference for it."""
-        task: asyncio.Task = asyncio.create_task(coro)
+        task = asyncio.create_task(coro)
         self._tasks.add(task)
         task.add_done_callback(self._tasks.discard)
         return task
 
-    def cancel_tasks(self) -> None:
+    def cancel_tasks(self) -> bool:
         """Cancel all tasks."""
-        for task in self._tasks:
-            task.cancel()
+        return all(task.cancel() for task in self._tasks)
 
     async def wait_until_done(self, return_exceptions: bool = True) -> None:
         """Wait for all tasks to complete."""

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/protocol.py

@@ -107,8 +107,7 @@ class Queues:
 
     async def join(self) -> None:
         """Wait for queues to finish."""
-        for queue in (self.read, self.write):
-            await queue.join()
+        await asyncio.gather(self.read.join(), self.write.join())
 
 
 class AsyncProtocol(Protocol, EventManager):
@@ -171,22 +170,18 @@ class AsyncProtocol(Protocol, EventManager):
             return
 
         self.connected.clear()
-        for device in self.data.values():
-            # Notify devices about connection loss.
-            await device.dispatch(ATTR_CONNECTED, False)
-
         await self.close_writer()
-        for callback in self.on_connection_lost:
-            await callback()
+        await asyncio.gather(
+            *[device.dispatch(ATTR_CONNECTED, False) for device in self.data.values()]
+        )
+        await asyncio.gather(*[callback() for callback in self.on_connection_lost])
 
     async def shutdown(self) -> None:
         """Shutdown protocol tasks."""
         await self._queues.join()
         self.cancel_tasks()
         await self.wait_until_done()
-        for device in self.data.values():
-            await device.shutdown()
-
+        await asyncio.gather(*[device.shutdown() for device in self.data.values()])
         if self.connected.is_set():
             self.connected.clear()
             await self.close_writer()

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/structures/ecomax_parameters.py

@@ -116,8 +116,6 @@ class EcomaxBinaryParameterDescription(
 ):
     """Represents an ecoMAX binary parameter description."""
 
-    __slots__ = ()
-
 
 ECOMAX_PARAMETERS: dict[ProductType, tuple[EcomaxParameterDescription, ...]] = {
     ProductType.ECOMAX_P: (

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyplumio/structures/network_info.py

@@ -18,7 +18,7 @@ DEFAULT_NETMASK: Final = "255.255.255.0"
 NETWORK_INFO_SIZE: Final = 25
 
 
-@dataclass
+@dataclass(frozen=True)
 class EthernetParameters:
     """Represents an ethernet parameters."""
 
@@ -35,7 +35,7 @@ class EthernetParameters:
     status: bool = True
 
 
-@dataclass
+@dataclass(frozen=True)
 class WirelessParameters(EthernetParameters):
     """Represents a wireless network parameters."""
 
@@ -50,7 +50,7 @@ class WirelessParameters(EthernetParameters):
     signal_quality: int = 100
 
 
-@dataclass
+@dataclass(frozen=True)
 class NetworkInfo:
     """Represents a network parameters."""
 

{pyplumio-0.5.20 → pyplumio-0.5.21}/pyproject.toml

@@ -35,11 +35,11 @@ test = [
     "codespell==2.3.0",
     "coverage==7.5.3",
     "mypy==1.10.0",
-    "pyserial-asyncio-fast==0.11",
-    "pytest==8.2.1",
+    "pyserial-asyncio-fast==0.12",
+    "pytest==8.2.2",
     "pytest-asyncio==0.23.7",
-    "ruff==0.4.7",
-    "tox==4.15.0",
+    "ruff==0.4.9",
+    "tox==4.15.1",
     "types-pyserial==3.5.0.20240527"
 ]
 docs = [

{pyplumio-0.5.20 → pyplumio-0.5.21}/requirements_test.txt

@@ -2,10 +2,10 @@ codespell==2.3.0
 coverage==7.5.3
 mypy==1.10.0
 pre-commit==3.7.1
-pyserial-asyncio-fast==0.11
-pytest==8.2.1
+pyserial-asyncio-fast==0.12
+pytest==8.2.2
 pytest-asyncio==0.23.7
-ruff==0.4.7
+ruff==0.4.9
 tomli==2.0.1
-tox==4.15.0
+tox==4.15.1
 types-pyserial==3.5.0.20240527

{pyplumio-0.5.20 → pyplumio-0.5.21}/tests/frames/test_messages.py

@@ -37,7 +37,7 @@ async def test_regulator_data_message(ecomax: EcoMAX, schema, regdata) -> None:
     """Test a regulator data message."""
     frame = RegulatorDataMessage(message=regdata["message"])
     frame.sender_device = ecomax
-    frame.sender_device.load(schema["data"])
+    frame.sender_device.load_nowait(schema["data"])
     await frame.sender_device.wait_until_done()
 
     if regdata["id"] == "unknown_regulator_data_version":

{pyplumio-0.5.20 → pyplumio-0.5.21}/tests/frames/test_responses.py

@@ -124,7 +124,7 @@ async def test_thermostat_parameters_response(ecomax: EcoMAX, message, data) ->
     """Test a thermostat parameters response."""
     frame = ThermostatParametersResponse(message=message)
     frame.sender_device = ecomax
-    frame.sender_device.load({ATTR_THERMOSTATS_AVAILABLE: 3})
+    frame.sender_device.load_nowait({ATTR_THERMOSTATS_AVAILABLE: 3})
     await frame.sender_device.wait_until_done()
 
     assert frame.data == data

{pyplumio-0.5.20 → pyplumio-0.5.21}/tests/helpers/test_event_manager.py

@@ -38,16 +38,39 @@ async def test_wait_for(event_manager: EventManager) -> None:
 
 
 async def test_get(event_manager: EventManager) -> None:
-    """Test getting an event value asynchronously."""
+    """Test getting an event value."""
     assert await event_manager.get("test_key") == "test_value"
 
 
 def test_get_nowait(event_manager: EventManager) -> None:
-    """Test getting an event value."""
+    """Test getting an event value without waiting."""
     assert event_manager.get_nowait("test_key") == "test_value"
     assert event_manager.get_nowait("test_key2") is None
 
 
+async def test_load(event_manager: EventManager) -> None:
+    """Test loading event data."""
+    callback = AsyncMock(return_value=True)
+    callback2 = AsyncMock(return_value=True)
+    event_manager.subscribe("test_key1", callback)
+    event_manager.subscribe("test_key2", callback2)
+    event_manager.load_nowait({"test_key2": "test_value2"})
+    await event_manager.wait_until_done()
+    callback.assert_not_awaited()
+    callback2.assert_awaited_once_with("test_value2")
+
+
+async def test_load_nowait(event_manager: EventManager) -> None:
+    """Test loading event data without waiting."""
+    callback = AsyncMock(return_value=True)
+    callback2 = AsyncMock(return_value=True)
+    event_manager.subscribe("test_key1", callback)
+    event_manager.subscribe("test_key2", callback2)
+    await event_manager.load({"test_key2": "test_value2"})
+    callback.assert_not_awaited()
+    callback2.assert_awaited_once_with("test_value2")
+
+
 async def test_subscribe(event_manager: EventManager) -> None:
     """Test subscribing to an event."""
     callback = AsyncMock(return_value=True)
@@ -78,18 +101,6 @@ async def test_unsubscribe(event_manager: EventManager) -> None:
     callback.assert_not_awaited()
 
 
-async def test_load(event_manager: EventManager) -> None:
-    """Test loading an event data."""
-    callback = AsyncMock(return_value=True)
-    callback2 = AsyncMock(return_value=True)
-    event_manager.subscribe("test_key1", callback)
-    event_manager.subscribe("test_key2", callback2)
-    event_manager.load({"test_key2": "test_value2"})
-    await event_manager.wait_until_done()
-    callback.assert_not_awaited()
-    callback2.assert_awaited_once_with("test_value2")
-
-
 async def test_create_event(event_manager: EventManager) -> None:
     """Test creating an event."""
     event = event_manager.create_event("test")

{pyplumio-0.5.20 → pyplumio-0.5.21}/tests/test_protocol.py

@@ -195,7 +195,7 @@ async def test_async_protocol_connection_lost() -> None:
 @patch("asyncio.wait")
 @patch("asyncio.gather", new_callable=AsyncMock)
 @patch("pyplumio.protocol.AsyncProtocol.cancel_tasks")
-@patch("pyplumio.devices.ecomax.EcoMAX.shutdown")
+@patch("pyplumio.devices.ecomax.EcoMAX.shutdown", new_callable=Mock)
 async def test_async_protocol_shutdown(
     mock_shutdown,
     mock_cancel_tasks,
@@ -205,8 +205,8 @@ async def test_async_protocol_shutdown(
     bypass_asyncio_events,
 ) -> None:
     """Test shutting down connection with an async protocol."""
-    mock_read_queue = AsyncMock()
-    mock_write_queue = AsyncMock()
+    mock_read_queue = Mock()
+    mock_write_queue = Mock()
 
     mock_writer = AsyncMock()
     mock_writer.close = AsyncMock()
@@ -231,9 +231,15 @@ async def test_async_protocol_shutdown(
     ):
         await async_protocol.shutdown()
 
-    mock_shutdown.assert_awaited_once()
     mock_cancel_tasks.assert_called_once()
-    mock_gather.assert_awaited_once_with(*async_protocol.tasks, return_exceptions=True)
+    mock_gather.await_count = 3
+    mock_gather.assert_has_awaits(
+        [
+            call(mock_read_queue.join(), mock_write_queue.join()),
+            call(*async_protocol.tasks, return_exceptions=True),
+            call(mock_shutdown()),
+        ]
+    )
     mock_writer.close.assert_awaited_once()
     assert async_protocol.writer is None