Remove switch and report groups

Use the HA Group helper to create a group of switches

Author: bouwew

plugwise/common.py

@@ -9,7 +9,6 @@
 
 from plugwise.constants import (
     ANNA,
-    GROUP_TYPES,
     NONE,
     PRIORITY_DEVICE_CLASSES,
     SPECIAL_PLUG_TYPES,
@@ -175,23 +174,10 @@ def _reorder_devices(self) -> None:
                     break
         self.gw_entities = {**reordered, **self.gw_entities}
 
-    def _entity_switching_group(self, entity: GwEntityData, data: GwEntityData) -> None:
-        """Helper-function for _get_device_zone_data().
-
-        Determine switching group device data.
-        """
-        if entity["dev_class"] in SWITCH_GROUP_TYPES:
-            counter = 0
-            for member in entity["members"]:
-                if self.gw_entities[member]["switches"].get("relay"):
-                    counter += 1
-            data["switches"]["relay"] = counter != 0
-            self._count += 1
-
     def _get_groups(self) -> dict[str, GwEntityData]:
         """Helper-function for smile.py: get_all_gateway_entities().
 
-        Collect switching-, pumping- or report-group info.
+        Collect pumping-groups info.
         """
         groups: dict[str, GwEntityData] = {}
         # P1 and Anna don't have groups
@@ -203,13 +189,16 @@ def _get_groups(self) -> dict[str, GwEntityData]:
             group_id = group.attrib["id"]
             group_name = group.find("name").text
             group_type = group.find("type").text
+            if group_type != "pumping":
+                continue
+            
             group_appliances = group.findall("appliances/appliance")
             for item in group_appliances:
                 # Check if members are not orphaned - stretch
                 if item.attrib["id"] in self.gw_entities:
                     members.append(item.attrib["id"])
 
-            if group_type in GROUP_TYPES and members:
+            if members:
                 groups[group_id] = {
                     "dev_class": group_type,
                     "model": "Group",

plugwise/constants.py

@@ -304,8 +304,6 @@
 ]
 BINARY_SENSORS: Final[tuple[str, ...]] = get_args(BinarySensorType)
 
-GROUP_TYPES: Final[tuple[str, ...]] = ("pumping", "report", "switching")
-
 SensorType = Literal[
     "battery",
     "cooling_activation_outdoor_temperature",

plugwise/data.py

@@ -194,14 +194,13 @@ def _get_entity_data(self, entity_id: str) -> GwEntityData:
         self._check_availability(
             entity, "smartmeter", data, "P1 does not seem to be connected"
         )
+
         # OpenTherm entity
         if entity["name"] != "OnOff":
             self._check_availability(
                 entity, "heater_central", data, "no OpenTherm communication"
             )
 
-        # Switching groups data
-        self._entity_switching_group(entity, data)
         # Adam data
         if self.check_name(ADAM):
             self._get_adam_data(entity, data)

plugwise/legacy/data.py

@@ -40,9 +40,6 @@ def _get_entity_data(self, entity_id: str) -> GwEntityData:
         entity = self.gw_entities[entity_id]
         data = self._get_measurement_data(entity_id)
 
-        # Switching groups data
-        self._entity_switching_group(entity, data)
-
         # Skip obtaining data when not a thermostat
         if entity["dev_class"] != "thermostat":
             return data

plugwise/legacy/smile.py

@@ -78,13 +78,9 @@ def get_all_gateway_entities(self) -> None:
         """Collect the Plugwise gateway entities and their data and states from the received raw XML-data.
 
         First, collect all the connected entities and their initial data.
-        Collect and add switching- and/or pump-group entities.
         Finally, collect the data and states for each entity.
         """
         self._all_appliances()
-        if group_data := self._get_groups():
-            self.gw_entities.update(group_data)
-
         self._all_entity_data()
 
     async def async_update(self) -> dict[str, GwEntityData]:
@@ -225,7 +221,6 @@ async def set_switch_state(
         """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.
         Return the requested state when succesful, the current state otherwise.
         """
@@ -261,13 +256,6 @@ async def set_switch_state(
             await self.call_request(APPLIANCES, method="post", data=data)
             return requested_state
 
-        # 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(
-                appl_id, data, members, state, switch
-            )
-
         # Handle individual relay switches
         uri = f"{APPLIANCES};id={appl_id}/relay"
         if model == "relay" and self.gw_entities[appl_id]["switches"]["lock"]:
@@ -277,28 +265,6 @@ async def set_switch_state(
         await self.call_request(uri, method="put", data=data)
         return requested_state
 
-    async def _set_groupswitch_member_state(
-        self, appl_id: str, data: str, members: list[str], state: str, switch: Munch
-    ) -> bool:
-        """Helper-function for set_switch_state().
-
-        Set the requested state of the relevant switch within a group of switches.
-        Return the current group-state when none of the switches has changed its state, the requested state otherwise.
-        """
-        current_state = self.gw_entities[appl_id]["switches"]["relay"]
-        requested_state = state == STATE_ON
-        switched = 0
-        for member in members:
-            if not self.gw_entities[member]["switches"]["lock"]:
-                uri = f"{APPLIANCES};id={member}/relay"
-                await self.call_request(uri, method="put", data=data)
-                switched += 1
-
-        if switched > 0:
-            return requested_state
-
-        return current_state  # pragma: no cover
-
     async def set_temperature(self, _: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
         setpoint: float | None = None

plugwise/smile.py

@@ -104,7 +104,7 @@ def get_all_gateway_entities(self) -> None:
 
         First, collect all the connected entities and their initial data.
         If a thermostat-gateway, collect a list of thermostats with offset-capability.
-        Collect and add switching- and/or pump-group entities.
+        Collect and add pumping-group entities.
         Finally, collect the data and states for each entity.
         """
         self._all_appliances()
@@ -399,7 +399,6 @@ async def set_switch_state(
         """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.
         Return the requested state when succesful, the current state otherwise.
         """
@@ -418,11 +417,6 @@ async def set_switch_state(
             f"</{switch.func_type}>"
         )
 
-        if members is not None:
-            return await self._set_groupswitch_member_state(
-                appl_id, data, members, state, switch
-            )
-
         locator = f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}'
         found = self._domain_objects.findall(locator)
         for item in found:
@@ -445,32 +439,6 @@ async def set_switch_state(
         await self.call_request(uri, method="put", data=data)
         return requested_state
 
-    async def _set_groupswitch_member_state(
-        self, appl_id: str, data: str, members: list[str], state: str, switch: Munch
-    ) -> bool:
-        """Helper-function for set_switch_state().
-
-        Set the requested state of the relevant switch within a group of switches.
-        Return the current group-state when none of the switches has changed its state, the requested state otherwise.
-        """
-        current_state = self.gw_entities[appl_id]["switches"]["relay"]
-        requested_state = state == STATE_ON
-        switched = 0
-        for member in members:
-            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}"
-            lock_blocked = self.gw_entities[member]["switches"].get("lock")
-            # Assume Plugs under Plugwise control are not part of a group
-            if lock_blocked is not None and not lock_blocked:
-                await self.call_request(uri, method="put", data=data)
-                switched += 1
-
-        if switched > 0:
-            return requested_state
-
-        return current_state
-
     async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         """Set the given Temperature on the relevant Thermostat."""
         setpoint: float | None = None