PyPlumIO 0.5.31__tar.gz → 0.5.33__tar.gz

{pyplumio-0.5.31 → pyplumio-0.5.33}/PKG-INFO

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

{pyplumio-0.5.31 → pyplumio-0.5.33}/PyPlumIO.egg-info/PKG-INFO

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

{pyplumio-0.5.31 → pyplumio-0.5.33}/pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.31'
-__version_tuple__ = version_tuple = (0, 5, 31)
+__version__ = version = '0.5.33'
+__version_tuple__ = version_tuple = (0, 5, 33)

{pyplumio-0.5.31 → pyplumio-0.5.33}/pyplumio/devices/__init__.py

@@ -151,15 +151,12 @@ class PhysicalDevice(Device, ABC):
 
         self.subscribe(ATTR_FRAME_VERSIONS, update_frame_versions)
 
-    def has_frame_version(self, frame_type: int, version: int | None = None) -> bool:
+    def has_frame_version(self, frame_type: FrameType | int, version: int) -> bool:
         """Return True if frame data is up to date, False otherwise."""
-        if frame_type not in self._frame_versions:
-            return False
-
-        if version is None or self._frame_versions[frame_type] == version:
-            return True
-
-        return False
+        return (
+            frame_type in self._frame_versions
+            and self._frame_versions[frame_type] == version
+        )
 
     def supports_frame_type(self, frame_type: int) -> bool:
         """Check if frame type is supported by the device."""

{pyplumio-0.5.31 → pyplumio-0.5.33}/pyplumio/helpers/parameter.py

@@ -187,9 +187,6 @@ class Parameter(ABC):
     def validate(self, value: ParameterValue) -> int:
         """Validate a parameter value."""
         value = _normalize_parameter_value(value)
-        if value == self.values.value:
-            raise ValueError("Parameter value is unchanged.")
-
         if value < self.values.min_value or value > self.values.max_value:
             raise ValueError(
                 f"Value must be between '{self.min_value}' and '{self.max_value}'"
@@ -209,6 +206,10 @@ class Parameter(ABC):
         self, value: Any, retries: int = 5, timeout: float = 5.0
     ) -> bool:
         """Try to set a parameter value."""
+        if value == self.values.value:
+            # Value is unchanged
+            return True
+
         self._previous_value = self._values.value
         self._values.value = value
         self._pending_update = True

{pyplumio-0.5.31 → pyplumio-0.5.33}/tests/helpers/test_parameter.py

@@ -113,9 +113,6 @@ async def test_number_validate(number: Number) -> None:
     """Test the number validation."""
     assert number.validate(2)
 
-    with pytest.raises(ValueError):
-        number.validate(1)
-
     with pytest.raises(ValueError):
         number.validate(6)
 
@@ -135,9 +132,6 @@ async def test_switch_validate(switch: Switch) -> None:
     """Test the switch validation."""
     assert switch.validate(STATE_ON)
 
-    with pytest.raises(ValueError):
-        assert switch.validate(STATE_OFF)
-
     with pytest.raises(ValueError):
         switch.validate(2)
 
@@ -264,6 +258,36 @@ def test_switch_repr(switch: Switch) -> None:
     )
 
 
+@patch("asyncio.Queue.put")
+async def test_number_request_with_unchanged_value(
+    mock_put, number: Number, bypass_asyncio_sleep, caplog
+) -> None:
+    """Test that a frame doesn't get dispatched if it's value is unchanged."""
+    assert not number.pending_update
+    assert not await number.set(5, retries=3)
+    assert number.pending_update
+    assert mock_put.await_count == 3  # type: ignore [unreachable]
+    mock_put.reset_mock()
+    assert "Timed out while trying to set 'test_number' parameter" in caplog.text
+    await number.set(5)
+    mock_put.assert_not_awaited()
+
+
+@patch("asyncio.Queue.put")
+async def test_switch_request_with_unchanged_value(
+    mock_put, switch: Switch, bypass_asyncio_sleep, caplog
+) -> None:
+    """Test that a frame doesn't get dispatched if it's value is unchanged."""
+    assert not switch.pending_update
+    assert not await switch.set(True, retries=3)
+    assert switch.pending_update
+    assert mock_put.await_count == 3  # type: ignore [unreachable]
+    mock_put.reset_mock()
+    assert "Timed out while trying to set 'test_switch' parameter" in caplog.text
+    await switch.set(True)
+    mock_put.assert_not_awaited()
+
+
 @patch("pyplumio.helpers.parameter.Switch.set")
 async def test_switch_turn_on(mock_set, switch: Switch) -> None:
     """Test that switch can be turned on."""

{pyplumio-0.5.31 → pyplumio-0.5.33}/tests/test_devices.py

@@ -165,15 +165,11 @@ async def test_async_setup_error() -> None:
 
 async def test_frame_versions_update(ecomax: EcoMAX) -> None:
     """Test requesting updated frames."""
-    assert not ecomax.has_frame_version(RegulatorDataSchemaRequest.frame_type)
     test_data = load_json_test_data("messages/sensor_data.json")[0]
     with patch("asyncio.Queue.put_nowait") as mock_put_nowait:
         ecomax.handle_frame(SensorDataMessage(message=test_data["message"]))
         await ecomax.wait_until_done()
 
-    assert not ecomax.has_frame_version(RegulatorDataSchemaRequest.frame_type, 0)
-    assert ecomax.has_frame_version(RegulatorDataSchemaRequest.frame_type, 45559)
-
     mock_put_nowait.assert_has_calls(
         [
             call(RegulatorDataSchemaRequest(recipient=DeviceType.ECOMAX)),