Skip to content

Typing 1 b #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bouwew wants to merge 29 commits into
base: main
Choose a base branch
from
Draft

Typing 1 b #870

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
eca817e
Initial typed xml reading attempt (incomplete)
CoMPaTech Dec 28, 2025
408682b
Further progress
CoMPaTech Dec 29, 2025
6c6b3f2
Further progress - appliance typos
CoMPaTech Dec 29, 2025
709e84c
Some progress
CoMPaTech Dec 29, 2025
660acd8
More progress
CoMPaTech Dec 29, 2025
826c387
Further cleaning
CoMPaTech Dec 29, 2025
baf3419
Gateway progress
CoMPaTech Dec 31, 2025
9cd1b54
Fix after rebase
bouwew Jan 24, 2026
91b6877
Contents -> content
bouwew Jan 24, 2026
e2ad185
Fix module_data
bouwew Jan 24, 2026
9c011df
Fix another contents
bouwew Jan 24, 2026
6d09ec6
Add xmltodict to requirements
bouwew Apr 5, 2026
04698e7
Change index from 5 to 4
bouwew Apr 5, 2026
7e393f5
Update _appl_heater_central_info()
bouwew Apr 6, 2026
1d36e07
Update check_heater_central()
bouwew Apr 7, 2026
7c84129
And use
bouwew Apr 7, 2026
39ab2b3
Fixes
bouwew Apr 7, 2026
d7fa9f7
More _appl_heater_central_info() updating
bouwew Apr 13, 2026
85bfdda
Fix contents
bouwew Apr 13, 2026
613cbb3
Update _appl_thermostat_info()
bouwew Apr 13, 2026
aeee690
Update _get_appliances_with_offset_functionality()
bouwew Apr 13, 2026
8e3c64c
get_groups()
bouwew Apr 13, 2026
a4a8822
Disable prints, add logger
bouwew Apr 17, 2026
6728175
Disable initial Adam testcase
bouwew Apr 17, 2026
bbe0e9d
Add _create_gw_entities() call
bouwew Apr 17, 2026
a998ae0
Extend Appliance class
bouwew Apr 18, 2026
51f9db4
Correct to appl.id
bouwew Apr 18, 2026
17e6798
Various improvements
bouwew Apr 18, 2026
e9d0d42
fixup: typing_1_b Python code fixed using ruff
Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Contents -> content
  • Loading branch information
@bouwew
bouwew committed Apr 5, 2026
commit 91b6877e305dbe76b350b40aff4876b9c1fd405e
8 changes: 4 additions & 4 deletions plugwise/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ def _appl_heater_central_info(
# xml_3: self._modules for legacy, self._domain_objects for actual
xml_3 = return_valid(xml_3, self._domain_objects)
module_data = self._get_module_data(xml_1, locator_1, xml_2=xml_3)
if not module_data["contents"]:
if not module_data["content"]:
module_data = self._get_module_data(xml_1, locator_2, xml_2=xml_3)
if not module_data["contents"]:
if not module_data["content"]:
self._heater_id = NONE
return (
Munch()
Expand All @@ -133,7 +133,7 @@ def _appl_thermostat_info(
locator = "./logs/point_log[type='thermostat']/thermostat"
xml_2 = return_valid(xml_2, self._domain_objects)
module_data = self._get_module_data(xml_1, locator, xml_2=xml_2)
if not module_data["contents"]:
if not module_data["content"]:
return Munch() # no module-data present means the device has been removed

appl.vendor_name = module_data["vendor_name"]
Expand Down Expand Up @@ -287,7 +287,7 @@ def _get_module_data(
search = return_valid(xml_2, self._domain_objects)
module = search.find(loc)
if module is not None: # pylint: disable=consider-using-assignment-expr
module_data["contents"] = True
module_data["content"] = True
get_vendor_name(module, module_data)
module_data["vendor_model"] = module.find("vendor_model").text
module_data["hardware_version"] = module.find("hardware_version").text
Expand Down
4 changes: 2 additions & 2 deletions plugwise/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def _get_p1_smartmeter_info(self) -> None:
tag = "electricity"
module_data = self._get_module_data(self._home_location, locator, key=tag)
# No module-data present means the device has been removed
if not module_data["contents"]: # pragma: no cover
if not module_data["content"]: # pragma: no cover
return

appl.available = None
Expand Down Expand Up @@ -232,7 +232,7 @@ def _appliance_info_finder(self, appliance: Appliance) -> Appliance | None:
locator = MODULE_LOCATOR
module_data = self._get_module_data(appliance, locator)
# A plug without module-data is orphaned/ no present
if not module_data["contents"]:
if not module_data["content"]:
return None

print(f"HOI24 {module_data}")
Expand Down