Add _collect_group_sensors() function

Author: bouwew

plugwise/common.py

@@ -220,19 +220,10 @@ def _get_groups(self) -> dict[str, GwEntityData]:
                     "model": "Group",
                     "name": group_name,
                     "members": members,
-                    "sensors": group_sensors,
                     "vendor": "Plugwise",
                 }
                 self._count += 5
 
-            for measurement, attrs in GROUP_MEASUREMENTS.items():
-                locator = f'logs/point_log[type="{measurement}"]/period/measurement'
-                if (group_meas_loc := group.find(locator)) is not None:
-                    common_match_cases(measurement, attrs, group_meas_loc, groups[group_id])
-                    self._count += 1
-
-
-        LOGGER.debug("HOI groups: %s", groups)
         return groups
 
     def _get_lock_state(

plugwise/helper.py

@@ -21,6 +21,7 @@
     DHW_SETPOINT,
     DOMAIN_OBJECTS,
     ENERGY_WATT_HOUR,
+    GROUP_MEASUREMENTS,
     HEATER_CENTRAL_MEASUREMENTS,
     LOCATIONS,
     LOGGER,
@@ -339,6 +340,11 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
         if smile_is_power and not self.smile.anna_p1:
             return data
 
+        # Get group data
+        measurements = GROUP_MEASUREMENTS
+        if "members" in entity:
+            self._collect_group_sensors(data, entity, entity_id, measurements)
+
         # Get non-P1 data from APPLIANCES
         measurements = DEVICE_MEASUREMENTS
         if self._is_thermostat and entity_id == self.heater_id:
@@ -370,6 +376,27 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
 
         return data
 
+    def _collect_group_sensors(
+        self,
+        data: GwEntityData,
+        entity: GwEntityData,
+        entity_id: str,
+        measurements: dict[str, DATA | UOM],
+    ) -> None:
+        """Collect group sensors."""
+        if (
+            group := self._domain_objects.find(f'./group[@id="{entity_id}"]')
+        ) is None:
+            return None
+
+        for measurement, attrs in measurements.items():
+            locator = f'.//logs/point_log[type="{measurement}"]/period/measurement'   
+            if (group_meas_loc := group.find(locator)) is None:
+                return
+
+            common_match_cases(measurement, attrs, group_meas_loc, data)
+            self._count += 1
+
     def _collect_appliance_data(
         self,
         data: GwEntityData,