Skip to content

Code quality cleanup #75

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

Merged
merged 23 commits into from
Aug 8, 2022
Merged

Code quality cleanup #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e1ce2a4
Style python code with black
WillCodeForCats Aug 6, 2022
3886f87
Update python-lint.yaml
WillCodeForCats Aug 6, 2022
9778a3a
Update python-lint.yaml
WillCodeForCats Aug 6, 2022
7cccad3
F541 f-string is missing placeholders
WillCodeForCats Aug 6, 2022
f1e9809
F401 imported but unused
WillCodeForCats Aug 6, 2022
a1a6692
E711 comparison to None
WillCodeForCats Aug 6, 2022
9afd065
F821 undefined name 'Any'
WillCodeForCats Aug 6, 2022
ab5a404
E501 line too long
WillCodeForCats Aug 7, 2022
5f93a31
E722 do not use bare 'except'
WillCodeForCats Aug 7, 2022
687b1e4
Update python-lint.yaml
WillCodeForCats Aug 7, 2022
c677365
Update helpers.py
WillCodeForCats Aug 7, 2022
c1c6f8b
Merge branch 'main' into code-quality-cleanup
WillCodeForCats Aug 7, 2022
b09ed68
Update helpers.py
WillCodeForCats Aug 7, 2022
7096ef6
Merge branch 'code-quality-cleanup' of https://github.com/WillCodeFor…
WillCodeForCats Aug 7, 2022
01d8c17
Merge branch 'main' into code-quality-cleanup
WillCodeForCats Aug 7, 2022
2a8c202
Create .flake8
WillCodeForCats Aug 7, 2022
7e5d0b8
Create .isort.cfg
WillCodeForCats Aug 7, 2022
ba2d5bc
Use setup.cfg for isort and flake8
WillCodeForCats Aug 7, 2022
c805baa
Merge branch 'main' into code-quality-cleanup
WillCodeForCats Aug 7, 2022
62e63e9
Re-run black with default 88 chars per line
WillCodeForCats Aug 7, 2022
c0daf91
E501 line too long
WillCodeForCats Aug 7, 2022
1d14e2e
Merge branch 'main' into code-quality-cleanup
WillCodeForCats Aug 8, 2022
0c7fa8e
Fix improperly formatted strings
WillCodeForCats Aug 8, 2022
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
113 changes: 76 additions & 37 deletions custom_components/solaredge_modbus_multi/hub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ async def _async_init_solaredge(self) -> None:

if self._detect_batteries:
_LOGGER.warning(
"Battery registers not officially supported by SolarEdge. ",
"Use at your own risk!",
(
"Battery registers not officially supported by SolarEdge. "
"Use at your own risk!"
),
)

for inverter_index in range(self.number_of_inverters):
Expand All @@ -125,8 +127,10 @@ async def _async_init_solaredge(self) -> None:
for meter in self.meters:
if new_meter_1.serial == meter.serial:
_LOGGER.warning(
f"Duplicate serial {new_meter_1.serial} ",
f"on meter 1 inverter {inverter_unit_id}",
(
f"Duplicate serial {new_meter_1.serial} "
f"on meter 1 inverter {inverter_unit_id}"
),
)
raise DeviceInitFailed(
f"Duplicate m1 serial {new_meter_1.serial}"
Expand All @@ -144,8 +148,10 @@ async def _async_init_solaredge(self) -> None:
for meter in self.meters:
if new_meter_2.serial == meter.serial:
_LOGGER.warning(
f"Duplicate serial {new_meter_2.serial} ",
"on meter 2 inverter {inverter_unit_id}",
(
f"Duplicate serial {new_meter_2.serial} "
f"on meter 2 inverter {inverter_unit_id}"
),
)
raise DeviceInitFailed(
f"Duplicate m2 serial {new_meter_2.serial}"
Expand All @@ -163,8 +169,10 @@ async def _async_init_solaredge(self) -> None:
for meter in self.meters:
if new_meter_3.serial == meter.serial:
_LOGGER.warning(
f"Duplicate serial {new_meter_3.serial} ",
"on meter 3 inverter {inverter_unit_id}",
(
f"Duplicate serial {new_meter_3.serial} "
f"on meter 3 inverter {inverter_unit_id}"
),
)
raise DeviceInitFailed(
f"Duplicate m3 serial {new_meter_3.serial}"
Expand All @@ -183,8 +191,10 @@ async def _async_init_solaredge(self) -> None:
for battery in self.batteries:
if new_battery_1.serial == battery.serial:
_LOGGER.warning(
f"Duplicate serial {new_battery_1.serial} ",
"on battery 1 inverter {inverter_unit_id}",
(
f"Duplicate serial {new_battery_1.serial} "
f"on battery 1 inverter {inverter_unit_id}"
),
)
raise DeviceInitFailed(
f"Duplicate b1 serial {new_battery_1.serial}"
Expand All @@ -202,8 +212,10 @@ async def _async_init_solaredge(self) -> None:
for battery in self.batteries:
if new_battery_2.serial == battery.serial:
_LOGGER.warning(
f"Duplicate serial {new_battery_2.serial} ",
"on battery 2 inverter {inverter_unit_id}",
(
f"Duplicate serial {new_battery_2.serial} "
f"on battery 2 inverter {inverter_unit_id}"
),
)
raise DeviceInitFailed(
f"Duplicate b2 serial {new_battery_1.serial}"
Expand Down Expand Up @@ -328,7 +340,10 @@ def init_device(self) -> None:

for name, value in iteritems(decoded_ident):
_LOGGER.debug(
"%s %s", name, hex(value) if isinstance(value, int) else value
(
f"Inverter {self.inverter_unit_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

if (
Expand Down Expand Up @@ -368,8 +383,10 @@ def init_device(self) -> None:

for name, value in iteritems(self.decoded_common):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

self.manufacturer = self.decoded_common["C_Manufacturer"]
Expand Down Expand Up @@ -410,8 +427,10 @@ def read_modbus_data(self) -> None:

for name, value in iteritems(decoded_ident):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

if (
Expand Down Expand Up @@ -477,8 +496,10 @@ def read_modbus_data(self) -> None:

for name, value in iteritems(self.decoded_model):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

@property
Expand Down Expand Up @@ -522,8 +543,10 @@ def init_device(self) -> None:
)
if meter_info.isError():
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} ",
f"meter {self.meter_id}: {meter_info}",
(
f"Inverter {self.inverter_unit_id} "
f"meter {self.meter_id}: {meter_info}"
),
)
raise ModbusReadError(meter_info)

Expand All @@ -539,8 +562,10 @@ def init_device(self) -> None:

for name, value in iteritems(decoded_ident):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

if (
Expand Down Expand Up @@ -581,8 +606,10 @@ def init_device(self) -> None:

for name, value in iteritems(self.decoded_common):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

self.manufacturer = self.decoded_common["C_Manufacturer"]
Expand Down Expand Up @@ -610,8 +637,10 @@ def read_modbus_data(self) -> None:
)
if meter_data.isError():
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} ",
f"meter {self.meter_id}: {meter_data}",
(
f"Inverter {self.inverter_unit_id} "
f"meter {self.meter_id}: {meter_data}"
),
)
raise ModbusReadError(f"Meter read error: {meter_data}")

Expand All @@ -628,8 +657,10 @@ def read_modbus_data(self) -> None:

for name, value in iteritems(decoded_ident):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

if (
Expand Down Expand Up @@ -734,8 +765,10 @@ def read_modbus_data(self) -> None:

for name, value in iteritems(self.decoded_model):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

@property
Expand Down Expand Up @@ -777,8 +810,10 @@ def init_device(self) -> None:
)
if battery_info.isError():
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} ",
f"battery {self.battery_id}: {battery_info}",
(
f"Inverter {self.inverter_unit_id} "
f"battery {self.battery_id}: {battery_info}"
),
)
raise ModbusReadError(battery_info)

Expand Down Expand Up @@ -811,8 +846,10 @@ def init_device(self) -> None:

for name, value in iteritems(self.decoded_common):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} batt {self.battery_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id} batt {self.battery_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

self.decoded_common["B_Manufacturer"] = self.decoded_common[
Expand Down Expand Up @@ -902,8 +939,10 @@ def read_modbus_data(self) -> None:

for name, value in iteritems(self.decoded_model):
_LOGGER.debug(
f"Inverter {self.inverter_unit_id} batt {self.battery_id}: ",
f"{name} {hex(value) if isinstance(value, int) else value}",
(
f"Inverter {self.inverter_unit_id} batt {self.battery_id}: "
f"{name} {hex(value) if isinstance(value, int) else value}"
),
)

@property
Expand Down
Loading