Merge pull request #201 from plugwise/pre_0_18_6

`max_boiler_temperature` related fix/update

Author: bouwew

.github/workflows/merge.yml

@@ -8,11 +8,12 @@ env:
   DEFAULT_PYTHON: 3.9
 
 # Only run on merges
-on: 
+on:
   pull_request:
     types: closed
     branches:
       - main
+      - 0_18_5_release
 
 jobs:
   publishing:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.18.6: Smile: Maximum_boiler_temperature related improvements
+- Improve set_max_boiler_temperature() function
+- Add lower/upper_bound and resolution for maximum_boiler_temperature
+
 # v0.18.5: Smile bugfix for #192
 
 # v0.18.4: Smile: schedule-related bug-fixes and clean-up

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.18.5"
+__version__ = "0.18.6"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/constants.py

@@ -503,6 +503,9 @@
         ATTR_NAME: "outdoor_air_temperature",
         ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
     },
+    "lower_bound": {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
+    "upper_bound": {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
+    "resolution": {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
 }
 
 # Known types of Smiles and Stretches

plugwise/helper.py

@@ -8,12 +8,12 @@
 
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from aiohttp import BasicAuth, ClientError, ClientResponse, ClientSession, ClientTimeout
+
+# Time related
+from dateutil import tz
 from dateutil.parser import parse
 from defusedxml import ElementTree as etree
 from munch import Munch
-
-# Time related
-import pytz
 from semver import VersionInfo
 
 from .constants import (
@@ -764,16 +764,17 @@ def _appliance_measurements(
                 data[name] = format_measure(appl_i_loc.text, ENERGY_WATT_HOUR)  # type: ignore [literal-required]
 
             # Thermostat actuator measurements
-            t_locator = f'.//actuator_functionalities/thermostat_functionality[type="thermostat"]/{measurement}'
-            if (t_function := appliance.find(t_locator)) is not None:
-                if new_name := attrs.get(ATTR_NAME):
-                    measurement = new_name
-
-                # Avoid double processing
-                if measurement == "setpoint":
-                    continue
+            for item in ["thermostat", "maximum_boiler_temperature"]:
+                t_locator = f'.//actuator_functionalities/thermostat_functionality[type="{item}"]/{measurement}'
+                if (t_function := appliance.find(t_locator)) is not None:
+                    if new_name := attrs.get(ATTR_NAME):
+                        measurement = new_name
+
+                    # Avoid double processing
+                    if measurement == "setpoint":
+                        continue
 
-                data[measurement] = format_measure(t_function.text, attrs[ATTR_UNIT_OF_MEASUREMENT])  # type: ignore [literal-required]
+                    data[measurement] = format_measure(t_function.text, attrs[ATTR_UNIT_OF_MEASUREMENT])  # type: ignore [literal-required]
 
         return data
 
@@ -1106,7 +1107,7 @@ def _last_used_schedule(self, loc_id: str, schedules: list[str]) -> str | None:
         if not schedules:
             return last_used  # pragma: no cover
 
-        epoch = dt.datetime(1970, 1, 1, tzinfo=pytz.utc)
+        epoch = dt.datetime(1970, 1, 1, tzinfo=tz.tzutc())
         schedules_dates: dict[str, float] = {}
 
         for name in schedules:

plugwise/smile.py

@@ -584,14 +584,16 @@ async def set_max_boiler_temperature(self, temperature: float) -> None:
         """Set the max. Boiler Temperature on the Central heating boiler."""
         temp = str(temperature)
         locator = f'appliance[@id="{self._heater_id}"]/actuator_functionalities/thermostat_functionality'
-        th_func = self._appliances.find(locator)
-        if th_func.find("type").text == "maximum_boiler_temperature":
-            thermostat_id = th_func.attrib["id"]
+        if th_func_list := self._appliances.findall(locator):
+            for th_func in th_func_list:
+                if th_func.find("type").text != "maximum_boiler_temperature":
+                    continue
 
-        uri = f"{APPLIANCES};id={self._heater_id}/thermostat;id={thermostat_id}"
-        data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
+                thermostat_id = th_func.attrib["id"]
+                uri = f"{APPLIANCES};id={self._heater_id}/thermostat;id={thermostat_id}"
+                data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
 
-        await self._request(uri, method="put", data=data)
+                await self._request(uri, method="put", data=data)
 
     async def _set_groupswitch_member_state(
         self, members: list[str], state: str, switch: Munch

setup.py

@@ -42,7 +42,6 @@ def readme():
         "defusedxml",
         "munch",
         "pyserial",
-        "pytz",
         "python-dateutil",
         "semver",
     ],

tests/test_smile.py

@@ -1334,7 +1334,7 @@ async def test_connect_adam_plus_anna(self):
                 "model": "Generic heater",
                 "name": "OpenTherm",
                 "lower_bound": 0.0,
-                "upper_bound": 30.0,
+                "upper_bound": 100.0,
                 "resolution": 1.0,
                 "maximum_boiler_temperature": 80.0,
                 "binary_sensors": {

userdata/adam_jip/core.appliances.xml

@@ -419,6 +419,16 @@
 			</point_log>
 		</logs>
 		<actuator_functionalities>
+			<thermostat_functionality id='7fd75eb3275d4502b97b81780cff5b31'>
+				<updated_date>2021-01-15T15:05:43.778+01:00</updated_date>
+				<type>domestic_hot_water_setpoint</type>
+				<setpoint>60</setpoint>
+				<lower_bound>40</lower_bound>
+				<upper_bound>60</upper_bound>
+				<resolution>0.01</resolution>
+				<regulations/>
+				<thermostat id='029dce4abaeb499d9f254ac38b4dc72f'/>
+			</thermostat_functionality>
 			<toggle_functionality id='4c95a2a0ae4e41da8333bd60b48f1af2'>
 				<domestic_hot_water_toggle id='d90cc53830864417b94b2bd08064c77a'/>
 				<updated_date>2021-06-04T15:37:30.430+02:00</updated_date>
@@ -435,16 +445,6 @@
 				<regulations/>
 				<thermostat id='522f5746986f4f4b86307e82278f5d15'/>
 			</thermostat_functionality>
-			<thermostat_functionality id='7fd75eb3275d4502b97b81780cff5b31'>
-				<updated_date>2021-01-15T15:05:43.778+01:00</updated_date>
-				<type>domestic_hot_water_setpoint</type>
-				<setpoint>60</setpoint>
-				<lower_bound>40</lower_bound>
-				<upper_bound>60</upper_bound>
-				<resolution>0.01</resolution>
-				<regulations/>
-				<thermostat id='029dce4abaeb499d9f254ac38b4dc72f'/>
-			</thermostat_functionality>
 		</actuator_functionalities>
 	</appliance>
 	<appliance id='a6abc6a129ee499c88a4d420cc413b47'>