Merge pull request #640 from plugwise/pw_command_number

Implement `@plugwise_command` for the Number platform
plugwise · May 14, 2024 · 9d8359f · 9d8359f
2 parents 3a38069 + 63e648f
commit 9d8359f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 29 deletions.
diff --git a/custom_components/plugwise/manifest.json b/custom_components/plugwise/manifest.json
@@ -8,6 +8,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
-  "requirements": ["plugwise==0.37.3"],
-  "version": "0.50.0"
+  "requirements": ["plugwise==0.37.5"],
+  "version": "0.50.1a0"
 }
diff --git a/custom_components/plugwise/number.py b/custom_components/plugwise/number.py
@@ -1,11 +1,8 @@
 """Number platform for Plugwise integration."""
 from __future__ import annotations
 
-from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 
-from plugwise import Smile
-
 from homeassistant.components.number import (
     NumberDeviceClass,
     NumberEntity,
@@ -29,43 +26,34 @@
 )
 from .coordinator import PlugwiseDataUpdateCoordinator
 from .entity import PlugwiseEntity, get_coordinator
+from .util import plugwise_command
 
 
 @dataclass(frozen=True, kw_only=True)
 class PlugwiseNumberEntityDescription(NumberEntityDescription):
     """Class describing Plugwise Number entities."""
 
-    command: Callable[[Smile, str, str, float], Awaitable[None]]
     key: NumberType
 
 
 NUMBER_TYPES = (
     PlugwiseNumberEntityDescription(
         key=MAX_BOILER_TEMP,
         translation_key=MAX_BOILER_TEMP,
-        command=lambda api, number, dev_id, value: api.set_number_setpoint(
-            number, dev_id, value
-        ),
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     PlugwiseNumberEntityDescription(
         key=MAX_DHW_TEMP,
         translation_key=MAX_DHW_TEMP,
-        command=lambda api, number, dev_id, value: api.set_number_setpoint(
-            number, dev_id, value
-        ),
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     PlugwiseNumberEntityDescription(
         key=TEMPERATURE_OFFSET,
         translation_key=TEMPERATURE_OFFSET,
-        command=lambda api, number, dev_id, value: api.set_temperature_offset(
-            number, dev_id, value
-        ),
         device_class=NumberDeviceClass.TEMPERATURE,
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
@@ -136,12 +124,10 @@ def native_value(self) -> float:
         """Return the present setpoint value."""
         return self.device[self.entity_description.key]["setpoint"]
 
+    @plugwise_command
     async def async_set_native_value(self, value: float) -> None:
         """Change to the new setpoint value."""
-        await self.entity_description.command(
-            self.coordinator.api, self.entity_description.key, self.device_id, value
-        )
+        await self.coordinator.api.set_number(self.device_id, self.entity_description.key, value)
         LOGGER.debug(
-            "Setting %s to %s was successful", self.entity_description.name, value
+            "Setting %s to %s was successful", self.entity_description.key, value
         )
-        await self.coordinator.async_request_refresh()
diff --git a/tests/components/plugwise/test_number.py b/tests/components/plugwise/test_number.py
@@ -32,9 +32,9 @@ async def test_anna_max_boiler_temp_change(
         blocking=True,
     )
 
-    assert mock_smile_anna.set_number_setpoint.call_count == 1
-    mock_smile_anna.set_number_setpoint.assert_called_with(
-        "maximum_boiler_temperature", "1cbf783bb11e4a7c8a6843dee3a86927", 65.0
+    assert mock_smile_anna.set_number.call_count == 1
+    mock_smile_anna.set_number.assert_called_with(
+        "1cbf783bb11e4a7c8a6843dee3a86927", "maximum_boiler_temperature", 65.0
     )
 
 
@@ -52,9 +52,9 @@ async def test_adam_dhw_setpoint_change(
         blocking=True,
     )
 
-    assert mock_smile_adam_2.set_number_setpoint.call_count == 1
-    mock_smile_adam_2.set_number_setpoint.assert_called_with(
-        "max_dhw_temperature", "056ee145a816487eaa69243c3280f8bf", 55.0
+    assert mock_smile_adam_2.set_number.call_count == 1
+    mock_smile_adam_2.set_number.assert_called_with(
+        "056ee145a816487eaa69243c3280f8bf", "max_dhw_temperature", 55.0
     )
 
 
@@ -84,7 +84,7 @@ async def test_adam_temperature_offset_change(
         blocking=True,
     )
 
-    assert mock_smile_adam.set_temperature_offset.call_count == 1
-    mock_smile_adam.set_temperature_offset.assert_called_with(
-        "temperature_offset", "6a3bf693d05e48e0b460c815a4fdd09d", 1.0
+    assert mock_smile_adam.set_number.call_count == 1
+    mock_smile_adam.set_number.assert_called_with(
+        "6a3bf693d05e48e0b460c815a4fdd09d", "temperature_offset", 1.0
     )