PyPlumIO 0.5.34__tar.gz → 0.5.35__tar.gz

{pyplumio-0.5.34 → pyplumio-0.5.35}/PKG-INFO

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

{pyplumio-0.5.34 → pyplumio-0.5.35}/PyPlumIO.egg-info/PKG-INFO

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

{pyplumio-0.5.34 → pyplumio-0.5.35}/pyplumio/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.34'
-__version_tuple__ = version_tuple = (0, 5, 34)
+__version__ = version = '0.5.35'
+__version_tuple__ = version_tuple = (0, 5, 35)

{pyplumio-0.5.34 → pyplumio-0.5.35}/pyplumio/devices/__init__.py

@@ -9,7 +9,7 @@ import logging
 from typing import Any, ClassVar
 
 from pyplumio.const import ATTR_FRAME_ERRORS, ATTR_LOADED, DeviceType, FrameType
-from pyplumio.exceptions import UnknownDeviceError
+from pyplumio.exceptions import RequestError, UnknownDeviceError
 from pyplumio.frames import DataFrameDescription, Frame, Request, is_known_frame_type
 from pyplumio.helpers.event_manager import EventManager
 from pyplumio.helpers.factory import create_instance
@@ -180,7 +180,7 @@ class PhysicalDevice(Device, ABC):
         )
 
         errors = [
-            result.args[1] for result in results if isinstance(result, BaseException)
+            result.args[1] for result in results if isinstance(result, RequestError)
         ]
 
         await asyncio.gather(
@@ -203,9 +203,10 @@ class PhysicalDevice(Device, ABC):
             except asyncio.TimeoutError:
                 retries -= 1
 
-        raise ValueError(
+        raise RequestError(
             f"Failed to request parameter '{name}' with frame type '{frame_type}' "
-            f"after {retries} retries."
+            f"after {retries} retries.",
+            frame_type,
         )
 
     @classmethod

{pyplumio-0.5.34 → pyplumio-0.5.35}/pyplumio/exceptions.py

@@ -15,6 +15,10 @@ class ProtocolError(PyPlumIOError):
     """Base class for protocol-related errors."""
 
 
+class RequestError(PyPlumIOError):
+    """Raised on request error."""
+
+
 class ReadError(ProtocolError):
     """Raised on read error."""
 

{pyplumio-0.5.34 → pyplumio-0.5.35}/pyplumio/helpers/parameter.py

@@ -217,7 +217,7 @@ class Parameter(ABC):
         while self.pending_update:
             if retries <= 0:
                 _LOGGER.warning(
-                    "Failed to set parameter '%s' after %d retries",
+                    "Unable to confirm that parameter '%s' was set after %d retries",
                     self.description.name,
                     retries,
                 )

{pyplumio-0.5.34 → pyplumio-0.5.35}/tests/helpers/test_parameter.py

@@ -268,7 +268,10 @@ async def test_number_request_with_unchanged_value(
     assert number.pending_update
     assert mock_put.await_count == 3  # type: ignore [unreachable]
     mock_put.reset_mock()
-    assert "Failed to set parameter 'test_number' after 0 retries" in caplog.text
+    assert (
+        "Unable to confirm that parameter 'test_number' was set after 0 retries"
+        in caplog.text
+    )
     await number.set(5)
     mock_put.assert_not_awaited()
 
@@ -283,7 +286,10 @@ async def test_switch_request_with_unchanged_value(
     assert switch.pending_update
     assert mock_put.await_count == 3  # type: ignore [unreachable]
     mock_put.reset_mock()
-    assert "Failed to set parameter 'test_switch' after 0 retries" in caplog.text
+    assert (
+        "Unable to confirm that parameter 'test_switch' was set after 0 retries"
+        in caplog.text
+    )
     await switch.set(True)
     mock_put.assert_not_awaited()
 

{pyplumio-0.5.34 → pyplumio-0.5.35}/tests/test_devices.py

@@ -36,7 +36,7 @@ from pyplumio.devices.ecomax import (
 from pyplumio.devices.ecoster import EcoSTER
 from pyplumio.devices.mixer import Mixer
 from pyplumio.devices.thermostat import Thermostat
-from pyplumio.exceptions import UnknownDeviceError
+from pyplumio.exceptions import RequestError, UnknownDeviceError
 from pyplumio.frames import Response
 from pyplumio.frames.messages import RegulatorDataMessage, SensorDataMessage
 from pyplumio.frames.requests import (
@@ -144,7 +144,7 @@ async def test_async_setup_error() -> None:
         patch(
             "pyplumio.devices.ecomax.EcoMAX.request",
             side_effect=(
-                ValueError("test", FrameType.REQUEST_ALERTS),
+                RequestError("test", FrameType.REQUEST_ALERTS),
                 True,
                 True,
                 True,
@@ -597,7 +597,7 @@ async def test_request_error(ecomax: EcoMAX) -> None:
             "pyplumio.devices.ecomax.EcoMAX.get",
             side_effect=(asyncio.TimeoutError, asyncio.TimeoutError),
         ),
-        pytest.raises(ValueError),
+        pytest.raises(RequestError),
     ):
         await ecomax.request("foo", FrameType.REQUEST_ALERTS, retries=1)