plugwise 0.37.2__tar.gz → 0.37.4__tar.gz

{plugwise-0.37.2 → plugwise-0.37.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.37.2
+Version: 0.37.4
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -35,7 +35,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.11.0

{plugwise-0.37.2 → plugwise-0.37.4}/plugwise/__init__.py

@@ -323,13 +323,14 @@ class Smile(SmileComm):
         """Set the given Temperature on the relevant Thermostat."""
         await self._smile_api.set_temperature(loc_id, items)
 
-    async def set_number_setpoint(self, key: str, _: str, temperature: float) -> None:
+    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)
-
-    async def set_temperature_offset(self, _: str, dev_id: str, offset: float) -> None:
-        """Set the Temperature offset for thermostats that support this feature."""
-        await self._smile_api.set_temperature_offset(dev_id, offset)
+        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-0.37.2 → plugwise-0.37.4}/plugwise/legacy/smile.py

@@ -154,7 +154,12 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
     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,
+    ) -> None:
         """Set-function placeholder for legacy devices."""
 
     async def set_preset(self, _: str, preset: str) -> None:
@@ -249,8 +254,12 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
 
             await self._request(uri, method="put", data=data)
 
-    async def set_temperature(self, setpoint: str, _: dict[str, float]) -> None:
+    async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
+        setpoint: float | None = None
+        if "setpoint" in items:
+            setpoint = items["setpoint"]
+
         if setpoint is None:
             raise PlugwiseError(
                 "Plugwise: failed setting temperature: no valid input provided"
@@ -264,6 +273,3 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         )
 
         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-0.37.2 → plugwise-0.37.4}/plugwise/smile.py

@@ -182,8 +182,17 @@ class SmileAPI(SmileComm, SmileData):
 
         await self._request(uri, method="put", data=data)
 
-    async def set_number_setpoint(self, key: str, temperature: float) -> None:
-        """Set the max. Boiler or DHW setpoint on the Central Heating boiler."""
+    async def set_number(
+        self,
+        key: str,
+        temperature: float,
+        dev_id: str | None,
+    ) -> None:
+        """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_offset(dev_id, temperature)
+            return
+
         temp = str(temperature)
         thermostat_id: str | None = None
         locator = f'appliance[@id="{self._heater_id}"]/actuator_functionalities/thermostat_functionality'
@@ -199,6 +208,19 @@ class SmileAPI(SmileComm, SmileData):
         data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
         await self._request(uri, method="put", data=data)
 
+    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(
+                "Plugwise: this device does not have temperature-offset capability."
+            )
+
+        value = str(offset)
+        uri = f"{APPLIANCES};id={dev_id}/offset;type=temperature_offset"
+        data = f"<offset_functionality><offset>{value}</offset></offset_functionality>"
+
+        await self._request(uri, method="put", data=data)
+
     async def set_preset(self, loc_id: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat - from LOCATIONS."""
         if (presets := self._presets(loc_id)) is None:
@@ -410,16 +432,3 @@ class SmileAPI(SmileComm, SmileData):
         )
 
         await self._request(uri, method="put", data=data)
-
-    async def set_temperature_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(
-                "Plugwise: this device does not have temperature-offset capability."
-            )
-
-        value = str(offset)
-        uri = f"{APPLIANCES};id={dev_id}/offset;type=temperature_offset"
-        data = f"<offset_functionality><offset>{value}</offset></offset_functionality>"
-
-        await self._request(uri, method="put", data=data)

{plugwise-0.37.2 → plugwise-0.37.4}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.37.2
+Version: 0.37.4
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -35,7 +35,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.11.0

{plugwise-0.37.2 → plugwise-0.37.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.37.2"
+version         = "0.37.4"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"
@@ -14,7 +14,6 @@ classifiers     = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: Home Automation",
 ]

{plugwise-0.37.2 → plugwise-0.37.4}/tests/test_init.py

@@ -686,30 +686,6 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
 
         return tinker_temp_passed
 
-    @pytest.mark.asyncio
-    async def tinker_legacy_thermostat_temp(self, smile, unhappy=False):
-        """Toggle temperature to test functionality."""
-        _LOGGER.info("Assert modifying temperature setpoint")
-        tinker_temp_passed = False
-        test_temp = 22.9
-        _LOGGER.info("- Adjusting temperature to %s", test_temp)
-        try:
-            await smile.set_temperature(test_temp, None)
-            _LOGGER.info("  + worked as intended")
-            tinker_temp_passed = True
-        except (
-            pw_exceptions.ErrorSendingCommandError,
-            pw_exceptions.ResponseError,
-        ):
-            if unhappy:
-                _LOGGER.info("  + failed as expected")
-                tinker_temp_passed = True
-            else:  # pragma: no cover
-                _LOGGER.info("  - failed unexpectedly")
-                tinker_temp_passed = False
-
-        return tinker_temp_passed
-
     @pytest.mark.asyncio
     async def tinker_thermostat_preset(self, smile, loc_id, unhappy=False):
         """Toggle preset to test functionality."""
@@ -843,9 +819,17 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         return result_1 and result_2 and result_3
 
     @pytest.mark.asyncio
-    async def tinker_legacy_thermostat(self, smile, schedule_on=True, unhappy=False):
+    async def tinker_legacy_thermostat(
+        self,
+        smile,
+        schedule_on=True,
+        block_cooling=False,
+        unhappy=False
+    ):
         """Toggle various climate settings to test functionality."""
-        result_1 = await self.tinker_legacy_thermostat_temp(smile, unhappy)
+        result_1 = await self.tinker_thermostat_temp(
+            smile, "dummy", block_cooling, unhappy
+        )
         result_2 = await self.tinker_thermostat_preset(smile, None, unhappy)
         result_3 = await self.tinker_legacy_thermostat_schedule(smile, unhappy)
         if schedule_on:
@@ -889,11 +873,10 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
     async def tinker_max_boiler_temp(smile):
         """Change max boiler temp setpoint to test functionality."""
         new_temp = 60.0
-        dev_id = None
         _LOGGER.info("- Adjusting temperature to %s", new_temp)
         for test in ["maximum_boiler_temperature", "bogus_temperature"]:
             try:
-                await smile.set_number_setpoint(test, dev_id, 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")
@@ -904,7 +887,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         new_offset = 1.0
         _LOGGER.info("- Adjusting temperature offset to %s", new_offset)
         try:
-            await smile.set_temperature_offset("dummy", dev_id, new_offset)
+            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: