PyPlumIO 0.5.25__py3-none-any.whl → 0.5.27__py3-none-any.whl

pyplumio/structures/network_info.py

@@ -66,23 +66,23 @@ class NetworkInfoStructure(Structure):
 
     def encode(self, data: dict[str, Any]) -> bytearray:
         """Encode data to the bytearray message."""
-        message = bytearray(b"\x01")
         network_info: NetworkInfo = data.get(ATTR_NETWORK, NetworkInfo())
-        message += IPv4(network_info.eth.ip).to_bytes()
-        message += IPv4(network_info.eth.netmask).to_bytes()
-        message += IPv4(network_info.eth.gateway).to_bytes()
-        message.append(network_info.eth.status)
-        message += IPv4(network_info.wlan.ip).to_bytes()
-        message += IPv4(network_info.wlan.netmask).to_bytes()
-        message += IPv4(network_info.wlan.gateway).to_bytes()
-        message.append(network_info.server_status)
-        message.append(network_info.wlan.encryption)
-        message.append(network_info.wlan.signal_quality)
-        message.append(network_info.wlan.status)
-        message += b"\x00" * 4
-        message += VarString(network_info.wlan.ssid).to_bytes()
-
-        return message
+        return bytearray(
+            b"\1"
+            + IPv4(network_info.eth.ip).to_bytes()
+            + IPv4(network_info.eth.netmask).to_bytes()
+            + IPv4(network_info.eth.gateway).to_bytes()
+            + network_info.eth.status.to_bytes(length=1, byteorder="little")
+            + IPv4(network_info.wlan.ip).to_bytes()
+            + IPv4(network_info.wlan.netmask).to_bytes()
+            + IPv4(network_info.wlan.gateway).to_bytes()
+            + network_info.server_status.to_bytes(length=1, byteorder="little")
+            + network_info.wlan.encryption.to_bytes(length=1, byteorder="little")
+            + network_info.wlan.signal_quality.to_bytes(length=1, byteorder="little")
+            + network_info.wlan.status.to_bytes(length=1, byteorder="little")
+            + b"\0" * 4
+            + VarString(network_info.wlan.ssid).to_bytes()
+        )
 
     def decode(
         self, message: bytearray, offset: int = 0, data: dict[str, Any] | None = None

pyplumio/structures/program_version.py

@@ -6,6 +6,8 @@ from dataclasses import dataclass
 import struct
 from typing import Any, Final
 
+from dataslots import dataslots
+
 from pyplumio._version import __version_tuple__
 from pyplumio.structures import Structure
 from pyplumio.utils import ensure_dict
@@ -19,6 +21,7 @@ SOFTWARE_VERSION: Final = ".".join(str(x) for x in __version_tuple__[0:3])
 struct_program_version = struct.Struct("<2sB2s3s3HB")
 
 
+@dataslots
 @dataclass
 class VersionInfo:
     """Represents a version info provided in program version response."""

pyplumio/structures/regulator_data.py

@@ -36,10 +36,8 @@ class RegulatorDataStructure(StructureDecoder):
         if isinstance(data_type, BitArray):
             self._bitarray_index = data_type.next(self._bitarray_index)
 
-        try:
-            return data_type.value
-        finally:
-            self._offset += data_type.size
+        self._offset += data_type.size
+        return data_type.value
 
     def decode(
         self, message: bytearray, offset: int = 0, data: dict[str, Any] | None = None

pyplumio/structures/regulator_data_schema.py

@@ -21,9 +21,8 @@ class RegulatorDataSchemaStructure(StructureDecoder):
     def _unpack_block(self, message: bytearray) -> tuple[int, DataType]:
         """Unpack a block."""
         param_type = message[self._offset]
-        self._offset += 1
-        param_id = UnsignedShort.from_bytes(message, self._offset)
-        self._offset += param_id.size
+        param_id = UnsignedShort.from_bytes(message, self._offset + 1)
+        self._offset += param_id.size + 1
         return param_id.value, DATA_TYPES[param_type]()
 
     def decode(

pyplumio/structures/schedules.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from collections.abc import Sequence
 from dataclasses import dataclass
 from functools import reduce
-from itertools import chain
 from typing import Any, Final
 
 from dataslots import dataslots
@@ -17,7 +16,7 @@ from pyplumio.const import (
     ATTR_TYPE,
     FrameType,
 )
-from pyplumio.devices import AddressableDevice, Device
+from pyplumio.devices import Device, PhysicalDevice
 from pyplumio.exceptions import FrameDataError
 from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
@@ -96,7 +95,7 @@ class ScheduleParameter(Parameter):
 
     __slots__ = ()
 
-    device: AddressableDevice
+    device: PhysicalDevice
     description: ScheduleParameterDescription
 
     async def create_request(self) -> Request:
@@ -137,17 +136,14 @@ class ScheduleSwitch(ScheduleParameter, Switch):
     description: ScheduleSwitchDescription
 
 
-SCHEDULE_PARAMETERS: list[ScheduleParameterDescription] = list(
-    chain.from_iterable(
-        [
-            [
-                ScheduleSwitchDescription(name=f"{name}_{ATTR_SCHEDULE_SWITCH}"),
-                ScheduleNumberDescription(name=f"{name}_{ATTR_SCHEDULE_PARAMETER}"),
-            ]
-            for name in SCHEDULES
-        ]
-    )
-)
+SCHEDULE_PARAMETERS: list[ScheduleParameterDescription] = [
+    description
+    for name in SCHEDULES
+    for description in [
+        ScheduleSwitchDescription(name=f"{name}_{ATTR_SCHEDULE_SWITCH}"),
+        ScheduleNumberDescription(name=f"{name}_{ATTR_SCHEDULE_PARAMETER}"),
+    ]
+]
 
 
 def collect_schedule_data(name: str, device: Device) -> dict[str, Any]:
@@ -179,31 +175,35 @@ class SchedulesStructure(Structure):
 
     def encode(self, data: dict[str, Any]) -> bytearray:
         """Encode data to the bytearray message."""
-        message = bytearray([1])
         try:
-            message.append(SCHEDULES.index(data[ATTR_TYPE]))
-            message.append(int(data[ATTR_SWITCH]))
-            message.append(int(data[ATTR_PARAMETER]))
+            header = bytearray(
+                b"\1"
+                + SCHEDULES.index(data[ATTR_TYPE]).to_bytes(
+                    length=1, byteorder="little"
+                )
+                + int(data[ATTR_SWITCH]).to_bytes(length=1, byteorder="little")
+                + int(data[ATTR_PARAMETER]).to_bytes(length=1, byteorder="little")
+            )
             schedule = data[ATTR_SCHEDULE]
         except (KeyError, ValueError) as e:
             raise FrameDataError from e
 
-        return message + bytearray(
-            chain.from_iterable(
-                [_join_bits(day[i : i + 8]) for i in range(0, len(day), 8)]
-                for day in list(schedule)
-            )
+        return header + bytearray(
+            _join_bits(day[i : i + 8])
+            for day in schedule
+            for i in range(0, len(day), 8)
         )
 
     def _unpack_schedule(self, message: bytearray) -> list[list[bool]]:
         """Unpack a schedule."""
-        schedule: list[bool] = []
-        last_offset = self._offset + SCHEDULE_SIZE
-        while self._offset < last_offset:
-            schedule += _split_byte(message[self._offset])
-            self._offset += 1
-
-        # Split schedule. Each day consists of 48 half-hour intervals.
+        offset = self._offset
+        schedule = [
+            bit
+            for i in range(offset, offset + SCHEDULE_SIZE)
+            for bit in _split_byte(message[i])
+        ]
+        self._offset = offset + SCHEDULE_SIZE
+        # Split the schedule. Each day consists of 48 half-hour intervals.
         return [schedule[i : i + 48] for i in range(0, len(schedule), 48)]
 
     def decode(
@@ -211,17 +211,15 @@ class SchedulesStructure(Structure):
     ) -> tuple[dict[str, Any], int]:
         """Decode bytes and return message data and offset."""
         try:
-            offset += 1
-            start = message[offset]
-            offset += 1
-            end = message[offset]
+            start = message[offset + 1]
+            end = message[offset + 2]
         except IndexError:
             return ensure_dict(data, {ATTR_SCHEDULES: []}), offset
 
-        self._offset = offset + 1
         schedules: list[tuple[int, list[list[bool]]]] = []
         parameters: list[tuple[int, ParameterValues]] = []
 
+        self._offset = offset + 3
         for _ in range(start, start + end):
             index = message[self._offset]
             switch = ParameterValues(

pyplumio/structures/thermostat_parameters.py

@@ -18,7 +18,6 @@ from pyplumio.const import (
 )
 from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
-    SET_TIMEOUT,
     Number,
     NumberDescription,
     Parameter,
@@ -48,7 +47,6 @@ class ThermostatParameterDescription(ParameterDescription):
 
     __slots__ = ()
 
-    multiplier: float = 1.0
     size: int = 1
 
 
@@ -94,6 +92,8 @@ class ThermostatParameter(Parameter):
 class ThermostatNumberDescription(ThermostatParameterDescription, NumberDescription):
     """Represent a thermostat number description."""
 
+    multiplier: float = 1.0
+
 
 class ThermostatNumber(ThermostatParameter, Number):
     """Represents a thermostat number."""
@@ -102,10 +102,12 @@ class ThermostatNumber(ThermostatParameter, Number):
 
     description: ThermostatNumberDescription
 
-    async def set(self, value: int | float, retries: int = SET_TIMEOUT) -> bool:
+    async def set(
+        self, value: int | float, retries: int = 5, timeout: float = 5.0
+    ) -> bool:
         """Set a parameter value."""
         value = value / self.description.multiplier
-        return await super().set(value, retries)
+        return await super().set(value, retries, timeout)
 
     @property
     def value(self) -> float:

pyplumio/structures/thermostat_sensors.py

@@ -36,25 +36,28 @@ class ThermostatSensorsStructure(StructureDecoder):
         self, message: bytearray, contacts: int
     ) -> dict[str, Any] | None:
         """Unpack sensors for a thermostat."""
-        state = message[self._offset]
-        self._offset += 1
-        current_temp = Float.from_bytes(message, self._offset)
-        self._offset += current_temp.size
-        target_temp = Float.from_bytes(message, self._offset)
-        self._offset += target_temp.size
+        offset = self._offset
+        state = message[offset]
+        offset += 1
+        current_temp = Float.from_bytes(message, offset)
+        offset += current_temp.size
+        target_temp = Float.from_bytes(message, offset)
+        offset += target_temp.size
 
         try:
-            if not math.isnan(current_temp.value) and target_temp.value > 0:
-                return {
+            return (
+                {
                     ATTR_STATE: state,
                     ATTR_CURRENT_TEMP: current_temp.value,
                     ATTR_TARGET_TEMP: target_temp.value,
                     ATTR_CONTACTS: bool(contacts & self._contact_mask),
                     ATTR_SCHEDULE: bool(contacts & self._schedule_mask),
                 }
-
-            return None
+                if not math.isnan(current_temp.value) and target_temp.value > 0
+                else None
+            )
         finally:
+            self._offset = offset
             self._contact_mask <<= 1
             self._schedule_mask <<= 1
 

PyPlumIO-0.5.25.dist-info/RECORD

@@ -1,60 +0,0 @@
-pyplumio/__init__.py,sha256=ditJTIOFGJDg60atHzOpiggdUrZHpSynno7MtpZUGVk,3299
-pyplumio/__main__.py,sha256=3IwHHSq-iay5FaeMc95klobe-xv82yydSKcBE7BFZ6M,500
-pyplumio/_version.py,sha256=NdqvDMFnl0hh-C5MLFStVcNIuOZiaethGZ5YrUJK1Bg,413
-pyplumio/connection.py,sha256=6mUbcjGxxEhMVIbzZgCqH-Ez-fcYoRj7ZbVSzpikpNA,5949
-pyplumio/const.py,sha256=8rpiVbVb5R_6Rm6J2sgCnaVrkD-2Fzhd1RYMz0MBgwo,3915
-pyplumio/exceptions.py,sha256=Wn-y5AJ5xfaBlHhTUVKB27_0Us8_OVHqh-sicnr9sYA,700
-pyplumio/filters.py,sha256=IZkvrRAHdv6s3CplK73mHomRHpo3rnoyX2u26FVr9XU,11386
-pyplumio/protocol.py,sha256=e6-ns5i5DWlFD5tKot-kQtmZt3CJMFK6zFa5RMIKshw,8140
-pyplumio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyplumio/stream.py,sha256=IVCQFKBtRafRgUkr93p_wN5mXZAD3Jw1d091dfEIK20,4479
-pyplumio/utils.py,sha256=TnBzRopinyp92wruguijxcIYmaeyNVTFX0dygI5FCMU,823
-pyplumio/devices/__init__.py,sha256=sb4wFJSM-j1rwJGQ0G7RSCF1t9-ZEwKzJl9mFrSr0EI,6564
-pyplumio/devices/ecomax.py,sha256=jaIX0LySnryPrwFsYH4ES7U52P3ZaAxTdMKJAJ_XY5Q,16949
-pyplumio/devices/ecoster.py,sha256=J4YtPmFmFwaq4LzYf28aMmB97cRAbMsVyUdBLGki42g,313
-pyplumio/devices/mixer.py,sha256=pxZXoAOrZ52OxMirZdoCtbJ4b2yHg1A2Kn_QPZZqynQ,3271
-pyplumio/devices/thermostat.py,sha256=9jI_cacIQoFq_ImAqAYhcnAx7PVO3FWZz4WdfatGNiw,2607
-pyplumio/frames/__init__.py,sha256=uMjLWY0rCbCTBfXafA_TSfLORYBT0wLyhHSZEePsRxw,7504
-pyplumio/frames/messages.py,sha256=7vyOjcxGDnaRlyB4jPsCt00yCc3Axme8NN7uK922DS8,3622
-pyplumio/frames/requests.py,sha256=Ra8xH5oKYhkEUtadN-9ZsJKkt5xZkz5O7edQVsDhNsM,7221
-pyplumio/frames/responses.py,sha256=j4awA2-MfsoPdENC4Fvae4_Oa70rDhH19ebmEoAqhh8,6532
-pyplumio/helpers/__init__.py,sha256=H2xxdkF-9uADLwEbfBUoxNTdwru3L5Z2cfJjgsuRsn0,31
-pyplumio/helpers/data_types.py,sha256=ADizMys0jq_uKIJvN8KZcL41qBgkkiqy6wSBOrr8mTE,8273
-pyplumio/helpers/event_manager.py,sha256=yH_VjEvIkuYwk31qb3rXtFDfKAStbA-YWWc4ED17jVI,6443
-pyplumio/helpers/factory.py,sha256=eiTkYUCernUn0VNDDdEN4IyjNPrXK8vnJESXyLaqFzE,1017
-pyplumio/helpers/parameter.py,sha256=SSAzIMmx0g5VMurzT-9Ys5ZaMlNbcKxcGfbzZWreXeM,11404
-pyplumio/helpers/schedule.py,sha256=-IZJ-CU4PhFlsE586wTw--ovDrTo2Hs4JneCHhc0e-Y,5013
-pyplumio/helpers/task_manager.py,sha256=HAd69yGTRL0zQsu-ywnbLu1UXiJzgHWuhYWA--vs4lQ,1181
-pyplumio/helpers/timeout.py,sha256=XM58yaz93cNsxW7Ok6hfBw8i_92HdsGFQVBhpqbCZ70,770
-pyplumio/helpers/uid.py,sha256=J7gN8i8LE0g6tfL66BJbwsQQqzBBxWx7giyvqaJh4BM,976
-pyplumio/structures/__init__.py,sha256=EjK-5qJZ0F7lpP2b6epvTMg9cIBl4Kn91nqNkEcLwTc,1299
-pyplumio/structures/alerts.py,sha256=wX58xWr1dJgZiQtEEMLRu8bcu6dTcc-aqEIY69gYGu0,3640
-pyplumio/structures/boiler_load.py,sha256=p3mOzZUU-g7A2tG_yp8podEqpI81hlsOZmHELyPNRY8,838
-pyplumio/structures/boiler_power.py,sha256=72qsvccg49FdRdXv2f2K5sGpjT7wAOLFjlIGWpO-DVg,901
-pyplumio/structures/ecomax_parameters.py,sha256=a7sq2yhUSt6XiZWv48KkClWyjxsGAEJbES13-sx6G78,27710
-pyplumio/structures/fan_power.py,sha256=Q5fv-7_2NVuLeQPIVIylvgN7M8-a9D8rRUE0QGjyS3w,871
-pyplumio/structures/frame_versions.py,sha256=OMWU8tjnsrRWQsMSbmCJCmiKDwBmA75BcPZ6CqvKMLc,1566
-pyplumio/structures/fuel_consumption.py,sha256=_p2dI4H67Eopn7IF0Gj77A8c_8lNKhhDDAtmugxLd4s,976
-pyplumio/structures/fuel_level.py,sha256=mJpp1dnRD1wXi_6EyNX7TNXosjcr905rSHOnuZ5VD74,1069
-pyplumio/structures/lambda_sensor.py,sha256=JNSCiBJoM8Uk3OGbmFIigaLOntQST5U_UrmCpaQBlM0,1595
-pyplumio/structures/mixer_parameters.py,sha256=BQXC6vHx_b0OL-T6IU3bi2trjarLmlcMU1mmM5Q3AbI,8871
-pyplumio/structures/mixer_sensors.py,sha256=O91929Ts1YXFmKdPRc1r_BYDgrqkv5QVtE1nGzLpuAI,2260
-pyplumio/structures/modules.py,sha256=ukju4TQmRRJfgl94QU4zytZLU5px8nw3sgfSLn9JysU,2520
-pyplumio/structures/network_info.py,sha256=rxGoTdjlUmgEzR4BjOh9XQgEqKI6OSIbhOJ8tsXocts,4063
-pyplumio/structures/output_flags.py,sha256=07N0kxlvR5WZAURuChk_BqSiXR8eaQrtI5qlkgCf4Yc,1345
-pyplumio/structures/outputs.py,sha256=1xsJPkjN643-aFawqVoupGatUIUJfQG_g252n051Qi0,1916
-pyplumio/structures/pending_alerts.py,sha256=Uq9WpB4MW9AhDkqmDhk-g0J0h4pVq0Q50z12dYEv6kY,739
-pyplumio/structures/product_info.py,sha256=uiEN6DFQlzmBvQByTirFzXQShoex0YGdFS9WI-MAxPc,2405
-pyplumio/structures/program_version.py,sha256=p3Hzn1igxGyZ99jJjPswNGCAAQdJ5_-sgZPIy-MGISI,2506
-pyplumio/structures/regulator_data.py,sha256=Dun3RjfHHoV2W5RTSQcAimBL0Or3O957vYQj7Pbi7CM,2309
-pyplumio/structures/regulator_data_schema.py,sha256=BMshEpiP-lwTgSkbTuow9KlxCwKwQXV0nFPcBpW0SJg,1505
-pyplumio/structures/schedules.py,sha256=tm5DVCUnJ3FTUMl8wPGgM5_DsL_9R_UQqx5bfPAuvUM,6717
-pyplumio/structures/statuses.py,sha256=wkoynyMRr1VREwfBC6vU48kPA8ZQ83pcXuciy2xHJrk,1166
-pyplumio/structures/temperatures.py,sha256=1CDzehNmbALz1Jyt_9gZNIk52q6Wv-xQXjijVDCVYec,2337
-pyplumio/structures/thermostat_parameters.py,sha256=ybsab49teETR8pMsSCmPidNe5IclTq8tj7uxtHXGEAY,8045
-pyplumio/structures/thermostat_sensors.py,sha256=ZmjWgYtTZ5M8Lnz_Q5N4JD8G3MvEmByPFjYsy6XZOmo,3177
-PyPlumIO-0.5.25.dist-info/LICENSE,sha256=m-UuZFjXJ22uPTGm9kSHS8bqjsf5T8k2wL9bJn1Y04o,1088
-PyPlumIO-0.5.25.dist-info/METADATA,sha256=Nj3fV0EWvpmH1HJQN1SOfjNl2_llPNjsUbZLkJUmkME,5490
-PyPlumIO-0.5.25.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-PyPlumIO-0.5.25.dist-info/top_level.txt,sha256=kNBz9UPPkPD9teDn3U_sEy5LjzwLm9KfADCXtBlbw8A,9
-PyPlumIO-0.5.25.dist-info/RECORD,,