Shorten function-names, clean-up

Author: bouwew

plugwise/__init__.py

@@ -323,14 +323,14 @@ async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
         await self._smile_api.set_temperature(loc_id, items)
 
-    async def set_number_setpoint(
+    async def set_number(
         self,
         key: str,
         temperature: float,
         dev_id: str | None = None,
     ) -> None:
         """Set the max. Boiler or DHW setpoint on the Central Heating boiler."""
-        await self._smile_api.set_number_setpoint(key, temperature, dev_id)
+        await self._smile_api.set_number(key, temperature, dev_id)
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str

plugwise/legacy/smile.py

@@ -154,7 +154,7 @@ async def set_dhw_mode(self, mode: str) -> None:
     async def set_gateway_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
 
-    async def set_number_setpoint(self, key: str, temperature: float) -> None:
+    async def set_number(self, key: str, temperature: float, dev_id: str) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_preset(self, _: str, preset: str) -> None:
@@ -268,6 +268,3 @@ async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         )
 
         await self._request(uri, method="put", data=data)
-
-    async def set_temperature_offset(self, dev_id: str, offset: float) -> None:
-        """Set-function placeholder for legacy devices."""

plugwise/smile.py

@@ -182,15 +182,17 @@ async def set_gateway_mode(self, mode: str) -> None:
 
         await self._request(uri, method="put", data=data)
 
-    async def set_number_setpoint(
+    async def set_number(
         self,
         key: str,
         temperature: float,
         dev_id: str | None,
     ) -> None:
-        """Set the max. Boiler or DHW setpoint on the Central Heating boiler."""
+        """Set the maximum boiler- or DHW-setpoint on the Central Heating boiler,
+        or the temperature-offset on a Thermostat.
+        """
         if dev_id is not None:
-            await self.set_temperature_offset(dev_id, temperature)
+            await self.set_offset(dev_id, temperature)
             return
 
         temp = str(temperature)
@@ -208,7 +210,7 @@ async def set_number_setpoint(
         data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
         await self._request(uri, method="put", data=data)
 
-    async def set_temperature_offset(self, dev_id: str, offset: float) -> None:
+    async def set_offset(self, dev_id: str, offset: float) -> None:
         """Set the Temperature offset for thermostats that support this feature."""
         if dev_id not in self.therms_with_offset_func:
             raise PlugwiseError(

tests/test_init.py

@@ -876,7 +876,7 @@ async def tinker_max_boiler_temp(smile):
         _LOGGER.info("- Adjusting temperature to %s", new_temp)
         for test in ["maximum_boiler_temperature", "bogus_temperature"]:
             try:
-                await smile.set_number_setpoint(test, new_temp)
+                await smile.set_number(test, new_temp)
                 _LOGGER.info("  + tinker_max_boiler_temp worked as intended")
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + tinker_max_boiler_temp failed as intended")
@@ -887,7 +887,7 @@ async def tinker_temp_offset(smile, dev_id):
         new_offset = 1.0
         _LOGGER.info("- Adjusting temperature offset to %s", new_offset)
         try:
-            await smile.set_number_setpoint("dummy", new_offset, dev_id=dev_id)
+            await smile.set_number("dummy", new_offset, dev_id=dev_id)
             _LOGGER.info("  + tinker_temp_offset worked as intended")
             return True
         except pw_exceptions.PlugwiseError: