ben/energy-usage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from optiz0r/single_fuel

Browse Source 
Support data for only a single meter
This commit is contained in:
Ben Roberts
2022-05-25 22:07:55 +01:00
committed by GitHub
parent b7b57fb05e 9e5ebeb744
commit b4c5ceb90e
3 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,3 +2,5 @@
dist/
*.egg-info/
__pycache__
config.yaml
env/

1
energy_usage/main.py
View File

@@ -99,6 +99,7 @@ def main():
usage = parse_sep(msg.topic, msg.payload)
if usage:
usage_datapoints = usage_to_datapoints(usage)
logger.debug('Writing metrics to influx: %s', usage_datapoints)
if not config["noop"].get(bool):
influx_client.write_points(usage_datapoints)
except KeyboardInterrupt:

68
energy_usage/sep.py
View File

@@ -31,30 +31,7 @@ def parse_sep(topic, payload_str):
payload = json.loads(payload_str)
try:
assert(_get_metric(["elecMtr", "0702", "03", "00"]) == 0) # kWh
assert(_get_metric(["gasMtr", "0702", "03", "01"]) == 1) # m3
assert(_get_metric(["gasMtr", "0702", "03", "12"]) == 0) # kWh
except AssertionError:
logger.warning("Received a payload without expected data")
return None
timestamp = datetime.datetime.fromtimestamp(payload["gmtime"], tz=datetime.timezone.utc)
electricity_consumption = _get_metric(["elecMtr", "0702", "04", "00"])
electricity_daily_consumption = _get_metric(["elecMtr", "0702", "04", "01"])
electricity_weekly_consumption = _get_metric(["elecMtr", "0702", "04", "30"])
electricity_monthly_consumption = _get_metric(["elecMtr", "0702", "04", "40"])
electricity_multiplier = _get_metric(["elecMtr", "0702", "03", "01"])
electricity_divisor = _get_metric(["elecMtr", "0702", "03", "02"])
electricity_meter = _get_metric(["elecMtr", "0702", "00", "00"])
electricity_mpan = _get_metric(["elecMtr", "0702", "03", "07"], str)
gas_daily_consumption = _get_metric(["gasMtr", "0702", "0C", "01"])
gas_weekly_consumption = _get_metric(["gasMtr", "0702", "0C", "30"])
gas_monthly_consumption = _get_metric(["gasMtr", "0702", "0C", "40"])
gas_multiplier = _get_metric(["gasMtr", "0702", "03", "01"])
gas_divisor = _get_metric(["gasMtr", "0702", "03", "02"])
gas_meter = _get_metric(["gasMtr", "0702", "00", "00"])
gas_mpan = _get_metric(["gasMtr", "0702", "03", "07"], str)
device_gid = _get_metric(["gid"], str)
data = {
@@ -63,7 +40,21 @@ def parse_sep(topic, payload_str):
'topic': topic,
'gid': device_gid,
},
'electricity': {
}
try:
assert(_get_metric(["elecMtr", "0702", "03", "00"]) == 0) # kWh
electricity_consumption = _get_metric(["elecMtr", "0702", "04", "00"])
electricity_daily_consumption = _get_metric(["elecMtr", "0702", "04", "01"])
electricity_weekly_consumption = _get_metric(["elecMtr", "0702", "04", "30"])
electricity_monthly_consumption = _get_metric(["elecMtr", "0702", "04", "40"])
electricity_multiplier = _get_metric(["elecMtr", "0702", "03", "01"])
electricity_divisor = _get_metric(["elecMtr", "0702", "03", "02"])
electricity_meter = _get_metric(["elecMtr", "0702", "00", "00"])
electricity_mpan = _get_metric(["elecMtr", "0702", "03", "07"], str)
data.update({'electricity': {
'tags': {
'mpan': electricity_mpan,
},
@@ -74,8 +65,23 @@ def parse_sep(topic, payload_str):
'consumption_monthly': electricity_monthly_consumption * electricity_multiplier / electricity_divisor,
'meter_reading': electricity_meter * electricity_multiplier / electricity_divisor,
},
},
'gas': {
}})
except AssertionError:
pass
try:
assert(_get_metric(["gasMtr", "0702", "03", "01"]) == 1) # m3
assert(_get_metric(["gasMtr", "0702", "03", "12"]) == 0) # kWh
gas_daily_consumption = _get_metric(["gasMtr", "0702", "0C", "01"])
gas_weekly_consumption = _get_metric(["gasMtr", "0702", "0C", "30"])
gas_monthly_consumption = _get_metric(["gasMtr", "0702", "0C", "40"])
gas_multiplier = _get_metric(["gasMtr", "0702", "03", "01"])
gas_divisor = _get_metric(["gasMtr", "0702", "03", "02"])
gas_meter = _get_metric(["gasMtr", "0702", "00", "00"])
gas_mpan = _get_metric(["gasMtr", "0702", "03", "07"], str)
data.update({'gas': {
'tags': {
'mpan': gas_mpan,
},
@@ -85,8 +91,13 @@ def parse_sep(topic, payload_str):
'consumption_monthly': gas_monthly_consumption * gas_multiplier / gas_divisor,
'meter_reading': gas_meter * gas_multiplier / gas_divisor,
},
},
}
}})
except AssertionError:
pass
if 'electricity' not in data and 'gas' not in data:
logger.warning("Received a payload without either electricity or gas data")
return None
return data
@@ -95,6 +106,7 @@ def usage_to_datapoints(usage):
datapoints = []
for utility in ['electricity', 'gas']:
if utility in usage:
datapoints.append({
"measurement": utility,
"tags": {**usage['tags'], **usage[utility]['tags']},