PyPlumIO 0.5.15__tar.gz → 0.5.17__tar.gz

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.11
+    rev: v0.4.2
     hooks:
       - id: ruff
         args:
@@ -12,6 +12,6 @@ repos:
     hooks:
         - id: codespell
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.10.0
     hooks:
         - id: mypy

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.15
+Version: 0.5.17
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -25,21 +25,21 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.2.6; extra == "test"
-Requires-Dist: coverage==7.4.1; extra == "test"
-Requires-Dist: mypy==1.8.0; extra == "test"
+Requires-Dist: coverage==7.5.0; extra == "test"
+Requires-Dist: mypy==1.9.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.11; extra == "test"
-Requires-Dist: pytest==8.0.0; extra == "test"
-Requires-Dist: pytest-asyncio==0.23.5; extra == "test"
-Requires-Dist: ruff==0.2.1; extra == "test"
-Requires-Dist: tox==4.12.1; extra == "test"
-Requires-Dist: types-pyserial==3.5.0.20240205; 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: tox==4.15.0; extra == "test"
+Requires-Dist: types-pyserial==3.5.0.20240311; extra == "test"
 Provides-Extra: docs
-Requires-Dist: sphinx==7.2.6; extra == "docs"
+Requires-Dist: sphinx==7.3.7; extra == "docs"
 Requires-Dist: sphinx_rtd_theme==2.0.0; 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==3.6.1; extra == "dev"
+Requires-Dist: pre-commit==3.7.0; extra == "dev"
 Requires-Dist: tomli==2.0.1; extra == "dev"
 
 # PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPlumIO
-Version: 0.5.15
+Version: 0.5.17
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License
@@ -25,21 +25,21 @@ License-File: LICENSE
 Requires-Dist: pyserial-asyncio==0.6
 Provides-Extra: test
 Requires-Dist: codespell==2.2.6; extra == "test"
-Requires-Dist: coverage==7.4.1; extra == "test"
-Requires-Dist: mypy==1.8.0; extra == "test"
+Requires-Dist: coverage==7.5.0; extra == "test"
+Requires-Dist: mypy==1.9.0; extra == "test"
 Requires-Dist: pyserial-asyncio-fast==0.11; extra == "test"
-Requires-Dist: pytest==8.0.0; extra == "test"
-Requires-Dist: pytest-asyncio==0.23.5; extra == "test"
-Requires-Dist: ruff==0.2.1; extra == "test"
-Requires-Dist: tox==4.12.1; extra == "test"
-Requires-Dist: types-pyserial==3.5.0.20240205; 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: tox==4.15.0; extra == "test"
+Requires-Dist: types-pyserial==3.5.0.20240311; extra == "test"
 Provides-Extra: docs
-Requires-Dist: sphinx==7.2.6; extra == "docs"
+Requires-Dist: sphinx==7.3.7; extra == "docs"
 Requires-Dist: sphinx_rtd_theme==2.0.0; 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==3.6.1; extra == "dev"
+Requires-Dist: pre-commit==3.7.0; extra == "dev"
 Requires-Dist: tomli==2.0.1; extra == "dev"
 
 # PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/PyPlumIO.egg-info/requires.txt

@@ -2,21 +2,21 @@ pyserial-asyncio==0.6
 
 [dev]
 pyplumio[docs,test]
-pre-commit==3.6.1
+pre-commit==3.7.0
 tomli==2.0.1
 
 [docs]
-sphinx==7.2.6
+sphinx==7.3.7
 sphinx_rtd_theme==2.0.0
 readthedocs-sphinx-search==0.3.2
 
 [test]
 codespell==2.2.6
-coverage==7.4.1
-mypy==1.8.0
+coverage==7.5.0
+mypy==1.9.0
 pyserial-asyncio-fast==0.11
-pytest==8.0.0
-pytest-asyncio==0.23.5
-ruff==0.2.1
-tox==4.12.1
-types-pyserial==3.5.0.20240205
+pytest==8.2.0
+pytest-asyncio==0.23.6
+ruff==0.4.2
+tox==4.15.0
+types-pyserial==3.5.0.20240311

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/_version.py

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

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/connection.py

@@ -10,6 +10,7 @@ from typing import Any, Final, cast
 from serial import EIGHTBITS, PARITY_NONE, STOPBITS_ONE, SerialException
 
 from pyplumio.exceptions import ConnectionFailedError
+from pyplumio.helpers.task_manager import TaskManager
 from pyplumio.helpers.timeout import timeout
 from pyplumio.protocol import AsyncProtocol, Protocol
 
@@ -26,13 +27,12 @@ except ImportError:
     import serial_asyncio as pyserial_asyncio
 
 
-class Connection(ABC):
+class Connection(ABC, TaskManager):
     """Represents a connection.
 
     All specific connection classes MUST be inherited from this class.
     """
 
-    _closing: bool
     _protocol: Protocol
     _reconnect_on_failure: bool
     _kwargs: MutableMapping[str, Any]
@@ -44,13 +44,13 @@ class Connection(ABC):
         **kwargs: Any,
     ) -> None:
         """Initialize a new connection."""
+        super().__init__()
         if protocol is None:
             protocol = AsyncProtocol()
 
         if reconnect_on_failure:
-            protocol.on_connection_lost.add(self._connection_lost)
+            protocol.on_connection_lost.add(self._reconnect)
 
-        self._closing = False
         self._reconnect_on_failure = reconnect_on_failure
         self._protocol = protocol
         self._kwargs = kwargs
@@ -76,29 +76,20 @@ class Connection(ABC):
                 await self._open_connection(),
             )
             self.protocol.connection_established(reader, writer)
-        except (
-            OSError,
-            SerialException,
-            asyncio.TimeoutError,
-        ) as connection_error:
-            raise ConnectionFailedError from connection_error
+        except (OSError, SerialException, asyncio.TimeoutError) as err:
+            raise ConnectionFailedError from err
 
     async def _reconnect(self) -> None:
         """Try to connect and reconnect on failure."""
         try:
-            return await self._connect()
+            await self._connect()
         except ConnectionFailedError:
-            await self._connection_lost()
-
-    async def _connection_lost(self) -> None:
-        """Resume connection on the connection loss."""
-        if not self._closing:
             _LOGGER.error(
                 "Can't connect to the device, retrying in %.1f seconds",
                 RECONNECT_TIMEOUT,
             )
             await asyncio.sleep(RECONNECT_TIMEOUT)
-            await self._reconnect()
+            self.create_task(self._reconnect())
 
     async def connect(self) -> None:
         """Open the connection.
@@ -106,14 +97,11 @@ class Connection(ABC):
         Initialize a connection via connect or reconnect
         routines, depending on '_reconnect_on_failure' property.
         """
-        if self._reconnect_on_failure:
-            await self._reconnect()
-        else:
-            await self._connect()
+        await (self._reconnect if self._reconnect_on_failure else self._connect)()
 
     async def close(self) -> None:
         """Close the connection."""
-        self._closing = True
+        self.cancel_tasks()
         await self.protocol.shutdown()
 
     @property

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/devices/__init__.py

@@ -11,7 +11,7 @@ from pyplumio.const import ATTR_FRAME_ERRORS, ATTR_LOADED, DeviceType, FrameType
 from pyplumio.exceptions import UnknownDeviceError
 from pyplumio.frames import DataFrameDescription, Frame, Request, get_frame_handler
 from pyplumio.helpers.event_manager import EventManager
-from pyplumio.helpers.factory import factory
+from pyplumio.helpers.factory import create_instance
 from pyplumio.helpers.parameter import SET_RETRIES, Parameter
 from pyplumio.helpers.typing import ParameterValueType
 from pyplumio.structures.network_info import NetworkInfo
@@ -160,7 +160,7 @@ class AddressableDevice(Device, ABC):
 
         If value is not available before timeout, retry request.
         """
-        request: Request = factory(
+        request: Request = await create_instance(
             get_frame_handler(frame_type), recipient=self.address
         )
 

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/devices/ecomax.py

@@ -28,7 +28,7 @@ from pyplumio.frames import (
     get_frame_handler,
     is_known_frame_type,
 )
-from pyplumio.helpers.factory import factory
+from pyplumio.helpers.factory import create_instance
 from pyplumio.helpers.parameter import ParameterValues
 from pyplumio.helpers.schedule import Schedule, ScheduleDay
 from pyplumio.structures.alerts import ATTR_TOTAL_ALERTS
@@ -235,7 +235,7 @@ class EcoMAX(AddressableDevice):
                 and not self._has_frame_version(frame_type, version)
             ):
                 # We don't have this frame or it's version has changed.
-                request: Request = factory(
+                request: Request = await create_instance(
                     get_frame_handler(frame_type), recipient=self.address
                 )
                 self.queue.put_nowait(request)
@@ -346,16 +346,23 @@ class EcoMAX(AddressableDevice):
 
         return True
 
-    async def _add_ecomax_control_parameter(self, mode: int) -> None:
+    async def _add_ecomax_control_parameter(self, mode: DeviceState) -> None:
         """Create ecoMAX control parameter instance and dispatch an event."""
+        description = ECOMAX_CONTROL_PARAMETER
+        name = description.name
+        values = ParameterValues(
+            value=int(mode != DeviceState.OFF), min_value=0, max_value=1
+        )
+
+        if name in self.data:
+            parameter: EcomaxBinaryParameter = self.data[name]
+            parameter.values = values
+            return await self.dispatch(name, parameter)
+
         await self.dispatch(
-            ECOMAX_CONTROL_PARAMETER.name,
+            name,
             EcomaxBinaryParameter(
-                device=self,
-                description=ECOMAX_CONTROL_PARAMETER,
-                values=ParameterValues(
-                    value=int(mode != DeviceState.OFF), min_value=0, max_value=1
-                ),
+                device=self, description=ECOMAX_CONTROL_PARAMETER, values=values
             ),
         )
 

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/frames/__init__.py

@@ -80,7 +80,7 @@ class Frame(ABC):
     sender: DeviceType | AddressableDevice | int
     sender_type: int
     econet_version: int
-    frame_type: ClassVar[FrameType | int]
+    frame_type: ClassVar[FrameType]
     _message: bytearray | None
     _data: dict[str, Any] | None
 

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/frames/messages.py

@@ -35,7 +35,7 @@ class RegulatorDataMessage(Message):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.MESSAGE_REGULATOR_DATA
+    frame_type: ClassVar[FrameType] = FrameType.MESSAGE_REGULATOR_DATA
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -47,7 +47,7 @@ class SensorDataMessage(Message):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.MESSAGE_SENSOR_DATA
+    frame_type: ClassVar[FrameType] = FrameType.MESSAGE_SENSOR_DATA
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/frames/requests.py

@@ -24,7 +24,7 @@ class ProgramVersionRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_PROGRAM_VERSION
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_PROGRAM_VERSION
 
     def response(self, **kwargs: Any) -> Response | None:
         """Return a response frame."""
@@ -36,7 +36,7 @@ class CheckDeviceRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_CHECK_DEVICE
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_CHECK_DEVICE
 
     def response(self, **kwargs: Any) -> Response | None:
         """Return a response frame."""
@@ -48,7 +48,7 @@ class UIDRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_UID
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_UID
 
 
 class PasswordRequest(Request):
@@ -56,7 +56,7 @@ class PasswordRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_PASSWORD
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_PASSWORD
 
 
 class EcomaxParametersRequest(Request):
@@ -67,7 +67,7 @@ class EcomaxParametersRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_ECOMAX_PARAMETERS
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_ECOMAX_PARAMETERS
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -83,7 +83,7 @@ class MixerParametersRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_MIXER_PARAMETERS
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_MIXER_PARAMETERS
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -99,7 +99,7 @@ class ThermostatParametersRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_THERMOSTAT_PARAMETERS
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_THERMOSTAT_PARAMETERS
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -111,7 +111,7 @@ class RegulatorDataSchemaRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_REGULATOR_DATA_SCHEMA
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_REGULATOR_DATA_SCHEMA
 
 
 class SetEcomaxParameterRequest(Request):
@@ -122,7 +122,7 @@ class SetEcomaxParameterRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_SET_ECOMAX_PARAMETER
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_SET_ECOMAX_PARAMETER
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -140,7 +140,7 @@ class SetMixerParameterRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_SET_MIXER_PARAMETER
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_SET_MIXER_PARAMETER
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -168,7 +168,7 @@ class SetThermostatParameterRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_SET_THERMOSTAT_PARAMETER
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_SET_THERMOSTAT_PARAMETER
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -191,7 +191,7 @@ class EcomaxControlRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_ECOMAX_CONTROL
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_ECOMAX_CONTROL
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -210,7 +210,7 @@ class StartMasterRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_START_MASTER
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_START_MASTER
 
 
 class StopMasterRequest(Request):
@@ -222,7 +222,7 @@ class StopMasterRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_STOP_MASTER
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_STOP_MASTER
 
 
 class AlertsRequest(Request):
@@ -234,7 +234,7 @@ class AlertsRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_ALERTS
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_ALERTS
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -246,7 +246,7 @@ class SchedulesRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_SCHEDULES
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_SCHEDULES
 
 
 class SetScheduleRequest(Request):
@@ -254,7 +254,7 @@ class SetScheduleRequest(Request):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.REQUEST_SET_SCHEDULE
+    frame_type: ClassVar[FrameType] = FrameType.REQUEST_SET_SCHEDULE
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/frames/responses.py

@@ -24,7 +24,7 @@ class ProgramVersionResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_PROGRAM_VERSION
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_PROGRAM_VERSION
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -43,7 +43,7 @@ class DeviceAvailableResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_DEVICE_AVAILABLE
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_DEVICE_AVAILABLE
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -62,7 +62,7 @@ class UIDResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_UID
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_UID
 
     def create_message(self, data: dict[str, Any]) -> bytearray:
         """Create a frame message."""
@@ -81,7 +81,7 @@ class PasswordResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_PASSWORD
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_PASSWORD
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -97,7 +97,7 @@ class EcomaxParametersResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_ECOMAX_PARAMETERS
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_ECOMAX_PARAMETERS
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -112,7 +112,7 @@ class MixerParametersResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_MIXER_PARAMETERS
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_MIXER_PARAMETERS
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -127,7 +127,7 @@ class ThermostatParametersResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_THERMOSTAT_PARAMETERS
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_THERMOSTAT_PARAMETERS
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -143,7 +143,7 @@ class RegulatorDataSchemaResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_REGULATOR_DATA_SCHEMA
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_REGULATOR_DATA_SCHEMA
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -159,7 +159,7 @@ class SetEcomaxParameterResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_SET_ECOMAX_PARAMETER
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_SET_ECOMAX_PARAMETER
 
 
 class SetMixerParameterResponse(Response):
@@ -171,7 +171,7 @@ class SetMixerParameterResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_SET_MIXER_PARAMETER
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_SET_MIXER_PARAMETER
 
 
 class SetThermostatParameterResponse(Response):
@@ -183,7 +183,7 @@ class SetThermostatParameterResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_SET_THERMOSTAT_PARAMETER
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_SET_THERMOSTAT_PARAMETER
 
 
 class EcomaxControlResponse(Response):
@@ -195,7 +195,7 @@ class EcomaxControlResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_ECOMAX_CONTROL
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_ECOMAX_CONTROL
 
 
 class AlertsResponse(Response):
@@ -203,7 +203,7 @@ class AlertsResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_ALERTS
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_ALERTS
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""
@@ -215,7 +215,7 @@ class SchedulesResponse(Response):
 
     __slots__ = ()
 
-    frame_type: ClassVar[FrameType | int] = FrameType.RESPONSE_SCHEDULES
+    frame_type: ClassVar[FrameType] = FrameType.RESPONSE_SCHEDULES
 
     def decode_message(self, message: bytearray) -> dict[str, Any]:
         """Decode a frame message."""

pyplumio-0.5.17/pyplumio/helpers/factory.py

@@ -0,0 +1,23 @@
+"""Contains a factory helper."""
+from __future__ import annotations
+
+import asyncio
+from importlib import import_module
+import logging
+from typing import Any
+
+_LOGGER = logging.getLogger(__name__)
+
+
+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"
+        )
+        return getattr(module, class_name)(**kwargs)
+    except Exception:
+        _LOGGER.error("Failed to load module (%s)", class_path)
+        raise

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/pyplumio/helpers/parameter.py

@@ -166,6 +166,10 @@ class Parameter(ABC):
         """Set parameter as no longer pending update."""
         self._pending_update = False
 
+    async def create_request(self) -> Request:
+        """Create a request to change the parameter."""
+        raise NotImplementedError
+
     async def set(self, value: ParameterValueType, retries: int = SET_RETRIES) -> bool:
         """Set a parameter value."""
         if (value := _normalize_parameter_value(value)) == self.values.value:
@@ -188,7 +192,7 @@ class Parameter(ABC):
                 self.device.unsubscribe(self.description.name, self._confirm_update)
                 return False
 
-            await self.device.queue.put(self.request)
+            await self.device.queue.put(await self.create_request())
             await asyncio.sleep(SET_TIMEOUT)
             retries -= 1
 
@@ -223,11 +227,6 @@ class Parameter(ABC):
         """Return the unit of measurement."""
         return self.description.unit_of_measurement
 
-    @property
-    def request(self) -> Request:
-        """Return request to change the parameter."""
-        raise NotImplementedError
-
 
 class BinaryParameter(Parameter):
     """Represents binary device parameter."""

{PyPlumIO-0.5.15 → pyplumio-0.5.17}/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.helpers.factory import factory
+from pyplumio.frames.requests import SetScheduleRequest
 from pyplumio.structures.schedules import collect_schedule_data
 
 TIME_FORMAT: Final = "%H:%M"
@@ -161,8 +161,7 @@ class Schedule(Iterable):
     def commit(self) -> None:
         """Commit a weekly schedule to the device."""
         self.device.queue.put_nowait(
-            factory(
-                "frames.requests.SetScheduleRequest",
+            SetScheduleRequest(
                 recipient=self.device.address,
                 data=collect_schedule_data(self.name, self.device),
             )