Skip to content

Update config_loader.py #147

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

Closed
TheItschi wants to merge 1 commit into from
Closed

Update config_loader.py #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 15 additions & 37 deletions config/config_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
Shelly3EMPro,
Shrdzm,
Emlog,
Em300,
IoBroker,
HomeAssistant,
VZLogger,
Expand All @@ -21,22 +22,21 @@
MqttPowermeter,
Script,
ESPHome,
JsonHttpPowermeter,
ThrottledPowermeter,
)

SHELLY_SECTION = "SHELLY"
TASMOTA_SECTION = "TASMOTA"
SHRDZM_SECTION = "SHRDZM"
EMLOG_SECTION = "EMLOG"
EM300_SECTION = "EM300"
IOBROKER_SECTION = "IOBROKER"
HOMEASSISTANT_SECTION = "HOMEASSISTANT"
VZLOGGER_SECTION = "VZLOGGER"
SCRIPT_SECTION = "SCRIPT"
ESPHOME_SECTION = "ESPHOME"
AMIS_READER_SECTION = "AMIS_READER"
MODBUS_SECTION = "MODBUS"
JSON_HTTP_SECTION = "JSON_HTTP"


class ClientFilter:
Expand Down Expand Up @@ -105,6 +105,8 @@ def create_powermeter(
return create_shrdzm_powermeter(section, config)
elif section.startswith(EMLOG_SECTION):
return create_emlog_powermeter(section, config)
elif section.startswith(EM300_SECTION):
return create_em300_powermeter(section, config)
elif section.startswith(IOBROKER_SECTION):
return create_iobroker_powermeter(section, config)
elif section.startswith(HOMEASSISTANT_SECTION):
Expand All @@ -119,8 +121,6 @@ def create_powermeter(
return create_amisreader_powermeter(section, config)
elif section.startswith(MODBUS_SECTION):
return create_modbus_powermeter(section, config)
elif section.startswith(JSON_HTTP_SECTION):
return create_json_http_powermeter(section, config)
elif section.startswith("MQTT"):
return create_mqtt_powermeter(section, config)
else:
Expand Down Expand Up @@ -172,36 +172,6 @@ def create_mqtt_powermeter(
)


def create_json_http_powermeter(
section: str, config: configparser.ConfigParser
) -> Powermeter:
json_paths = config.get(section, "JSON_PATHS", fallback="").split(",")
json_paths = [p.strip() for p in json_paths if p.strip()]
json_path_value = json_paths[0] if len(json_paths) == 1 else json_paths
return JsonHttpPowermeter(
config.get(section, "URL", fallback=""),
json_path_value,
config.get(section, "USERNAME", fallback=None),
config.get(section, "PASSWORD", fallback=None),
(
{
k.strip(): v.strip()
for k, v in (
[
item.split(":", 1)
for item in config.get(section, "HEADERS", fallback="").split(
";"
)
if ":" in item
]
)
}
if config.get(section, "HEADERS", fallback="")
else None
),
)


def create_modbus_powermeter(
section: str, config: configparser.ConfigParser
) -> Powermeter:
Expand All @@ -211,9 +181,6 @@ def create_modbus_powermeter(
config.getint(section, "UNIT_ID", fallback=1),
config.getint(section, "ADDRESS", fallback=0),
config.getint(section, "COUNT", fallback=1),
config.get(section, "DATA_TYPE", fallback="UINT16"),
config.get(section, "BYTE_ORDER", fallback="BIG"),
config.get(section, "WORD_ORDER", fallback="BIG"),
)


Expand Down Expand Up @@ -295,6 +262,17 @@ def create_emlog_powermeter(
)


def create_em300_powermeter(
section: str, config: configparser.ConfigParser
) -> Powermeter:
return Em300(
config.get(section, "IP", fallback=""),
config.get(section, "USER", fallback=""),
config.get(section, "PASS", fallback=""),
config.getboolean(section, "JSON_POWER_CALCULATE", fallback=False),
)


def create_shrdzm_powermeter(
section: str, config: configparser.ConfigParser
) -> Powermeter:
Expand Down