Fixes-updates

bouwew · bouwew · commit ead6f7858351 · 2024-11-17T17:42:20.000+01:00
diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json
@@ -230,7 +230,7 @@
     "cooling_present": false,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
-    "item_count": 152,
+    "item_count": 173,
     "notifications": {},
     "reboot": true,
     "smile_name": "Adam"
diff --git a/fixtures/anna_v4/all_data.json b/fixtures/anna_v4/all_data.json
@@ -33,6 +33,12 @@
         "setpoint": 0.0,
         "upper_bound": 2.0
       },
+      "thermostat": {
+        "lower_bound": 4.0,
+        "resolution": 0.1,
+        "setpoint": 20.5,
+        "upper_bound": 30.0
+      },
       "vendor": "Plugwise"
     },
     "0466eae8520144c78afb29628384edeb": {
@@ -93,7 +99,7 @@
     "cooling_present": false,
     "gateway_id": "0466eae8520144c78afb29628384edeb",
     "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
-    "item_count": 50,
+    "item_count": 58,
     "notifications": {},
     "reboot": true,
     "smile_name": "Smile Anna"
diff --git a/fixtures/legacy_anna/all_data.json b/fixtures/legacy_anna/all_data.json
@@ -70,5 +70,6 @@
     "heater_id": "04e4cbfe7f4340f090f85ec3b9e6a950",
     "item_count": 41,
     "smile_name": "Smile Anna"
-  }
+  },
+  "zones": {}
 }
diff --git a/fixtures/p1v4_442_single/all_data.json b/fixtures/p1v4_442_single/all_data.json
@@ -47,5 +47,6 @@
     "notifications": {},
     "reboot": true,
     "smile_name": "Smile P1"
-  }
+  },
+  "zones": {}
 }
diff --git a/fixtures/smile_p1_v2/all_data.json b/fixtures/smile_p1_v2/all_data.json
@@ -37,5 +37,6 @@
     "gateway_id": "aaaa0000aaaa0000aaaa0000aaaa00aa",
     "item_count": 26,
     "smile_name": "Smile P1"
-  }
+  },
+  "zones": {}
 }
diff --git a/fixtures/stretch_v31/all_data.json b/fixtures/stretch_v31/all_data.json
@@ -137,5 +137,6 @@
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
     "item_count": 83,
     "smile_name": "Stretch"
-  }
+  },
+  "zones": {}
 }
diff --git a/plugwise/data.py b/plugwise/data.py
@@ -148,7 +148,7 @@ def _update_for_cooling(self, device: DeviceData) -> None:
                 sensors.pop("setpoint")
             sensors["setpoint_low"] = temp_dict["setpoint_low"]
             sensors["setpoint_high"] = temp_dict["setpoint_high"]
-            self._count += 2
+            self._count += 2  # add 4, remove 2
 
 
     def _get_location_data(self, loc_id: str) -> DeviceData:
diff --git a/plugwise/helper.py b/plugwise/helper.py
@@ -639,13 +639,13 @@ def _appliance_measurements(
                 )
 
         if data.get("binary_sensors"):
-            self._count += len(data["binary_sensors"]) - 1
+            self._count += len(data["binary_sensors"])
         if data.get("sensors"):
-            self._count += len(data["sensors"]) -1
+            self._count += len(data["sensors"])
         if data.get("switches"):
-            self._count += len(data["switches"]) -1
+            self._count += len(data["switches"])
         # Don't count the above top-level dicts, only the remaining single items
-        #self._count += len(data) - 3
+        self._count += len(data) - 3
 
     def _get_toggle_state(
         self, xml: etree, toggle: str, name: ToggleNameType, data: DeviceData
@@ -684,7 +684,9 @@ def _get_actuator_functionalities(
             # Skip max_dhw_temperature, not initially valid,
             # skip thermostat for all but zones with thermostats
             if item == "max_dhw_temperature" or (
-                item == "thermostat" and device["dev_class"] != "climate"
+                item == "thermostat" and (
+                    device["dev_class"] != "climate" if self.smile(ADAM) else device["dev_class"] != "thermostat"
+                )
             ):
                 continue
 
@@ -844,6 +846,7 @@ def _scan_thermostats(self) -> None:
                         }
                     }
                 )
+                self._count += 3
 
     def _match_locations(self) -> dict[str, ThermoLoc]:
         """Helper-function for _scan_thermostats().
diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
@@ -33,6 +33,7 @@
     GatewayData,
     SensorType,
     ThermoLoc,
+    ZoneData,
 )
 from plugwise.util import (
     common_match_cases,
@@ -89,6 +90,7 @@ def __init__(self) -> None:
         self.smile_name: str
         self.smile_type: str
         self.smile_zigbee_mac_address: str | None
+        self.zone_data: ZoneData = {}
         SmileCommon.__init__(self)
 
     def _all_appliances(self) -> None:
diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
@@ -121,7 +121,7 @@ async def async_update(self) -> PlugwiseData:
             )
             self.gw_data: GatewayData = {}
             self.gw_devices: dict[str, DeviceData] = {}
-            self.zones: dict[str, ZoneData] = {}
+            self.zone_data: dict[str, ZoneData] = {}
             await self.full_update_device()
             self.get_all_devices()
         # Otherwise perform an incremental update
diff --git a/scripts/manual_fixtures.py b/scripts/manual_fixtures.py
@@ -74,7 +74,7 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 m_adam_cooling["devices"].pop("10016900610d4c7481df78c89606ef22")
 
 # Correct setpoint for "ad4838d7d35c4d6ea796ee12ae5aedf8"
-m_adam_cooling["devices"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["thermostat"][
+m_adam_cooling["zones"]["f2bf9048bef64cc5b6d5110154e33c81"]["thermostat"][
     "setpoint"
 ] = 23.5
 
@@ -115,7 +115,7 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 ] = 21.6
 
 # Go for e2f4
-m_adam_cooling["devices"]["e2f4322d57924fa090fbbc48b3a140dc"]["thermostat"][
+m_adam_cooling["zones"]["f871b8c4d63549319221e294e4f88074"]["thermostat"][
     "setpoint"
 ] = 25.0
 m_adam_cooling["devices"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
@@ -163,7 +163,7 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 m_adam_heating["gateway"]["cooling_present"] = False
 
 # Correct setpoint for "ad4838d7d35c4d6ea796ee12ae5aedf8"
-m_adam_heating["devices"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["thermostat"][
+m_adam_heating["zones"]["f2bf9048bef64cc5b6d5110154e33c81"]["thermostat"][
     "setpoint"
 ] = 20.0
 
@@ -187,7 +187,7 @@ def json_writer(manual_name: str, all_data: dict) -> None:
 ] = 18.6
 
 # Go for e2f4
-m_adam_heating["devices"]["e2f4322d57924fa090fbbc48b3a140dc"]["thermostat"][
+m_adam_heating["zones"]["f871b8c4d63549319221e294e4f88074"]["thermostat"][
     "setpoint"
 ] = 15.0
 
diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json
@@ -33,6 +33,12 @@
         "setpoint": 0.0,
         "upper_bound": 2.0
       },
+      "thermostat": {
+        "lower_bound": 4.0,
+        "resolution": 0.1,
+        "setpoint": 20.5,
+        "upper_bound": 30.0
+      },
       "vendor": "Plugwise"
     },
     "0466eae8520144c78afb29628384edeb": {
@@ -93,7 +99,7 @@
     "cooling_present": false,
     "gateway_id": "0466eae8520144c78afb29628384edeb",
     "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
-    "item_count": 50,
+    "item_count": 58,
     "notifications": {},
     "reboot": true,
     "smile_name": "Smile Anna"
diff --git a/tests/test_adam.py b/tests/test_adam.py
@@ -36,7 +36,7 @@ async def test_connect_adam_plus_anna_new(self):
         assert smile.gateway_id == "da224107914542988a88561b4452b0f6"
         assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
         assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
-        assert self.device_items == 152
+        assert self.device_items == 173
         assert self.device_list == [
             "da224107914542988a88561b4452b0f6",
             "056ee145a816487eaa69243c3280f8bf",
diff --git a/tests/test_anna.py b/tests/test_anna.py
@@ -30,7 +30,7 @@ async def test_connect_anna_v4(self):
         await self.device_test(smile, "2020-04-05 00:00:01", testdata)
         assert smile.gateway_id == "0466eae8520144c78afb29628384edeb"
         assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
-        assert self.device_items == 60
+        assert self.device_items == 58
         assert not self.notifications
 
         assert not self.cooling_present
diff --git a/tests/test_init.py b/tests/test_init.py
@@ -546,7 +546,52 @@ async def device_test(
         skip_testing=False,
     ):
         """Perform basic device tests."""
-        bsw_list = ["binary_sensors", "central", "climate", "sensors", "switches"]
+
+        def test_and_assert(test_dict, data, header):
+            """Test-and-assert helper-function."""
+            tests = 0
+            asserts = 0
+            bsw_list = ["binary_sensors", "central", "climate", "sensors", "switches"]
+            for testitem, measurements in test_dict.items():
+                tests += 1
+                assert testitem in data
+                asserts += 1
+                for data_id, details in data.items():
+                    if testitem == data_id:
+                        _LOGGER.info(
+                            "%s",
+                            f"- Testing data for {header} {details['name']} ({data_id})",
+                        )
+                        _LOGGER.info("%s", f"  + {header} data: {details}")
+                        for measure_key, measure_assert in measurements.items():
+                            _LOGGER.info(
+                                "%s",
+                                f"  + Testing {measure_key}/{type(measure_key)} with {details[measure_key]}/{type(details[measure_key])} (should be {measure_assert}/{type(measure_assert)} )",
+                            )
+                            tests += 1
+                            if (
+                                measure_key in bsw_list
+                                or measure_key in pw_constants.ACTIVE_ACTUATORS
+                            ):
+                                tests -= 1
+                                for key_1, val_1 in measure_assert.items():
+                                    tests += 1
+                                    for key_2, val_2 in details[measure_key].items():
+                                        if key_1 != key_2:
+                                            continue
+
+                                        _LOGGER.info(
+                                            "%s",
+                                            f"  + Testing {key_1} ({val_1} should be {val_2})",
+                                        )
+                                        assert val_1 == val_2
+                                        asserts += 1
+                            else:
+                                assert details[measure_key] == measure_assert
+                                asserts += 1
+
+            assert tests == asserts
+            _LOGGER.debug("Number of zone test-assert: %s", asserts)
 
         # pragma warning disable S3776
 
@@ -606,103 +651,13 @@ async def device_test(
         # Perform tests and asserts in two steps: devices and zones
         for header, data_dict in testdata.items():
             # Test devices
-            if header != "devices":
-                continue
-
-            tests = 0
-            asserts = 0
-            for testdevice, measurements in data_dict.items():
-                tests += 1
-                assert testdevice in data.devices
-                asserts += 1
-                for dev_id, details in data.devices.items():
-                    if testdevice == dev_id:
-                        _LOGGER.info(
-                            "%s",
-                            "- Testing data for device {} ({})".format(
-                                details["name"], dev_id
-                            ),
-                        )
-                        _LOGGER.info("  + Device data: %s", details)
-                        for measure_key, measure_assert in measurements.items():
-                            _LOGGER.info(
-                                "%s",
-                                f"  + Testing {measure_key}/{type(measure_key)} with {details[measure_key]}/{type(details[measure_key])} (should be {measure_assert}/{type(measure_assert)} )",
-                            )
-                            tests += 1
-                            if (
-                                measure_key in bsw_list
-                                or measure_key in pw_constants.ACTIVE_ACTUATORS
-                            ):
-                                tests -= 1
-                                for key_1, val_1 in measure_assert.items():
-                                    tests += 1
-                                    for key_2, val_2 in details[measure_key].items():
-                                        if key_1 != key_2:
-                                            continue
-
-                                        _LOGGER.info(
-                                            "%s",
-                                            f"  + Testing {key_1} ({val_1} should be {val_2})",
-                                        )
-                                        assert val_1 == val_2
-                                        asserts += 1
-                            else:
-                                assert details[measure_key] == measure_assert
-                                asserts += 1
-
-            assert tests == asserts
-            _LOGGER.debug("Number of device test-assert: %s", asserts)
+            if header == "devices":
+                test_and_assert(data_dict, data.devices, header)
 
         for header, data_dict in testdata.items():
             # Test zones
-            if header != "zones":
-                continue
-
-            tests = 0
-            asserts = 0
-            for testzone, measurements in data_dict.items():
-                tests += 1
-                assert testzone in data.zones
-                asserts += 1
-                for loc_id, details in data.zones.items():
-                    if testzone == loc_id:
-                        _LOGGER.info(
-                            "%s",
-                            "- Testing data for zone {} ({})".format(
-                                details["name"], loc_id
-                            ),
-                        )
-                        _LOGGER.info("  + Zone data: %s", details)
-                        for measure_key, measure_assert in measurements.items():
-                            _LOGGER.info(
-                                "%s",
-                                f"  + Testing {measure_key}/{type(measure_key)} with {details[measure_key]}/{type(details[measure_key])} (should be {measure_assert}/{type(measure_assert)} )",
-                            )
-                            tests += 1
-                            if (
-                                measure_key in bsw_list
-                                or measure_key in pw_constants.ACTIVE_ACTUATORS
-                            ):
-                                tests -= 1
-                                for key_1, val_1 in measure_assert.items():
-                                    tests += 1
-                                    for key_2, val_2 in details[measure_key].items():
-                                        if key_1 != key_2:
-                                            continue
-
-                                        _LOGGER.info(
-                                            "%s",
-                                            f"  + Testing {key_1} ({val_1} should be {val_2})",
-                                        )
-                                        assert val_1 == val_2
-                                        asserts += 1
-                            else:
-                                assert details[measure_key] == measure_assert
-                                asserts += 1
-
-            assert tests == asserts
-            _LOGGER.debug("Number of zone test-assert: %s", asserts)
+            if header == "zones":
+                test_and_assert(data_dict, data.zones, header)
 
         # pragma warning restore S3776
 

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,6 @@`
`70`	`70`	`"heater_id": "04e4cbfe7f4340f090f85ec3b9e6a950",`
`71`	`71`	`"item_count": 41,`
`72`	`72`	`"smile_name": "Smile Anna"`
`73`		`- }`
	`73`	`+ },`
	`74`	`+ "zones": {}`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,6 @@`
`47`	`47`	`"notifications": {},`
`48`	`48`	`"reboot": true,`
`49`	`49`	`"smile_name": "Smile P1"`
`50`		`- }`
	`50`	`+ },`
	`51`	`+ "zones": {}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,6 @@`
`37`	`37`	`"gateway_id": "aaaa0000aaaa0000aaaa0000aaaa00aa",`
`38`	`38`	`"item_count": 26,`
`39`	`39`	`"smile_name": "Smile P1"`
`40`		`- }`
	`40`	`+ },`
	`41`	`+ "zones": {}`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,5 +137,6 @@`
`137`	`137`	`"gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",`
`138`	`138`	`"item_count": 83,`
`139`	`139`	`"smile_name": "Stretch"`
`140`		`- }`
	`140`	`+ },`
	`141`	`+ "zones": {}`
`141`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ async def async_update(self) -> PlugwiseData:`
`121`	`121`	`)`
`122`	`122`	`self.gw_data: GatewayData = {}`
`123`	`123`	`self.gw_devices: dict[str, DeviceData] = {}`
`124`		`- self.zones: dict[str, ZoneData] = {}`
	`124`	`+ self.zone_data: dict[str, ZoneData] = {}`
`125`	`125`	`await self.full_update_device()`
`126`	`126`	`self.get_all_devices()`
`127`	`127`	`# Otherwise perform an incremental update`