Improve support for groups

Author: bouwew

plugwise/common.py

@@ -9,6 +9,7 @@
 
 from plugwise.constants import (
     ANNA,
+    GROUP_TYPES,
     NONE,
     PRIORITY_DEVICE_CLASSES,
     SPECIAL_PLUG_TYPES,
@@ -187,15 +188,15 @@ def _entity_switching_group(self, entity: GwEntityData, data: GwEntityData) -> N
             data["switches"]["relay"] = counter != 0
             self._count += 1
 
-    def _get_group_switches(self) -> dict[str, GwEntityData]:
+    def _get_groups(self) -> dict[str, GwEntityData]:
         """Helper-function for smile.py: get_all_gateway_entities().
 
         Collect switching- or pump-group info.
         """
-        switch_groups: dict[str, GwEntityData] = {}
-        # P1 and Anna don't have switchgroups
+        groups: dict[str, GwEntityData] = {}
+        # P1 and Anna don't have groups
         if self.smile.type == "power" or self.check_name(ANNA):
-            return switch_groups
+            return groups
 
         for group in self._domain_objects.findall("./group"):
             members: list[str] = []
@@ -208,17 +209,17 @@ def _get_group_switches(self) -> dict[str, GwEntityData]:
                 if item.attrib["id"] in self.gw_entities:
                     members.append(item.attrib["id"])
 
-            if group_type in SWITCH_GROUP_TYPES and members:
-                switch_groups[group_id] = {
+            if group_type in GROUP_TYPES and members:
+                groups[group_id] = {
                     "dev_class": group_type,
-                    "model": "Switchgroup",
+                    "model": "Group",
                     "name": group_name,
                     "members": members,
                     "vendor": "Plugwise",
                 }
                 self._count += 5
 
-        return switch_groups
+        return groups
 
     def _get_lock_state(
         self, xml: etree.Element, data: GwEntityData, stretch_v2: bool = False

plugwise/constants.py

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

plugwise/legacy/smile.py

@@ -82,7 +82,7 @@ def get_all_gateway_entities(self) -> None:
         Finally, collect the data and states for each entity.
         """
         self._all_appliances()
-        if group_data := self._get_group_switches():
+        if group_data := self._get_groups():
             self.gw_entities.update(group_data)
 
         self._all_entity_data()

plugwise/smile.py

@@ -115,7 +115,7 @@ def get_all_gateway_entities(self) -> None:
             if self.check_name(ADAM):
                 self._scan_thermostats()
 
-        if group_data := self._get_group_switches():
+        if group_data := self._get_groups():
             self.gw_entities.update(group_data)
 
         self._all_entity_data()