Save various updates

Author: bouwew

fixtures/m_adam_cooling/data.json

@@ -91,6 +91,21 @@
     },
     "vendor": "Plugwise"
   },
+  "c9293d1d68ee48fc8843c6f0dee2b6be": {
+    "dev_class": "pumping",
+    "members": [
+      "854f8a9b0e7e425db97f1f110e1ce4b3",
+      "ad4838d7d35c4d6ea796ee12ae5aedf8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming",
+    "sensors": {
+      "electricity_consumed": 45.0,
+      "electricity_produced": 0.0,
+      "temperature": 20.1
+    },
+    "vendor": "Plugwise"
+  },
   "da224107914542988a88561b4452b0f6": {
     "binary_sensors": {
       "plugwise_notification": false
@@ -173,8 +188,12 @@
       "2568cc4b9c1e401495d4741a5f89bee1",
       "29542b2b6a6a4169acecc15c72a599b8"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 16.5,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

fixtures/m_adam_heating/data.json

@@ -96,6 +96,21 @@
     },
     "vendor": "Plugwise"
   },
+  "c9293d1d68ee48fc8843c6f0dee2b6be": {
+    "dev_class": "pumping",
+    "members": [
+      "854f8a9b0e7e425db97f1f110e1ce4b3",
+      "ad4838d7d35c4d6ea796ee12ae5aedf8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming",
+    "sensors": {
+      "electricity_consumed": 45.0,
+      "electricity_produced": 0.0,
+      "temperature": 20.1
+    },
+    "vendor": "Plugwise"
+  },
   "da224107914542988a88561b4452b0f6": {
     "binary_sensors": {
       "plugwise_notification": false
@@ -172,8 +187,12 @@
       "2568cc4b9c1e401495d4741a5f89bee1",
       "29542b2b6a6a4169acecc15c72a599b8"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 16.5,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

fixtures/m_adam_multiple_devices_per_zone/data.json

@@ -505,6 +505,19 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "ABCD012345670A06"
   },
+  "e117db6848394c8cb70d9c28e63d92d2": {
+    "dev_class": "pumping",
+    "members": [
+      "78d1126fc4c743db81b61c20e88342a7",
+      "b59bcebaf94b499ea7d46e4a66fb62d8"
+    ],
+    "model": "Group",
+    "name": "Vloerverwarming Woonkamer",
+    "sensors": {
+      "electricity_consumed": 35.6
+    },
+    "vendor": "Plugwise"
+  },
   "e7693eb9582644e5b865dba8d4447cf1": {
     "available": true,
     "binary_sensors": {
@@ -539,8 +552,12 @@
       "02cf28bfec924855854c544690a609ef",
       "4a810418d5394b3f82727340b91ba740"
     ],
-    "model": "Switchgroup",
+    "model": "Group",
     "name": "Test",
+    "sensors": {
+      "electricity_consumed": 14.8,
+      "electricity_produced": 0.0
+    },
     "switches": {
       "relay": true
     },

plugwise/helper.py

@@ -382,7 +382,9 @@ def _collect_group_sensors(
         measurements: dict[str, UOM],
     ) -> None:
         """Collect group sensors."""
-        if (group := self._domain_objects.find(f'./group[@id="{entity_id}"]')) is not None:
+        if (
+            group := self._domain_objects.find(f'./group[@id="{entity_id}"]')
+        ) is not 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: