plugwise 1.7.1__tar.gz → 1.7.3a1__tar.gz

{plugwise-1.7.1 → plugwise-1.7.3a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plugwise
-Version: 1.7.1
+Version: 1.7.3a1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -48,12 +48,13 @@ Requires-Dist: python-dateutil
 
 # Plugwise python module
 
-This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as co-code owners).
+This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as code owners).
 
-This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
+This module supports Hubs such as `Adam`, `Smile`s for Anna and P1 and `Stretch`, i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
 
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
+![Static Badge](https://img.shields.io/badge/Plugwise_Discord-Join_now-purple?style=social&logo=discord&link=https%3A%2F%2Fdiscord.gg%2FmFVhF8Ar6A)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
 [![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
 [![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)

{plugwise-1.7.1 → plugwise-1.7.3a1}/README.md

@@ -1,11 +1,12 @@
 # Plugwise python module
 
-This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as co-code owners).
+This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as code owners).
 
-This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
+This module supports Hubs such as `Adam`, `Smile`s for Anna and P1 and `Stretch`, i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
 
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
+![Static Badge](https://img.shields.io/badge/Plugwise_Discord-Join_now-purple?style=social&logo=discord&link=https%3A%2F%2Fdiscord.gg%2FmFVhF8Ar6A)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
 [![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
 [![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/__init__.py

@@ -198,7 +198,9 @@ class Smile(SmileComm):
 
         return self.smile_version
 
-    async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
+    async def _smile_detect(
+        self, result: etree.Element, dsmrmain: etree.Element
+    ) -> None:
         """Helper-function for connect().
 
         Detect which type of Plugwise Gateway is being connected.
@@ -256,10 +258,8 @@ class Smile(SmileComm):
             # For Adam, Anna, determine the system capabilities:
             # Find the connected heating/cooling device (heater_central),
             # e.g. heat-pump or gas-fired heater
-            onoff_boiler: etree = result.find("./module/protocols/onoff_boiler")
-            open_therm_boiler: etree = result.find(
-                "./module/protocols/open_therm_boiler"
-            )
+            onoff_boiler = result.find("./module/protocols/onoff_boiler")
+            open_therm_boiler = result.find("./module/protocols/open_therm_boiler")
             self._on_off_device = onoff_boiler is not None
             self._opentherm_device = open_therm_boiler is not None
 
@@ -272,7 +272,7 @@ class Smile(SmileComm):
                 self._elga = True
 
     async def _smile_detect_legacy(
-        self, result: etree, dsmrmain: etree, model: str
+        self, result: etree.Element, dsmrmain: etree.Element, model: str
     ) -> str:
         """Helper-function for _smile_detect().
 
@@ -296,18 +296,19 @@ class Smile(SmileComm):
         ):
             system = await self._request(SYSTEM)
             self.smile_version = parse(system.find("./gateway/firmware").text)
-            return_model = system.find("./gateway/product").text
+            return_model = str(system.find("./gateway/product").text)
             self.smile_hostname = system.find("./gateway/hostname").text
-            # If wlan0 contains data it's active, so eth0 should be checked last
+            # If wlan0 contains data it's active, eth0 should be checked last as is preferred
             for network in ("wlan0", "eth0"):
                 locator = f"./{network}/mac"
                 if (net_locator := system.find(locator)) is not None:
                     self.smile_mac_address = net_locator.text
+
         # P1 legacy:
         elif dsmrmain is not None:
             status = await self._request(STATUS)
             self.smile_version = parse(status.find("./system/version").text)
-            return_model = status.find("./system/product").text
+            return_model = str(status.find("./system/product").text)
             self.smile_hostname = status.find("./network/hostname").text
             self.smile_mac_address = status.find("./network/mac_address").text
         else:  # pragma: no cover

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/common.py

@@ -27,7 +27,9 @@ from defusedxml import ElementTree as etree
 from munch import Munch
 
 
-def get_zigbee_data(module: etree, module_data: ModuleData, legacy: bool) -> None:
+def get_zigbee_data(
+    module: etree.Element, module_data: ModuleData, legacy: bool
+) -> None:
     """Helper-function for _get_module_data()."""
     if legacy:
         # Stretches
@@ -49,7 +51,7 @@ class SmileCommon:
         """Init."""
         self._cooling_present: bool
         self._count: int
-        self._domain_objects: etree
+        self._domain_objects: etree.Element
         self._heater_id: str = NONE
         self._on_off_device: bool
         self.gw_entities: dict[str, GwEntityData] = {}
@@ -63,10 +65,10 @@ class SmileCommon:
     def _appl_heater_central_info(
         self,
         appl: Munch,
-        xml_1: etree,
+        xml_1: etree.Element,
         legacy: bool,
-        xml_2: etree = None,
-        xml_3: etree = None,
+        xml_2: etree.Element = None,
+        xml_3: etree.Element = None,
     ) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         # Find the valid heater_central
@@ -101,7 +103,7 @@ class SmileCommon:
         return appl
 
     def _appl_thermostat_info(
-        self, appl: Munch, xml_1: etree, xml_2: etree = None
+        self, appl: Munch, xml_1: etree.Element, xml_2: etree.Element = None
     ) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         locator = "./logs/point_log[type='thermostat']/thermostat"
@@ -190,7 +192,7 @@ class SmileCommon:
         return switch_groups
 
     def _get_lock_state(
-        self, xml: etree, data: GwEntityData, stretch_v2: bool = False
+        self, xml: etree.Element, data: GwEntityData, stretch_v2: bool = False
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -209,9 +211,9 @@ class SmileCommon:
 
     def _get_module_data(
         self,
-        xml_1: etree,
+        xml_1: etree.Element,
         locator: str,
-        xml_2: etree = None,
+        xml_2: etree.Element = None,
         legacy: bool = False,
     ) -> ModuleData:
         """Helper-function for _energy_device_info_finder() and _appliance_info_finder().

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/data.py

@@ -228,6 +228,7 @@ class SmileData(SmileHelper):
                 for msg in item.values():
                     if message in msg:
                         data["available"] = False
+                        break
 
     def _get_adam_data(self, entity: GwEntityData, data: GwEntityData) -> None:
         """Helper-function for _get_entity_data().
@@ -329,16 +330,14 @@ class SmileData(SmileHelper):
 
         Also, replace NONE by OFF when none of the schedules are active.
         """
-        loc_schedule_states: dict[str, str] = {}
-        for schedule in schedules:
-            loc_schedule_states[schedule] = "off"
-            if schedule == selected and data["climate_mode"] == "auto":
-                loc_schedule_states[schedule] = "on"
-        self._schedule_old_states[location] = loc_schedule_states
-
         all_off = True
-        for state in self._schedule_old_states[location].values():
-            if state == "on":
+        self._schedule_old_states[location] = {}
+        for schedule in schedules:
+            active: bool = schedule == selected and data["climate_mode"] == "auto"
+            self._schedule_old_states[location][schedule] = "off"
+            if active:
+                self._schedule_old_states[location][schedule] = "on"
                 all_off = False
+
         if all_off:
             data["select_schedule"] = OFF

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/helper.py

@@ -59,7 +59,9 @@ from munch import Munch
 from packaging import version
 
 
-def search_actuator_functionalities(appliance: etree, actuator: str) -> etree | None:
+def search_actuator_functionalities(
+    appliance: etree.Element, actuator: str
+) -> etree.Element | None:
     """Helper-function for finding the relevant actuator xml-structure."""
     locator = f"./actuator_functionalities/{actuator}"
     if (search := appliance.find(locator)) is not None:
@@ -195,6 +197,7 @@ class SmileHelper(SmileCommon):
                     other_entities = self.gw_entities
                     priority_entities = {entity_id: priority_entity}
                     self.gw_entities = {**priority_entities, **other_entities}
+                    break
 
     def _all_locations(self) -> None:
         """Collect all locations."""
@@ -212,7 +215,7 @@ class SmileHelper(SmileCommon):
                 f"./location[@id='{loc.loc_id}']"
             )
 
-    def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
+    def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch:
         """Collect info for all appliances found."""
         match appl.pwclass:
             case "gateway":
@@ -252,7 +255,7 @@ class SmileHelper(SmileCommon):
             case _:  # pragma: no cover
                 return appl
 
-    def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
+    def _appl_gateway_info(self, appl: Munch, appliance: etree.Element) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         self._gateway_id = appliance.attrib["id"]
         appl.firmware = str(self.smile_version)
@@ -285,7 +288,7 @@ class SmileHelper(SmileCommon):
         return appl
 
     def _get_appl_actuator_modes(
-        self, appliance: etree, actuator_type: str
+        self, appliance: etree.Element, actuator_type: str
     ) -> list[str]:
         """Get allowed modes for the given actuator type."""
         mode_list: list[str] = []
@@ -397,7 +400,7 @@ class SmileHelper(SmileCommon):
 
     def _appliance_measurements(
         self,
-        appliance: etree,
+        appliance: etree.Element,
         data: GwEntityData,
         measurements: dict[str, DATA | UOM],
     ) -> None:
@@ -429,7 +432,7 @@ class SmileHelper(SmileCommon):
         self._count = count_data_items(self._count, data)
 
     def _get_toggle_state(
-        self, xml: etree, toggle: str, name: ToggleNameType, data: GwEntityData
+        self, xml: etree.Element, toggle: str, name: ToggleNameType, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -458,7 +461,7 @@ class SmileHelper(SmileCommon):
                 )
 
     def _get_actuator_functionalities(
-        self, xml: etree, entity: GwEntityData, data: GwEntityData
+        self, xml: etree.Element, entity: GwEntityData, data: GwEntityData
     ) -> None:
         """Get and process the actuator_functionalities details for an entity.
 
@@ -520,7 +523,7 @@ class SmileHelper(SmileCommon):
                 data[act_item] = temp_dict
 
     def _get_actuator_mode(
-        self, appliance: etree, entity_id: str, key: str
+        self, appliance: etree.Element, entity_id: str, key: str
     ) -> str | None:
         """Helper-function for _get_regulation_mode and _get_gateway_mode.
 
@@ -535,7 +538,7 @@ class SmileHelper(SmileCommon):
         return None
 
     def _get_regulation_mode(
-        self, appliance: etree, entity_id: str, data: GwEntityData
+        self, appliance: etree.Element, entity_id: str, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -551,7 +554,7 @@ class SmileHelper(SmileCommon):
             self._cooling_enabled = mode == "cooling"
 
     def _get_gateway_mode(
-        self, appliance: etree, entity_id: str, data: GwEntityData
+        self, appliance: etree.Element, entity_id: str, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -837,9 +840,7 @@ class SmileHelper(SmileCommon):
                 return presets  # pragma: no cover
 
         for rule_id in rule_ids:
-            directives: etree = self._domain_objects.find(
-                f'rule[@id="{rule_id}"]/directives'
-            )
+            directives = self._domain_objects.find(f'rule[@id="{rule_id}"]/directives')
             for directive in directives:
                 preset = directive.find("then").attrib
                 presets[directive.attrib["preset"]] = [

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/legacy/helper.py

@@ -23,6 +23,7 @@ from plugwise.constants import (
     NONE,
     OFF,
     P1_LEGACY_MEASUREMENTS,
+    PRIORITY_DEVICE_CLASSES,
     TEMP_CELSIUS,
     THERMOSTAT_CLASSES,
     UOM,
@@ -49,7 +50,7 @@ from munch import Munch
 from packaging.version import Version
 
 
-def etree_to_dict(element: etree) -> dict[str, str]:
+def etree_to_dict(element: etree.Element) -> dict[str, str]:
     """Helper-function translating xml Element to dict."""
     node: dict[str, str] = {}
     if element is not None:
@@ -63,11 +64,11 @@ class SmileLegacyHelper(SmileCommon):
 
     def __init__(self) -> None:
         """Set the constructor for this class."""
-        self._appliances: etree
+        self._appliances: etree.Element
         self._is_thermostat: bool
         self._loc_data: dict[str, ThermoLoc]
-        self._locations: etree
-        self._modules: etree
+        self._locations: etree.Element
+        self._modules: etree.Element
         self._stretch_v2: bool
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile_mac_address: str | None
@@ -130,7 +131,7 @@ class SmileLegacyHelper(SmileCommon):
             self._create_gw_entities(appl)
 
         # Place the gateway and optional heater_central devices as 1st and 2nd
-        for dev_class in ("heater_central", "gateway"):
+        for dev_class in PRIORITY_DEVICE_CLASSES:
             for entity_id, entity in dict(self.gw_entities).items():
                 if entity["dev_class"] == dev_class:
                     tmp_entity = entity
@@ -138,6 +139,7 @@ class SmileLegacyHelper(SmileCommon):
                     cleared_dict = self.gw_entities
                     add_to_front = {entity_id: tmp_entity}
                     self.gw_entities = {**add_to_front, **cleared_dict}
+                    break
 
     def _all_locations(self) -> None:
         """Collect all locations."""
@@ -316,7 +318,7 @@ class SmileLegacyHelper(SmileCommon):
 
     def _appliance_measurements(
         self,
-        appliance: etree,
+        appliance: etree.Element,
         data: GwEntityData,
         measurements: dict[str, DATA | UOM],
     ) -> None:
@@ -345,7 +347,7 @@ class SmileLegacyHelper(SmileCommon):
         self._count = count_data_items(self._count, data)
 
     def _get_actuator_functionalities(
-        self, xml: etree, entity: GwEntityData, data: GwEntityData
+        self, xml: etree.Element, entity: GwEntityData, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data()."""
         for item in ACTIVE_ACTUATORS:

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/legacy/smile.py

@@ -171,9 +171,8 @@ class SmileLegacyAPI(SmileLegacyData):
             raise PlugwiseError("Plugwise: invalid preset.")
 
         locator = f'rule/directives/when/then[@icon="{preset}"].../.../...'
-        rule = self._domain_objects.find(locator)
-        data = f'<rules><rule id="{rule.attrib["id"]}"><active>true</active></rule></rules>'
-
+        rule_id = self._domain_objects.find(locator).attrib["id"]
+        data = f"<rules><rule id='{rule_id}'><active>true</active></rule></rules>"
         await self.call_request(RULES, method="put", data=data)
 
     async def set_regulation_mode(self, mode: str) -> None:
@@ -205,6 +204,7 @@ class SmileLegacyAPI(SmileLegacyData):
         for rule in self._domain_objects.findall("rule"):
             if rule.find("name").text == name:
                 schedule_rule_id = rule.attrib["id"]
+                break
 
         if schedule_rule_id is None:
             raise PlugwiseError(
@@ -216,36 +216,68 @@ class SmileLegacyAPI(SmileLegacyData):
             new_state = "true"
 
         locator = f'.//*[@id="{schedule_rule_id}"]/template'
-        for rule in self._domain_objects.findall(locator):
-            template_id = rule.attrib["id"]
+        template_id = self._domain_objects.find(locator).attrib["id"]
 
-        uri = f"{RULES};id={schedule_rule_id}"
         data = (
-            "<rules><rule"
-            f' id="{schedule_rule_id}"><name><![CDATA[{name}]]></name><template'
-            f' id="{template_id}" /><active>{new_state}</active></rule></rules>'
+            "<rules>"
+            f"<rule id='{schedule_rule_id}'>"
+            f"<name><![CDATA[{name}]]></name>"
+            f"<template id='{template_id}' />"
+            f"<active>{new_state}</active>"
+            "</rule>"
+            "</rules>"
         )
-
+        uri = f"{RULES};id={schedule_rule_id}"
         await self.call_request(uri, method="put", data=data)
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
     ) -> None:
-        """Set the given State of the relevant Switch."""
+        """Set the given state of the relevant switch.
+
+        For individual switches, sets the state directly.
+        For group switches, sets the state for each member in the group separately.
+        For switch-locks, sets the lock state using a different data format.
+        """
         switch = Munch()
         switch.actuator = "actuator_functionalities"
         switch.func_type = "relay_functionality"
         if self._stretch_v2:
             switch.actuator = "actuators"
             switch.func_type = "relay"
-        switch.func = "state"
 
-        if members is not None:
-            return await self._set_groupswitch_member_state(members, state, switch)
+        # Handle switch-lock
+        if model == "lock":
+            state = "false" if state == "off" else "true"
+            appliance = self._appliances.find(f'appliance[@id="{appl_id}"]')
+            appl_name = appliance.find("name").text
+            appl_type = appliance.find("type").text
+            data = (
+                "<appliances>"
+                f"<appliance id='{appl_id}'>"
+                f"<name><![CDATA[{appl_name}]]></name>"
+                f"<description><![CDATA[]]></description>"
+                f"<type><![CDATA[{appl_type}]]></type>"
+                f"<{switch.actuator}>"
+                f"<{switch.func_type}>"
+                f"<lock>{state}</lock>"
+                f"</{switch.func_type}>"
+                f"</{switch.actuator}>"
+                "</appliance>"
+                "</appliances>"
+            )
+            await self.call_request(APPLIANCES, method="post", data=data)
+            return
 
-        data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
-        uri = f"{APPLIANCES};id={appl_id}/{switch.func_type}"
+        # Handle group of switches
+        data = f"<{switch.func_type}><state>{state}</state></{switch.func_type}>"
+        if members is not None:
+            return await self._set_groupswitch_member_state(
+                data, members, state, switch
+            )
 
+        # Handle individual relay switches
+        uri = f"{APPLIANCES};id={appl_id}/relay"
         if model == "relay":
             locator = (
                 f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}/lock'
@@ -257,16 +289,14 @@ class SmileLegacyAPI(SmileLegacyData):
         await self.call_request(uri, method="put", data=data)
 
     async def _set_groupswitch_member_state(
-        self, members: list[str], state: str, switch: Munch
+        self, data: str, members: list[str], state: str, switch: Munch
     ) -> None:
         """Helper-function for set_switch_state().
 
-        Set the given State of the relevant Switch within a group of members.
+        Set the given State of the relevant Switch (relay) within a group of members.
         """
         for member in members:
-            uri = f"{APPLIANCES};id={member}/{switch.func_type}"
-            data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
-
+            uri = f"{APPLIANCES};id={member}/relay"
             await self.call_request(uri, method="put", data=data)
 
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:
@@ -281,12 +311,12 @@ class SmileLegacyAPI(SmileLegacyData):
             )  # pragma: no cover"
 
         temperature = str(setpoint)
-        uri = self._thermostat_uri()
         data = (
-            "<thermostat_functionality><setpoint>"
-            f"{temperature}</setpoint></thermostat_functionality>"
+            "<thermostat_functionality>"
+            f"<setpoint>{temperature}</setpoint>"
+            "</thermostat_functionality>"
         )
-
+        uri = self._thermostat_uri()
         await self.call_request(uri, method="put", data=data)
 
     async def call_request(self, uri: str, **kwargs: Any) -> None:

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/smile.py

@@ -174,8 +174,12 @@ class SmileAPI(SmileData):
         if thermostat_id is None:
             raise PlugwiseError(f"Plugwise: cannot change setpoint, {key} not found.")
 
+        data = (
+            "<thermostat_functionality>"
+            f"<setpoint>{temp}</setpoint>"
+            "</thermostat_functionality>"
+        )
         uri = f"{APPLIANCES};id={self._heater_id}/thermostat;id={thermostat_id}"
-        data = f"<thermostat_functionality><setpoint>{temp}</setpoint></thermostat_functionality>"
         await self.call_request(uri, method="put", data=data)
 
     async def set_offset(self, dev_id: str, offset: float) -> None:
@@ -186,9 +190,8 @@ class SmileAPI(SmileData):
             )
 
         value = str(offset)
-        uri = f"{APPLIANCES};id={dev_id}/offset;type=temperature_offset"
         data = f"<offset_functionality><offset>{value}</offset></offset_functionality>"
-
+        uri = f"{APPLIANCES};id={dev_id}/offset;type=temperature_offset"
         await self.call_request(uri, method="put", data=data)
 
     async def set_preset(self, loc_id: str, preset: str) -> None:
@@ -201,14 +204,16 @@ class SmileAPI(SmileData):
         current_location = self._domain_objects.find(f'location[@id="{loc_id}"]')
         location_name = current_location.find("name").text
         location_type = current_location.find("type").text
-
-        uri = f"{LOCATIONS};id={loc_id}"
         data = (
-            "<locations><location"
-            f' id="{loc_id}"><name>{location_name}</name><type>{location_type}'
-            f"</type><preset>{preset}</preset></location></locations>"
+            "<locations>"
+            f'<location id="{loc_id}">'
+            f"<name>{location_name}</name>"
+            f"<type>{location_type}</type>"
+            f"<preset>{preset}</preset>"
+            "</location>"
+            "</locations>"
         )
-
+        uri = f"{LOCATIONS};id={loc_id}"
         await self.call_request(uri, method="put", data=data)
 
     async def set_select(
@@ -231,9 +236,12 @@ class SmileAPI(SmileData):
         if mode not in self._dhw_allowed_modes:
             raise PlugwiseError("Plugwise: invalid dhw mode.")
 
+        data = (
+            "<domestic_hot_water_mode_control_functionality>"
+            f"<mode>{mode}</mode>"
+            "</domestic_hot_water_mode_control_functionality>"
+        )
         uri = f"{APPLIANCES};type=heater_central/domestic_hot_water_mode_control"
-        data = f"<domestic_hot_water_mode_control_functionality><mode>{mode}</mode></domestic_hot_water_mode_control_functionality>"
-
         await self.call_request(uri, method="put", data=data)
 
     async def set_gateway_mode(self, mode: str) -> None:
@@ -259,9 +267,13 @@ class SmileAPI(SmileData):
             vacation_time = time_2 + "T23:00:00.000Z"
             valid = f"<valid_from>{vacation_time}</valid_from><valid_to>{end_time}</valid_to>"
 
+        data = (
+            "<gateway_mode_control_functionality>"
+            f"<mode>{mode}</mode>"
+            f"{valid}"
+            "</gateway_mode_control_functionality>"
+        )
         uri = f"{APPLIANCES};id={self._smile_props['gateway_id']}/gateway_mode_control"
-        data = f"<gateway_mode_control_functionality><mode>{mode}</mode>{valid}</gateway_mode_control_functionality>"
-
         await self.call_request(uri, method="put", data=data)
 
     async def set_regulation_mode(self, mode: str) -> None:
@@ -269,12 +281,17 @@ class SmileAPI(SmileData):
         if mode not in self._reg_allowed_modes:
             raise PlugwiseError("Plugwise: invalid regulation mode.")
 
-        uri = f"{APPLIANCES};type=gateway/regulation_mode_control"
         duration = ""
         if "bleeding" in mode:
             duration = "<duration>300</duration>"
-        data = f"<regulation_mode_control_functionality>{duration}<mode>{mode}</mode></regulation_mode_control_functionality>"
 
+        data = (
+            "<regulation_mode_control_functionality>"
+            f"{duration}"
+            f"<mode>{mode}</mode>"
+            "</regulation_mode_control_functionality>"
+        )
+        uri = f"{APPLIANCES};type=gateway/regulation_mode_control"
         await self.call_request(uri, method="put", data=data)
 
     async def set_schedule_state(
@@ -323,18 +340,22 @@ class SmileAPI(SmileData):
             template = f'<template id="{template_id}" />'
 
         contexts = self.determine_contexts(loc_id, name, new_state, schedule_rule_id)
-        uri = f"{RULES};id={schedule_rule_id}"
         data = (
-            f'<rules><rule id="{schedule_rule_id}"><name><![CDATA[{name}]]></name>'
-            f"{template}{contexts}</rule></rules>"
+            "<rules>"
+            f"<rule id='{schedule_rule_id}'>"
+            f"<name><![CDATA[{name}]]></name>"
+            f"{template}"
+            f"{contexts}"
+            "</rule>"
+            "</rules>"
         )
-
+        uri = f"{RULES};id={schedule_rule_id}"
         await self.call_request(uri, method="put", data=data)
         self._schedule_old_states[loc_id][name] = new_state
 
     def determine_contexts(
         self, loc_id: str, name: str, state: str, sched_id: str
-    ) -> etree:
+    ) -> str:
         """Helper-function for set_schedule_state()."""
         locator = f'.//*[@id="{sched_id}"]/contexts'
         contexts = self._domain_objects.find(locator)
@@ -349,7 +370,7 @@ class SmileAPI(SmileData):
         if state == "on":
             contexts.append(subject)
 
-        return etree.tostring(contexts, encoding="unicode").rstrip()
+        return str(etree.tostring(contexts, encoding="unicode").rstrip())
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
@@ -378,18 +399,22 @@ class SmileAPI(SmileData):
             return await self._set_groupswitch_member_state(members, state, switch)
 
         locator = f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}'
-        found: list[etree] = self._domain_objects.findall(locator)
+        found = self._domain_objects.findall(locator)
         for item in found:
+            # multiple types of e.g. toggle_functionality present
             if (sw_type := item.find("type")) is not None:
                 if sw_type.text == switch.act_type:
                     switch_id = item.attrib["id"]
-            else:
+                    break
+            else:  # actuators with a single item like relay_functionality
                 switch_id = item.attrib["id"]
-                break
 
+        data = (
+            f"<{switch.func_type}>"
+            f"<{switch.func}>{state}</{switch.func}>"
+            f"</{switch.func_type}>"
+        )
         uri = f"{APPLIANCES};id={appl_id}/{switch.device};id={switch_id}"
-        data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
-
         if model == "relay":
             locator = (
                 f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}/lock'
@@ -411,8 +436,11 @@ class SmileAPI(SmileData):
             locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}'
             switch_id = self._domain_objects.find(locator).attrib["id"]
             uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}"
-            data = f"<{switch.func_type}><{switch.func}>{state}</{switch.func}></{switch.func_type}>"
-
+            data = (
+                f"<{switch.func_type}>"
+                f"<{switch.func}>{state}</{switch.func}>"
+                f"</{switch.func_type}>"
+            )
             await self.call_request(uri, method="put", data=data)
 
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
@@ -448,12 +476,12 @@ class SmileAPI(SmileData):
             )  # pragma: no cover"
 
         temperature = str(setpoint)
-        uri = self._thermostat_uri(loc_id)
         data = (
-            "<thermostat_functionality><setpoint>"
-            f"{temperature}</setpoint></thermostat_functionality>"
+            "<thermostat_functionality>"
+            f"<setpoint>{temperature}</setpoint>"
+            "</thermostat_functionality>"
         )
-
+        uri = self._thermostat_uri(loc_id)
         await self.call_request(uri, method="put", data=data)
 
     async def call_request(self, uri: str, **kwargs: Any) -> None:

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/smilecomm.py

@@ -51,7 +51,7 @@ class SmileComm:
         retry: int = 3,
         method: str = "get",
         data: str | None = None,
-    ) -> etree:
+    ) -> etree.Element:
         """Get/put/delete data from a give URL."""
         resp: ClientResponse
         url = f"{self._endpoint}{command}"
@@ -107,7 +107,9 @@ class SmileComm:
 
         return await self._request_validate(resp, method)
 
-    async def _request_validate(self, resp: ClientResponse, method: str) -> etree:
+    async def _request_validate(
+        self, resp: ClientResponse, method: str
+    ) -> etree.Element:
         """Helper-function for _request(): validate the returned data."""
         match resp.status:
             case 200:

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise/util.py

@@ -74,7 +74,7 @@ def in_alternative_location(loc: Munch, legacy: bool) -> bool:
     return present
 
 
-def check_heater_central(xml: etree) -> str:
+def check_heater_central(xml: etree.Element) -> str:
     """Find the valid heater_central, helper-function for _appliance_info_finder().
 
     Solution for Core Issue #104433,
@@ -143,7 +143,7 @@ def collect_power_values(
 def common_match_cases(
     measurement: str,
     attrs: DATA | UOM,
-    location: etree,
+    location: etree.Element,
     data: GwEntityData,
 ) -> None:
     """Helper-function for common match-case execution."""
@@ -213,7 +213,7 @@ def format_measure(measure: str, unit: str) -> float | int:
     return result
 
 
-def get_vendor_name(module: etree, model_data: ModuleData) -> ModuleData:
+def get_vendor_name(module: etree.Element, model_data: ModuleData) -> ModuleData:
     """Helper-function for _get_model_data()."""
     if (vendor_name := module.find("vendor_name").text) is not None:
         model_data["vendor_name"] = vendor_name
@@ -302,12 +302,12 @@ def remove_empty_platform_dicts(data: GwEntityData) -> None:
         data.pop("switches")
 
 
-def return_valid(value: etree | None, default: etree) -> etree:
+def return_valid(value: etree.Element | None, default: etree.Element) -> etree.Element:
     """Return default when value is None."""
     return value if value is not None else default
 
 
-def skip_obsolete_measurements(xml: etree, measurement: str) -> bool:
+def skip_obsolete_measurements(xml: etree.Element, measurement: str) -> bool:
     """Skipping known obsolete measurements."""
     locator = f".//logs/point_log[type='{measurement}']/updated_date"
     if (

{plugwise-1.7.1 → plugwise-1.7.3a1}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plugwise
-Version: 1.7.1
+Version: 1.7.3a1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -48,12 +48,13 @@ Requires-Dist: python-dateutil
 
 # Plugwise python module
 
-This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as co-code owners).
+This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as code owners).
 
-This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
+This module supports Hubs such as `Adam`, `Smile`s for Anna and P1 and `Stretch`, i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
 
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
+![Static Badge](https://img.shields.io/badge/Plugwise_Discord-Join_now-purple?style=social&logo=discord&link=https%3A%2F%2Fdiscord.gg%2FmFVhF8Ar6A)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
 [![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
 [![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)

{plugwise-1.7.1 → plugwise-1.7.3a1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.7.1"
+version         = "1.7.3a1"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

{plugwise-1.7.1 → plugwise-1.7.3a1}/tests/test_init.py

@@ -167,8 +167,10 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                     "PUT", CORE_APPLIANCES_TAIL, self.smile_http_accept
                 )
             else:
+                app.router.add_route("POST", CORE_APPLIANCES_TAIL, self.smile_http_ok)
                 app.router.add_route("PUT", CORE_APPLIANCES_TAIL, self.smile_http_ok)
         else:
+            app.router.add_route("POST", CORE_APPLIANCES_TAIL, self.smile_timeout)
             app.router.add_route("PUT", CORE_LOCATIONS_TAIL, self.smile_timeout)
             app.router.add_route("PUT", CORE_RULES_TAIL, self.smile_timeout)
             app.router.add_route("PUT", CORE_APPLIANCES_TAIL, self.smile_timeout)

{plugwise-1.7.1 → plugwise-1.7.3a1}/tests/test_legacy_stretch.py

@@ -74,6 +74,10 @@ class TestPlugwiseStretch(TestPlugwise):  # pylint: disable=attribute-defined-ou
             smile, "2587a7fcdd7e482dab03fda256076b4b"
         )
         assert switch_change
+        switch_change = await self.tinker_switch(
+            smile, "2587a7fcdd7e482dab03fda256076b4b", model="lock"
+        )
+        assert switch_change
         switch_change = await self.tinker_switch(
             smile,
             "f7b145c8492f4dd7a4de760456fdef3e",