Merge pull request #424 from plugwise/count

bouwew · web-flow · commit 44ee74ec5c9f · 2023-10-14T19:38:31.000+02:00
Add device-items count to output
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Add item-count to output
+
 ## v0.33.1 Bugfix for Adam
 
 - Adam: remove use of control_state, xml-key no longer present.
diff --git a/fixtures/adam_heatpump_cooling/all_data.json b/fixtures/adam_heatpump_cooling/all_data.json
@@ -600,6 +600,7 @@
     "cooling_present": true,
     "gateway_id": "7d97fc3117784cfdafe347bcedcbbbcb",
     "heater_id": "0ca13e8176204ca7bf6f09de59f81c83",
+    "item_count": 433,
     "notifications": {},
     "smile_name": "Adam"
   }
diff --git a/fixtures/adam_jip/all_data.json b/fixtures/adam_jip/all_data.json
@@ -304,6 +304,7 @@
     "cooling_present": false,
     "gateway_id": "b5c2386c6f6342669e50fe49dd05b188",
     "heater_id": "e4684553153b44afbef2200885f379dc",
+    "item_count": 219,
     "notifications": {},
     "smile_name": "Adam"
   }
diff --git a/fixtures/adam_multiple_devices_per_zone/all_data.json b/fixtures/adam_multiple_devices_per_zone/all_data.json
@@ -473,6 +473,7 @@
     "cooling_present": false,
     "gateway_id": "fe799307f1624099878210aa0b9f1475",
     "heater_id": "90986d591dcd426cae3ec3e8111ff730",
+    "item_count": 320,
     "notifications": {
       "af82e4ccf9c548528166d38e560662a4": {
         "warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."
diff --git a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json b/fixtures/adam_onoff_cooling_fake_firmware/all_data.json
@@ -91,6 +91,7 @@
     "cooling_present": true,
     "gateway_id": "7d97fc3117784cfdafe347bcedcbbbcb",
     "heater_id": "0ca13e8176204ca7bf6f09de59f81c83",
+    "item_count": 56,
     "notifications": {},
     "smile_name": "Adam"
   }
diff --git a/fixtures/adam_plus_anna/all_data.json b/fixtures/adam_plus_anna/all_data.json
@@ -110,6 +110,7 @@
     "cooling_present": false,
     "gateway_id": "b128b4bbbd1f47e9bf4d756e8fb5ee94",
     "heater_id": "2743216f626f43948deec1f7ab3b3d70",
+    "item_count": 71,
     "notifications": {
       "6fb89e35caeb4b1cb275184895202d84": {
         "error": "There is no OpenTherm communication with the boiler."
diff --git a/fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json b/fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json
@@ -108,6 +108,7 @@
     "cooling_present": false,
     "gateway_id": "b128b4bbbd1f47e9bf4d756e8fb5ee94",
     "heater_id": "2743216f626f43948deec1f7ab3b3d70",
+    "item_count": 71,
     "notifications": {
       "3d28a20e17cb47dca210a132463721d5": {
         "error": "ZigBee Stick 000D6F000D5A3184 has been unreachable since 05:36 2020-06-18. Please check if the ZigBee Stick is still inserted in the Gateway USB port and restart Gateway by powering it down for a few seconds."
diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json
@@ -217,6 +217,7 @@
     "cooling_present": false,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
+    "item_count": 145,
     "notifications": {},
     "smile_name": "Adam"
   }
diff --git a/fixtures/adam_zone_per_device/all_data.json b/fixtures/adam_zone_per_device/all_data.json
@@ -473,6 +473,7 @@
     "cooling_present": false,
     "gateway_id": "fe799307f1624099878210aa0b9f1475",
     "heater_id": "90986d591dcd426cae3ec3e8111ff730",
+    "item_count": 320,
     "notifications": {
       "af82e4ccf9c548528166d38e560662a4": {
         "warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."
diff --git a/fixtures/anna_elga_2/all_data.json b/fixtures/anna_elga_2/all_data.json
@@ -89,6 +89,7 @@
     "cooling_present": false,
     "gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
     "heater_id": "573c152e7d4f4720878222bd75638f5b",
+    "item_count": 60,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_elga_2_cooling/all_data.json b/fixtures/anna_elga_2_cooling/all_data.json
@@ -92,6 +92,7 @@
     "cooling_present": true,
     "gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
     "heater_id": "573c152e7d4f4720878222bd75638f5b",
+    "item_count": 63,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_elga_2_schedule_off/all_data.json b/fixtures/anna_elga_2_schedule_off/all_data.json
@@ -89,6 +89,7 @@
     "cooling_present": false,
     "gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",
     "heater_id": "573c152e7d4f4720878222bd75638f5b",
+    "item_count": 60,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_heatpump_cooling/all_data.json b/fixtures/anna_heatpump_cooling/all_data.json
@@ -93,6 +93,7 @@
     "cooling_present": true,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json b/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json
@@ -93,6 +93,7 @@
     "cooling_present": true,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_heatpump_heating/all_data.json b/fixtures/anna_heatpump_heating/all_data.json
@@ -95,6 +95,7 @@
     "cooling_present": false,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_loria_cooling_active/all_data.json b/fixtures/anna_loria_cooling_active/all_data.json
@@ -95,6 +95,7 @@
     "cooling_present": true,
     "gateway_id": "9ff0569b4984459fb243af64c0901894",
     "heater_id": "bfb5ee0a88e14e5f97bfa725a760cc49",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_loria_heating_idle/all_data.json b/fixtures/anna_loria_heating_idle/all_data.json
@@ -95,6 +95,7 @@
     "cooling_present": true,
     "gateway_id": "9ff0569b4984459fb243af64c0901894",
     "heater_id": "bfb5ee0a88e14e5f97bfa725a760cc49",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_v4/all_data.json b/fixtures/anna_v4/all_data.json
@@ -88,6 +88,7 @@
     "cooling_present": false,
     "gateway_id": "0466eae8520144c78afb29628384edeb",
     "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
+    "item_count": 57,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_v4_dhw/all_data.json b/fixtures/anna_v4_dhw/all_data.json
@@ -88,6 +88,7 @@
     "cooling_present": false,
     "gateway_id": "0466eae8520144c78afb29628384edeb",
     "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
+    "item_count": 57,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_v4_no_tag/all_data.json b/fixtures/anna_v4_no_tag/all_data.json
@@ -88,6 +88,7 @@
     "cooling_present": false,
     "gateway_id": "0466eae8520144c78afb29628384edeb",
     "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
+    "item_count": 57,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_without_boiler_fw3/all_data.json b/fixtures/anna_without_boiler_fw3/all_data.json
@@ -62,6 +62,7 @@
     "cooling_present": false,
     "gateway_id": "a270735e4ccd45239424badc0578a2b1",
     "heater_id": "c46b4794d28149699eacf053deedd003",
+    "item_count": 39,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_without_boiler_fw4/all_data.json b/fixtures/anna_without_boiler_fw4/all_data.json
@@ -62,6 +62,7 @@
     "cooling_present": false,
     "gateway_id": "a270735e4ccd45239424badc0578a2b1",
     "heater_id": "c46b4794d28149699eacf053deedd003",
+    "item_count": 39,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/anna_without_boiler_fw42/all_data.json b/fixtures/anna_without_boiler_fw42/all_data.json
@@ -62,6 +62,7 @@
     "cooling_present": false,
     "gateway_id": "a270735e4ccd45239424badc0578a2b1",
     "heater_id": "c46b4794d28149699eacf053deedd003",
+    "item_count": 39,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/legacy_anna/all_data.json b/fixtures/legacy_anna/all_data.json
@@ -68,6 +68,7 @@
     "cooling_present": false,
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
     "heater_id": "04e4cbfe7f4340f090f85ec3b9e6a950",
+    "item_count": 45,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/legacy_anna_2/all_data.json b/fixtures/legacy_anna_2/all_data.json
@@ -70,6 +70,7 @@
     "cooling_present": false,
     "gateway_id": "be81e3f8275b4129852c4d8d550ae2eb",
     "heater_id": "ea5d8a7177e541b0a4b52da815166de4",
+    "item_count": 45,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/m_adam_cooling/all_data.json b/fixtures/m_adam_cooling/all_data.json
@@ -155,6 +155,7 @@
     "cooling_present": true,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
+    "item_count": 145,
     "notifications": {},
     "smile_name": "Adam"
   }
diff --git a/fixtures/m_adam_heating/all_data.json b/fixtures/m_adam_heating/all_data.json
@@ -150,6 +150,7 @@
     "cooling_present": false,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
+    "item_count": 145,
     "notifications": {},
     "smile_name": "Adam"
   }
diff --git a/fixtures/m_anna_heatpump_cooling/all_data.json b/fixtures/m_anna_heatpump_cooling/all_data.json
@@ -98,6 +98,7 @@
     "cooling_present": true,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/m_anna_heatpump_idle/all_data.json b/fixtures/m_anna_heatpump_idle/all_data.json
@@ -98,6 +98,7 @@
     "cooling_present": true,
     "gateway_id": "015ae9ea3f964e668e490fa39da3870b",
     "heater_id": "1cbf783bb11e4a7c8a6843dee3a86927",
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }
diff --git a/fixtures/p1v3/all_data.json b/fixtures/p1v3/all_data.json
@@ -38,6 +38,7 @@
   },
   "gateway": {
     "gateway_id": "a455b61e52394b2db5081ce025a430f3",
+    "item_count": 27,
     "notifications": {},
     "smile_name": "Smile P1"
   }
diff --git a/fixtures/p1v3_full_option/all_data.json b/fixtures/p1v3_full_option/all_data.json
@@ -42,6 +42,7 @@
   },
   "gateway": {
     "gateway_id": "cd3e822288064775a7c4afcdd70bdda2",
+    "item_count": 31,
     "notifications": {},
     "smile_name": "Smile P1"
   }
diff --git a/fixtures/p1v3solarfake/all_data.json b/fixtures/p1v3solarfake/all_data.json
@@ -38,6 +38,7 @@
   },
   "gateway": {
     "gateway_id": "a455b61e52394b2db5081ce025a430f3",
+    "item_count": 27,
     "notifications": {},
     "smile_name": "Smile P1"
   }
diff --git a/fixtures/p1v4/all_data.json b/fixtures/p1v4/all_data.json
@@ -40,6 +40,7 @@
   },
   "gateway": {
     "gateway_id": "a455b61e52394b2db5081ce025a430f3",
+    "item_count": 29,
     "notifications": {
       "97a04c0c263049b29350a660b4cdd01e": {
         "warning": "The Smile P1 does not seem to be connected to a smart meter."
diff --git a/fixtures/p1v4_442_single/all_data.json b/fixtures/p1v4_442_single/all_data.json
@@ -42,6 +42,7 @@
   },
   "gateway": {
     "gateway_id": "a455b61e52394b2db5081ce025a430f3",
+    "item_count": 31,
     "notifications": {},
     "smile_name": "Smile P1"
   }
diff --git a/fixtures/p1v4_442_triple/all_data.json b/fixtures/p1v4_442_triple/all_data.json
@@ -51,6 +51,7 @@
   },
   "gateway": {
     "gateway_id": "03e65b16e4b247a29ae0d75a78cb492e",
+    "item_count": 40,
     "notifications": {
       "97a04c0c263049b29350a660b4cdd01e": {
         "warning": "The Smile P1 is not connected to a smart meter."
diff --git a/fixtures/smile_p1_v2/all_data.json b/fixtures/smile_p1_v2/all_data.json
@@ -35,6 +35,7 @@
   },
   "gateway": {
     "gateway_id": "aaaa0000aaaa0000aaaa0000aaaa00aa",
+    "item_count": 26,
     "notifications": {},
     "smile_name": "Smile P1"
   }
diff --git a/fixtures/smile_p1_v2_2/all_data.json b/fixtures/smile_p1_v2_2/all_data.json
@@ -35,6 +35,7 @@
   },
   "gateway": {
     "gateway_id": "aaaa0000aaaa0000aaaa0000aaaa00aa",
+    "item_count": 26,
     "notifications": {},
     "smile_name": "Smile P1"
   }
diff --git a/fixtures/stretch_v23/all_data.json b/fixtures/stretch_v23/all_data.json
@@ -334,6 +334,7 @@
   },
   "gateway": {
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "item_count": 229,
     "notifications": {},
     "smile_name": "Stretch"
   }
diff --git a/fixtures/stretch_v27_no_domain/all_data.json b/fixtures/stretch_v27_no_domain/all_data.json
@@ -273,6 +273,7 @@
   },
   "gateway": {
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "item_count": 190,
     "notifications": {},
     "smile_name": "Stretch"
   }
diff --git a/fixtures/stretch_v31/all_data.json b/fixtures/stretch_v31/all_data.json
@@ -135,6 +135,7 @@
   },
   "gateway": {
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "item_count": 83,
     "notifications": {},
     "smile_name": "Stretch"
   }
diff --git a/plugwise/__init__.py b/plugwise/__init__.py
diff --git a/plugwise/constants.py b/plugwise/constants.py
diff --git a/plugwise/helper.py b/plugwise/helper.py
diff --git a/tests/test_smile.py b/tests/test_smile.py

Original file line number	Diff line number	Diff line change
`@@ -600,6 +600,7 @@`
`600`	`600`	`"cooling_present": true,`
`601`	`601`	`"gateway_id": "7d97fc3117784cfdafe347bcedcbbbcb",`
`602`	`602`	`"heater_id": "0ca13e8176204ca7bf6f09de59f81c83",`
	`603`	`+ "item_count": 433,`
`603`	`604`	`"notifications": {},`
`604`	`605`	`"smile_name": "Adam"`
`605`	`606`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@`
`304`	`304`	`"cooling_present": false,`
`305`	`305`	`"gateway_id": "b5c2386c6f6342669e50fe49dd05b188",`
`306`	`306`	`"heater_id": "e4684553153b44afbef2200885f379dc",`
	`307`	`+ "item_count": 219,`
`307`	`308`	`"notifications": {},`
`308`	`309`	`"smile_name": "Adam"`
`309`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@`
`91`	`91`	`"cooling_present": true,`
`92`	`92`	`"gateway_id": "7d97fc3117784cfdafe347bcedcbbbcb",`
`93`	`93`	`"heater_id": "0ca13e8176204ca7bf6f09de59f81c83",`
	`94`	`+ "item_count": 56,`
`94`	`95`	`"notifications": {},`
`95`	`96`	`"smile_name": "Adam"`
`96`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@`
`217`	`217`	`"cooling_present": false,`
`218`	`218`	`"gateway_id": "da224107914542988a88561b4452b0f6",`
`219`	`219`	`"heater_id": "056ee145a816487eaa69243c3280f8bf",`
	`220`	`+ "item_count": 145,`
`220`	`221`	`"notifications": {},`
`221`	`222`	`"smile_name": "Adam"`
`222`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@`
`89`	`89`	`"cooling_present": false,`
`90`	`90`	`"gateway_id": "fb49af122f6e4b0f91267e1cf7666d6f",`
`91`	`91`	`"heater_id": "573c152e7d4f4720878222bd75638f5b",`
	`92`	`+ "item_count": 60,`
`92`	`93`	`"notifications": {},`
`93`	`94`	`"smile_name": "Smile Anna"`
`94`	`95`	`}`