PyPlumIO 0.5.17__py3-none-any.whl → 0.5.18__py3-none-any.whl

{PyPlumIO-0.5.17.dist-info → PyPlumIO-0.5.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.17
+Version: 0.5.18
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -33,12 +33,12 @@ Requires-Dist: sphinx-rtd-theme ==2.0.0 ; extra == 'docs'
 Requires-Dist: readthedocs-sphinx-search ==0.3.2 ; extra == 'docs'
 Provides-Extra: test
 Requires-Dist: codespell ==2.2.6 ; extra == 'test'
-Requires-Dist: coverage ==7.5.0 ; extra == 'test'
-Requires-Dist: mypy ==1.9.0 ; extra == 'test'
+Requires-Dist: coverage ==7.5.1 ; extra == 'test'
+Requires-Dist: mypy ==1.10.0 ; extra == 'test'
 Requires-Dist: pyserial-asyncio-fast ==0.11 ; extra == 'test'
 Requires-Dist: pytest ==8.2.0 ; extra == 'test'
 Requires-Dist: pytest-asyncio ==0.23.6 ; extra == 'test'
-Requires-Dist: ruff ==0.4.2 ; extra == 'test'
+Requires-Dist: ruff ==0.4.3 ; extra == 'test'
 Requires-Dist: tox ==4.15.0 ; extra == 'test'
 Requires-Dist: types-pyserial ==3.5.0.20240311 ; extra == 'test'
 

{PyPlumIO-0.5.17.dist-info → PyPlumIO-0.5.18.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pyplumio/__init__.py,sha256=4v9BaIkJ440qu2ITrcwVLOg9KO8k2W1gnGHe86sDLM8,3292
 pyplumio/__main__.py,sha256=oop76iR-XDHhMFhW4LO8-xTnBHsqzUQ5VVh__94OaqY,499
-pyplumio/_version.py,sha256=dQYxLlSh6o3oTwPaW5cCsGzUzw8dHq1HmpZtnNncm_0,413
+pyplumio/_version.py,sha256=TJSWAybqN12Cw_kxmDDEn4jE4KWfkCe6C38YXdi-hN8,413
 pyplumio/connection.py,sha256=0PmpNOcV7RgSfEeM7Wnhtbw0TpdtMTyqpJPQ2h7IX9M,6199
 pyplumio/const.py,sha256=4_VRx5mY7qf5fwaUluVlhuK_NIb7bClzhnhRLA-3GkY,3914
 pyplumio/exceptions.py,sha256=3tgfe0GD-T-DV2TUybsv7dwsk9P9f2g-4Gd8jnXw6DI,698
 pyplumio/filters.py,sha256=kXR4SUS7YXGaljW35NpEB9prHgxDKpsf_U1ACMTnh5I,11174
-pyplumio/protocol.py,sha256=Gl3aUxdcK5Z_ZkO88bPwiv9dBR_JO8VQR_H7aKKbHiM,8756
+pyplumio/protocol.py,sha256=btBJiCyB2ys-tiQOm8kj97_Y7yesO4cIOKrEGbrCrsk,8787
 pyplumio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyplumio/stream.py,sha256=UPqlUmNBobSS4SvS5BI19g_FeSTLpLj1k3l7OeE32bI,4374
 pyplumio/utils.py,sha256=h46IS7hOHFbAFGGmnyAUVwlfk0m_eSwa3U8oZq6-bJY,687
@@ -21,9 +21,9 @@ pyplumio/frames/responses.py,sha256=7MHwXkNVTcwYpWRAXBMiPxmaJw3vgX9kgoaBTXeRy60,
 pyplumio/helpers/__init__.py,sha256=H2xxdkF-9uADLwEbfBUoxNTdwru3L5Z2cfJjgsuRsn0,31
 pyplumio/helpers/data_types.py,sha256=UIbJu0JfXaNCiHlg8EnYOfeyKq9Mxiu6j_D8GyRudZk,8211
 pyplumio/helpers/event_manager.py,sha256=E9gMGCxOOBNZgnHCwpb8rtFgKsNIkjHvIN73XBgwQDk,6004
-pyplumio/helpers/factory.py,sha256=9U0vYy137nDI5Zl0CjlWhm6p0ztGeafOtkydZU0kA6I,694
+pyplumio/helpers/factory.py,sha256=Ld_PbKnkj0HFnuYcoDwcitiMRa-88UQKXcsE5vdgLqs,824
 pyplumio/helpers/parameter.py,sha256=ihdom_tON2urYXmS7x_2-zk2I-PcogdjILE7tOiGR8M,8698
-pyplumio/helpers/schedule.py,sha256=zfVmawRjpKa5JpDGg2n9E985UtW-hEWEyn6cKSm6U6c,4911
+pyplumio/helpers/schedule.py,sha256=395yTDAKV43so5vEG-q0mgqXGoFVWKpIyhdmqzKT-X4,4958
 pyplumio/helpers/task_manager.py,sha256=P17Nw9HDbA9NMSdkJo2WQRbEsykzzFSwQyyRzI3uFPk,1089
 pyplumio/helpers/timeout.py,sha256=bWBWvLPpgjCvdG5hlrSTXok_CsLme-jGnY9rHwupRc0,1286
 pyplumio/helpers/typing.py,sha256=V3uYCMyC4oePM7YzL0S-xEsyTgjgDbkOM0VNe-1LBPo,684
@@ -32,7 +32,7 @@ pyplumio/structures/__init__.py,sha256=-nbLcQvbWcs2EmnChqJmMVo1CUfj8lqMHb8yK1mV4
 pyplumio/structures/alerts.py,sha256=v--wbEKoB07r9KHMuZgMRT1dk4r8dPwxxB5cPv4lzZY,3259
 pyplumio/structures/boiler_load.py,sha256=HVPKt53VWvp2KDuSK1B9kcpX1h3Bz3GPBqBI4Oscm2Q,837
 pyplumio/structures/boiler_power.py,sha256=tP00IMz5qVQaePr70uTz_jCLoXHnmj_g3pvKxdNvenc,900
-pyplumio/structures/ecomax_parameters.py,sha256=D4IFbRzMtGK91XUCAzGp2VJ9LouYnRcPa-QP2mH2lnA,26184
+pyplumio/structures/ecomax_parameters.py,sha256=Ywiabk0panLHSScv8SZC_cBmkdSXuXPEfDFyEsjR0ts,25895
 pyplumio/structures/fan_power.py,sha256=fGU_BTPTtAplnjmTQQHhMXdoiHVYOdLlZ_PDA9F5u9c,870
 pyplumio/structures/frame_versions.py,sha256=9lFnrlxkok_3CTbXz38cntacnubWYGcaubDnYq9NOAM,1559
 pyplumio/structures/fuel_consumption.py,sha256=H23GVw9s0fbURvJHAfReTEvGp5q-oPOidh1mToOO3ec,975
@@ -54,8 +54,8 @@ pyplumio/structures/statuses.py,sha256=zjDQTU5fdORRzRkvlkzplgVS8A3AdyHG2qihfkdOH
 pyplumio/structures/temperatures.py,sha256=O8rANFN-wz5NvTWqh_25oUfFajjVyI9hoOMmz8vkKHg,2336
 pyplumio/structures/thermostat_parameters.py,sha256=1SJzHguN12JE-e2utwA448VgUkFddQxBQy3m66qCobk,7934
 pyplumio/structures/thermostat_sensors.py,sha256=N9nm3Rp1Rhb8wUPUkJIX56olZztixoxyFxIxP4R5P2g,3176
-PyPlumIO-0.5.17.dist-info/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-PyPlumIO-0.5.17.dist-info/METADATA,sha256=hYBntfwRNAwg3Zdb_S0HailPnsFm9ewT99rRNys494U,5414
-PyPlumIO-0.5.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PyPlumIO-0.5.17.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-PyPlumIO-0.5.17.dist-info/RECORD,,
+PyPlumIO-0.5.18.dist-info/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
+PyPlumIO-0.5.18.dist-info/METADATA,sha256=fHzLAiOHlj3nYHmvnm4OZsFBUMyJcSnSgmRg7zbbr0s,5415
+PyPlumIO-0.5.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PyPlumIO-0.5.18.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
+PyPlumIO-0.5.18.dist-info/RECORD,,

pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.17'
-__version_tuple__ = version_tuple = (0, 5, 17)
+__version__ = version = '0.5.18'
+__version_tuple__ = version_tuple = (0, 5, 18)

pyplumio/helpers/factory.py

@@ -2,21 +2,26 @@
 from __future__ import annotations
 
 import asyncio
-from importlib import import_module
+import importlib
 import logging
+from types import ModuleType
 from typing import Any
 
 _LOGGER = logging.getLogger(__name__)
 
 
+async def _load_module(module_name: str) -> ModuleType:
+    """Load a module by name."""
+    return await asyncio.get_running_loop().run_in_executor(
+        None, importlib.import_module, f".{module_name}", "pyplumio"
+    )
+
+
 async def create_instance(class_path: str, **kwargs: Any) -> Any:
     """Return a class instance from the class path."""
-    loop = asyncio.get_running_loop()
     module_name, class_name = class_path.rsplit(".", 1)
     try:
-        module = await loop.run_in_executor(
-            None, import_module, "." + module_name, "pyplumio"
-        )
+        module = await _load_module(module_name)
         return getattr(module, class_name)(**kwargs)
     except Exception:
         _LOGGER.error("Failed to load module (%s)", class_path)

pyplumio/helpers/schedule.py

@@ -9,7 +9,7 @@ from typing import Final, Literal
 
 from pyplumio.const import STATE_OFF, STATE_ON
 from pyplumio.devices import AddressableDevice
-from pyplumio.frames.requests import SetScheduleRequest
+from pyplumio.helpers.factory import create_instance
 from pyplumio.structures.schedules import collect_schedule_data
 
 TIME_FORMAT: Final = "%H:%M"
@@ -158,11 +158,11 @@ class Schedule(Iterable):
             self.saturday,
         ).__iter__()
 
-    def commit(self) -> None:
+    async def commit(self) -> None:
         """Commit a weekly schedule to the device."""
-        self.device.queue.put_nowait(
-            SetScheduleRequest(
-                recipient=self.device.address,
-                data=collect_schedule_data(self.name, self.device),
-            )
+        request = await create_instance(
+            "frames.requests.SetScheduleRequest",
+            recipient=self.device.address,
+            data=collect_schedule_data(self.name, self.device),
         )
+        await self.device.queue.put(request)

pyplumio/protocol.py

@@ -233,9 +233,10 @@ class AsyncProtocol(Protocol, EventManager):
     async def get_device_entry(self, device_type: DeviceType) -> AddressableDevice:
         """Set up device entry."""
         handler, name = get_device_handler_and_name(device_type)
-        return self.data.setdefault(
-            name, await self._create_device_entry(name, handler)
-        )
+        if name not in self.data:
+            self.data[name] = await self._create_device_entry(name, handler)
+
+        return self.data[name]
 
     async def _create_device_entry(self, name: str, handler: str) -> AddressableDevice:
         """Create device entry."""

pyplumio/structures/ecomax_parameters.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from collections.abc import Generator
 from dataclasses import dataclass
-from typing import Any, Final
+from typing import Any, Final, cast
 
 from pyplumio.const import (
     ATTR_INDEX,
@@ -47,37 +47,27 @@ class EcomaxParameter(Parameter):
     async def create_request(self) -> Request:
         """Create a request to change the parameter."""
         if self.description.name == ATTR_ECOMAX_CONTROL:
-            request: Request = await create_instance(
-                "frames.requests.EcomaxControlRequest",
-                recipient=self.device.address,
-                data={
-                    ATTR_VALUE: self.values.value,
-                },
-            )
-
+            cls = "frames.requests.EcomaxControlRequest"
+            data = {ATTR_VALUE: self.values.value}
         elif self.description.name == ATTR_THERMOSTAT_PROFILE:
-            request = await create_instance(
-                "frames.requests.SetThermostatParameterRequest",
-                recipient=self.device.address,
-                data={
-                    ATTR_INDEX: self._index,
-                    ATTR_VALUE: self.values.value,
-                    ATTR_OFFSET: 0,
-                    ATTR_SIZE: 1,
-                },
-            )
-
+            cls = "frames.requests.SetThermostatParameterRequest"
+            data = {
+                ATTR_INDEX: self._index,
+                ATTR_VALUE: self.values.value,
+                ATTR_OFFSET: 0,
+                ATTR_SIZE: 1,
+            }
         else:
-            request = await create_instance(
-                "frames.requests.SetEcomaxParameterRequest",
-                recipient=self.device.address,
-                data={
-                    ATTR_INDEX: self._index,
-                    ATTR_VALUE: self.values.value,
-                },
-            )
-
-        return request
+            cls = "frames.requests.SetEcomaxParameterRequest"
+            data = {
+                ATTR_INDEX: self._index,
+                ATTR_VALUE: self.values.value,
+            }
+
+        return cast(
+            Request,
+            await create_instance(cls, recipient=self.device.address, data=data),
+        )
 
     async def set(self, value: ParameterValueType, retries: int = 5) -> bool:
         """Set a parameter value."""