PyPlumIO 0.5.41__tar.gz → 0.5.42__tar.gz

{pyplumio-0.5.41 → pyplumio-0.5.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.5.41
+Version: 0.5.42
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.41 → pyplumio-0.5.42}/PyPlumIO.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPlumIO
-Version: 0.5.41
+Version: 0.5.42
 Summary: PyPlumIO is a native ecoNET library for Plum ecoMAX controllers.
 Author-email: Denis Paavilainen <denpa@denpa.pro>
 License: MIT License

{pyplumio-0.5.41 → pyplumio-0.5.42}/pyplumio/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.41'
-__version_tuple__ = version_tuple = (0, 5, 41)
+__version__ = version = '0.5.42'
+__version_tuple__ = version_tuple = (0, 5, 42)

{pyplumio-0.5.41 → pyplumio-0.5.42}/pyplumio/helpers/parameter.py

@@ -13,6 +13,7 @@ from typing_extensions import TypeAlias
 
 from pyplumio.const import BYTE_UNDEFINED, STATE_OFF, STATE_ON, State, UnitOfMeasurement
 from pyplumio.frames import Request
+from pyplumio.utils import is_divisible
 
 if TYPE_CHECKING:
     from pyplumio.devices import Device
@@ -286,6 +287,8 @@ class Parameter(ABC):
 class NumberDescription(ParameterDescription):
     """Represents a parameter description."""
 
+    step: float = 1.0
+    precision: int = 6
     unit_of_measurement: UnitOfMeasurement | Literal["%"] | None = None
 
 
@@ -298,18 +301,24 @@ class Number(Parameter):
 
     def _pack_value(self, value: NumericType) -> int:
         """Pack the parameter value."""
-        return int(value)
+        return int(round(value / self.description.step))
 
     def _unpack_value(self, value: int) -> NumericType:
         """Unpack the parameter value."""
-        return value
+        return round(value * self.description.step, self.description.precision)
 
     def validate(self, value: Any) -> bool:
         """Validate a parameter value."""
         if value < self.min_value or value > self.max_value:
             raise ValueError(
-                f"Invalid number value: {value}. Must be between "
-                f"{self.min_value} and {self.max_value}."
+                f"Invalid value: {value}. The value must be between {self.min_value} "
+                f"and {self.max_value}."
+            )
+
+        if not is_divisible(value, self.description.step, self.description.precision):
+            raise ValueError(
+                f"Invalid value: {value}. The value must be adjusted in increments of "
+                f"{self.description.step}."
             )
 
         return True

{pyplumio-0.5.41 → pyplumio-0.5.42}/pyplumio/structures/ecomax_parameters.py

@@ -33,7 +33,7 @@ from pyplumio.helpers.parameter import (
 )
 from pyplumio.structures import StructureDecoder
 from pyplumio.structures.thermostat_parameters import ATTR_THERMOSTAT_PROFILE
-from pyplumio.utils import ensure_dict, is_divisible
+from pyplumio.utils import ensure_dict
 
 if TYPE_CHECKING:
     from pyplumio.devices.ecomax import EcoMAX
@@ -90,9 +90,7 @@ class EcomaxParameter(Parameter):
 class EcomaxNumberDescription(EcomaxParameterDescription, NumberDescription):
     """Represents an ecoMAX number description."""
 
-    step: float = 1.0
     offset: int = 0
-    precision: int = 6
 
 
 class EcomaxNumber(EcomaxParameter, Number):
@@ -102,25 +100,13 @@ class EcomaxNumber(EcomaxParameter, Number):
 
     description: EcomaxNumberDescription
 
-    def validate(self, value: NumericType) -> bool:
-        """Validate the parameter value."""
-        if not is_divisible(value, self.description.step, self.description.precision):
-            raise ValueError(
-                f"Invalid value: {value}. The value must be adjusted in increments of "
-                f"{self.description.step}."
-            )
-
-        return super().validate(value)
-
     def _pack_value(self, value: NumericType) -> int:
         """Pack the parameter value."""
-        value += self.description.offset
-        return round(value / self.description.step)
+        return super()._pack_value(value + self.description.offset)
 
     def _unpack_value(self, value: int) -> NumericType:
         """Unpack the parameter value."""
-        value -= self.description.offset
-        return round(value * self.description.step, self.description.precision)
+        return super()._unpack_value(value - self.description.offset)
 
 
 @dataslots

{pyplumio-0.5.41 → pyplumio-0.5.42}/pyplumio/structures/mixer_parameters.py

@@ -29,7 +29,7 @@ from pyplumio.helpers.parameter import (
     unpack_parameter,
 )
 from pyplumio.structures import StructureDecoder
-from pyplumio.utils import ensure_dict, is_divisible
+from pyplumio.utils import ensure_dict
 
 if TYPE_CHECKING:
     from pyplumio.devices.mixer import Mixer
@@ -72,9 +72,7 @@ class MixerParameter(Parameter):
 class MixerNumberDescription(MixerParameterDescription, NumberDescription):
     """Represent a mixer number description."""
 
-    step: float = 1.0
     offset: int = 0
-    precision: int = 6
 
 
 class MixerNumber(MixerParameter, Number):
@@ -84,25 +82,13 @@ class MixerNumber(MixerParameter, Number):
 
     description: MixerNumberDescription
 
-    def validate(self, value: NumericType) -> bool:
-        """Validate the parameter value."""
-        if not is_divisible(value, self.description.step, self.description.precision):
-            raise ValueError(
-                f"Invalid value: {value}. The value must be adjusted in increments of "
-                f"{self.description.step}."
-            )
-
-        return super().validate(value)
-
     def _pack_value(self, value: NumericType) -> int:
         """Pack the parameter value."""
-        value += self.description.offset
-        return round(value / self.description.step)
+        return super()._pack_value(value + self.description.offset)
 
     def _unpack_value(self, value: int) -> NumericType:
         """Unpack the parameter value."""
-        value -= self.description.offset
-        return round(value * self.description.step, self.description.precision)
+        return super()._unpack_value(value - self.description.offset)
 
 
 @dataslots

{pyplumio-0.5.41 → pyplumio-0.5.42}/pyplumio/structures/thermostat_parameters.py

@@ -20,7 +20,6 @@ from pyplumio.frames import Request
 from pyplumio.helpers.parameter import (
     Number,
     NumberDescription,
-    NumericType,
     Parameter,
     ParameterDescription,
     ParameterValues,
@@ -30,7 +29,7 @@ from pyplumio.helpers.parameter import (
 )
 from pyplumio.structures import StructureDecoder
 from pyplumio.structures.thermostat_sensors import ATTR_THERMOSTATS_AVAILABLE
-from pyplumio.utils import ensure_dict, is_divisible
+from pyplumio.utils import ensure_dict
 
 if TYPE_CHECKING:
     from pyplumio.devices.thermostat import Thermostat
@@ -93,9 +92,6 @@ class ThermostatParameter(Parameter):
 class ThermostatNumberDescription(ThermostatParameterDescription, NumberDescription):
     """Represent a thermostat number description."""
 
-    step: float = 1.0
-    precision: int = 6
-
 
 class ThermostatNumber(ThermostatParameter, Number):
     """Represents a thermostat number."""
@@ -104,24 +100,6 @@ class ThermostatNumber(ThermostatParameter, Number):
 
     description: ThermostatNumberDescription
 
-    def validate(self, value: NumericType) -> bool:
-        """Validate the parameter value."""
-        if not is_divisible(value, self.description.step, self.description.precision):
-            raise ValueError(
-                f"Invalid value: {value}. The value must be adjusted in increments of "
-                f"{self.description.step}."
-            )
-
-        return super().validate(value)
-
-    def _pack_value(self, value: NumericType) -> int:
-        """Pack the parameter value."""
-        return round(value / self.description.step)
-
-    def _unpack_value(self, value: int) -> NumericType:
-        """Unpack the parameter value."""
-        return round(value * self.description.step, self.description.precision)
-
 
 @dataslots
 @dataclass

{pyplumio-0.5.41 → pyplumio-0.5.42}/tests/helpers/test_parameter.py

@@ -285,7 +285,8 @@ def test_number_repr(number: Number) -> None:
     """Test a number representation."""
     assert repr(number) == (
         f"Number(device={number.device}, "
-        "description=NumberDescription(name='test_number', optimistic=False, "
+        "description=NumberDescription("
+        "name='test_number', optimistic=False, step=1.0, precision=6, "
         "unit_of_measurement=<UnitOfMeasurement.CELSIUS: '°C'>), "
         "values=ParameterValues(value=1, min_value=0, max_value=5), "
         "index=0)"