agl: agl.py annotate

annotate agl.py @ 12:b610ce4ec081

Cull dead code.

author	Daniel O'Connor <darius@dons.net.au>
date	Mon, 11 Sep 2017 20:57:10 +0930
parents	9fac3371e9ad
children	988e511a5f29

rev	line source
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	1 #!/usr/bin/env python
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	2
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	3 import argparse
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	4 import ConfigParser
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	5 import datetime
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	6 import dateutil
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	7 import exceptions
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	8 import json
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	9 import os
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	10 import requests
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	11 import sqlite3
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	12 import sys
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	13 import tzlocal
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	14
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	15 loginurl = 'https://command.aglsolar.com.au/api/v2/Account/LoginUser'
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	16 dataurl = 'https://command.aglsolar.com.au/api/v2/graph/b8e08afb-818f-4d2d-9d28-5afe8fc76a32'
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	17 # ?endDate=2017-08-23&granularity=Minute&metrics=read&startDate=2017-08-23&units=W'
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	18 logouturl = 'https://command.aglsolar.com.au/api/v2/Account/Logout'
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	19
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	20 def valid_date(s):
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	21 try:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	22 return datetime.datetime.strptime(s, "%Y-%m-%d")
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	23 except ValueError:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	24 raise argparse.ArgumentTypeError("Not a valid date: '{0}'.".format(s))
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	25
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	26 def main():
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	27 parser = argparse.ArgumentParser()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	28 parser.add_argument('-u', '--update', help = 'Update data', action="store_true")
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	29 parser.add_argument('-g', '--graph', help = 'Produce graph', action="store_true")
4 deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	30 parser.add_argument('-f', '--filename', help = 'Filename to save graph as', type = str)
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	31 parser.add_argument('-s', '--start', help = 'Start date for graph (YYYY-MM-DD)', type = valid_date)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	32 parser.add_argument('-e', '--end', help = 'End date for graph (YYYY-MM-DD)', type = valid_date)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	33
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	34 args = parser.parse_args()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	35
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	36 conf = ConfigParser.ConfigParser()
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	37 confname = os.environ['HOME'] + '/.agl.ini'
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	38 conf.read(confname)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	39 username = conf.get('DEFAULT', 'username')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	40 password = conf.get('DEFAULT', 'password')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	41 dbfn = conf.get('DEFAULT', 'db')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	42
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	43 if (args.start is None) ^ (args.end is None):
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	44 parser.error('Must specify start and end or neither')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	45
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	46 if not args.update and not args.graph:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	47 parser.error('Nothing to do')
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	48
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	49 start = args.start
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	50 if start is None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	51 start = datetime.date.today()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	52 start = datetime.datetime(start.year, start.month, start.day)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	53
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	54 end = args.end
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	55 if end is None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	56 end = start + datetime.timedelta(days = 1)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	57 end = datetime.datetime(end.year, end.month, end.day)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	58
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	59 dbh = sqlite3.connect(dbfn, detect_types = sqlite3.PARSE_DECLTYPES)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	60 cur = dbh.cursor()
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	61 if args.update:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	62 date = start
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	63 while date < end:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	64 if conf.has_option('DEFAULT', 'token'):
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	65 token = conf.get('DEFAULT', 'token')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	66 else:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	67 token = gettoken(username, password)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	68 conf.set('DEFAULT', 'token', token)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	69 conf.write(file(confname, 'w'))
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	70
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	71 data = getdata(token, date, date)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	72 if data == None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	73 #print('Getting new token')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	74 token = gettoken(username, password)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	75 data = getdata(token, date, date)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	76 if data == None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	77 print('Unable to fetch data')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	78 updatedb(cur, data)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	79 dbh.commit()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	80 date += datetime.timedelta(days = 1)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	81
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	82 if args.graph:
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	83 graph(args.filename, cur, ['battery_charge', 'battery_power', 'power_imported', 'power_exported', 'power_consumed', 'power_generated'], start, end)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	84
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	85 def mkdb(cur):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	86 cur.execute('''
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	87 CREATE TABLE IF NOT EXISTS agl (
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	88 t_stamp TIMESTAMP PRIMARY KEY,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	89 battery_charge NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	90 battery_power NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	91 power_consumed NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	92 power_expected NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	93 power_exported NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	94 power_generated NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	95 power_imported NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	96 estimated_savings NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	97 pv_forecast NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	98 pv_gen_battery NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	99 pv_gen_grid NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	100 pv_gen_site NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	101 site_cons_battery NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	102 site_cons_grid NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	103 site_cons_pv NUMBER
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	104 )''')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	105
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	106 units = {
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	107 'battery_charge' : '%',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	108 'battery_power' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	109 'power_consumed' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	110 'power_expected' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	111 'power_exported' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	112 'power_generated' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	113 'power_imported' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	114 'estimated_savings' : '$',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	115 'pv_forecast' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	116 'pv_gen_battery' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	117 'pv_gen_grid' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	118 'pv_gen_site' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	119 'site_cons_battery' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	120 'site_cons_grid' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	121 'site_cons_pv' : 'Watt'
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	122 }
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	123
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	124 convs = {
8 22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	125 'battery_power' : lambda a: a / 1000.0,
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	126 }
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	127
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	128 scale_limits = {
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	129 'battery_charge' : (0, 100),
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	130 }
b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	131
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	132 tarrifs = {
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	133 'power_exported' : 0.163,
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	134 'power_imported' : 0.380,
11 9fac3371e9ad Print consumption and generation, tTwiddle text box, remove debugging. Daniel O'Connor <darius@dons.net.au> parents: 10 diff changeset	135 'power_generated' : 0.163,
9fac3371e9ad Print consumption and generation, tTwiddle text box, remove debugging. Daniel O'Connor <darius@dons.net.au> parents: 10 diff changeset	136 'power_consumed' : 0.380,
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	137 }
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	138
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	139 names = {
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	140 'battery_charge' : 'Battery Charge',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	141 'battery_power' : 'Battery Power',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	142 'power_consumed' : 'Power Consumed',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	143 'power_expected' : 'Power Expected',
6 2e50426c946f Use correct name for power_exported Daniel O'Connor <darius@dons.net.au> parents: 5 diff changeset	144 'power_exported' : 'Power Exported',
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	145 'power_generated' : 'Power Generated',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	146 'power_imported' : 'Power Imported',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	147 'estimated_savings' : 'Estimated Savings',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	148 'pv_forecast' : 'PV Forecast',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	149 'pv_gen_battery' : 'PV Generation Battery',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	150 'pv_gen_grid' : 'PV Generation Grid',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	151 'pv_gen_site' : 'PV Generation Site',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	152 'site_cons_battery' : 'Site Consumption Batter',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	153 'site_cons_grid' : 'Site Consumption Grid',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	154 'site_cons_pv' : 'Site Consumption PV'
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	155 }
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	156
4 deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	157 def graph(fname, cur, cols, start, end):
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	158 import numpy
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	159 import matplotlib
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	160 import matplotlib.dates
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	161
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	162 colourlist = ['b','g','r','c','m','y','k']
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	163
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	164 # Work out what axes we are using
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	165 yaxisunits1 = None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	166 yaxisunits2 = None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	167 ax1lines = []
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	168 ax2lines = []
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	169 colouridx = 0
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	170 for col in cols:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	171 unit = units[col]
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	172 if yaxisunits1 == None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	173 yaxisunits1 = unit
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	174 if yaxisunits2 == None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	175 if unit != yaxisunits1:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	176 yaxisunits2 = unit
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	177 else:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	178 if unit != yaxisunits1 and unit != yaxisunits2:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	179 raise exceptions.Exception('Asked to graph >2 different units')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	180
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	181 ltname = tzlocal.get_localzone().zone # Why is this so hard..
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	182 lt = dateutil.tz.gettz(ltname)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	183 utc = dateutil.tz.gettz('UTC')
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	184 matplotlib.rcParams['timezone'] = ltname
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	185
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	186 if start.tzinfo == None:
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	187 start = start.replace(tzinfo = lt)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	188 if end.tzinfo == None:
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	189 end = end.replace(tzinfo = lt)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	190
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	191 start = start.astimezone(utc)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	192 end = end.astimezone(utc)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	193
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	194 # Actually get the data
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	195 colstr = reduce(lambda a, b: a + ', ' + b, cols)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	196 # Data is stored as naive datetime's which are in UTC so convert the requested time here
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	197 cur.execute('SELECT t_stamp, ' + colstr + ' FROM agl WHERE t_stamp > ? AND t_stamp < ? ORDER BY t_stamp',
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	198 (start, end))
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	199 ary = numpy.array(cur.fetchall())
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	200 if ary.shape[0] == 0:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	201 print('No data')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	202 return
8 22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	203 # Convert TZ naive UTC to TZ aware UTC then adjust to local time
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	204 xdata = map(lambda f: f.replace(tzinfo = utc).astimezone(lt), ary[:,0])
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	205 xhours = matplotlib.dates.date2num(xdata) * 24
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	206 xdeltas = xhours[1:] - xhours[0:-1]
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	207 for idx in range(len(cols)):
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	208 col = cols[idx]
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	209 ydata = ary[:,idx + 1]
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	210 if col in convs:
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	211 ydata = convs[col](ydata)
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	212 if col in scale_limits:
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	213 scale_min = scale_limits[col][0]
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	214 scale_max = scale_limits[col][1]
9 e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	215 else:
e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	216 scale_min = None
e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	217 scale_max = None
e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	218
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	219 if col in tarrifs:
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	220 annotation = '%s: $%.2f' % (names[col], (ydata[1:] * xdeltas).sum() / 1000.0 * tarrifs[col])
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	221 else:
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	222 annotation = None
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	223
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	224 if units[col] == yaxisunits1:
9 e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	225 ax = ax1lines
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	226 else:
9 e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	227 ax = ax2lines
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	228 ax.append([xdata, ydata, names[col], colourlist[colouridx], scale_min, scale_max, annotation])
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	229 colouridx += 1
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	230
4 deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	231 if fname == None:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	232 import matplotlib.pylab
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	233 fig = matplotlib.pylab.figure()
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	234 else:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	235 import matplotlib.backends.backend_agg
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	236 fig = matplotlib.figure.Figure(figsize = (8, 6), dpi = 75)
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	237
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	238 ax1 = fig.add_subplot(111)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	239 ax1.set_ylabel(yaxisunits1)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	240
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	241 annotations = []
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	242 for line in ax1lines:
9 e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	243 ax1.plot(line[0], line[1], label = line[2], color = line[3])
e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	244 if line[4] != None and line[5] != None:
e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	245 ax1.set_ylim((line[4], line[5]))
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	246 if line[6] != None:
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	247 annotations.append(line[6])
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	248 ax1.legend(loc = 'upper left')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	249
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	250 if yaxisunits2 != None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	251 ax2 = ax1.twinx()
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	252 ax2.set_ylabel(yaxisunits2)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	253
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	254 for line in ax2lines:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	255 ax2.plot(line[0], line[1], label = line[2], color = line[3])
9 e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	256 if line[4] != None and line[5] != None:
e2807c99e107 Fix battery charge scale to 0-100. Daniel O'Connor <darius@dons.net.au> parents: 8 diff changeset	257 ax2.set_ylim(bottom = line[4], top = line[5])
10 70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	258 if line[6] != None:
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	259 annotations.append(line[6])
70cc1e874157 Print import/export tarrifs Daniel O'Connor <darius@dons.net.au> parents: 9 diff changeset	260
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	261 ax2.legend(loc = 'upper right')
11 9fac3371e9ad Print consumption and generation, tTwiddle text box, remove debugging. Daniel O'Connor <darius@dons.net.au> parents: 10 diff changeset	262 ax1.text(0.02, 0.9, reduce(lambda a, b: a + '\n' + b, annotations),
9fac3371e9ad Print consumption and generation, tTwiddle text box, remove debugging. Daniel O'Connor <darius@dons.net.au> parents: 10 diff changeset	263 transform = ax1.transAxes, bbox = dict(facecolor = 'red', alpha = 0.5),
9fac3371e9ad Print consumption and generation, tTwiddle text box, remove debugging. Daniel O'Connor <darius@dons.net.au> parents: 10 diff changeset	264 ha = 'left', va = 'top')
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	265 ndays = int(max(1, round(((end - start).total_seconds()) / 86400)))
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	266 for ax in fig.get_axes():
7 27540ac7879d Set the graph title Daniel O'Connor <darius@dons.net.au> parents: 6 diff changeset	267 ax.set_title('%s to %s' % (start.strftime('%Y-%m-%d'), end.strftime('%Y-%m-%d')))
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	268 ax.set_xlim([start, end])
3 525a66486282 Fix mouse hover formatting. Daniel O'Connor <darius@dons.net.au> parents: 2 diff changeset	269 ax.format_xdata = lambda d: matplotlib.dates.num2date(d).strftime('%d %b %H:%M')
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	270 ax.xaxis.grid(True)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	271 ax.xaxis.set_major_formatter(matplotlib.dates.DateFormatter('%d %b\n%H:%M'))
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	272 ax.xaxis.set_major_locator(matplotlib.dates.HourLocator(interval = 2 * ndays))
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	273 ax.xaxis.set_minor_locator(matplotlib.dates.MinuteLocator(interval = 5 * ndays))
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	274 for label in ax.get_xticklabels():
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	275 label.set_ha('center')
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	276 label.set_rotation(90)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	277
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	278 # Fudge margins to give more graph and less space
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	279 fig.subplots_adjust(left = 0.10, right = 0.88, top = 0.95, bottom = 0.15)
4 deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	280 if fname == None:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	281 matplotlib.pyplot.show()
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	282 else:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	283 canvas = matplotlib.backends.backend_agg.FigureCanvasAgg(fig) # Sets canvas in fig too
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	284 fig.savefig(fname)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	285
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	286 def updatedb(cur, data):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	287 mkdb(cur)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	288 for d in data['reads']['data']:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	289 ts = datetime.datetime.strptime(d['t_stamp'], '%Y-%m-%dT%H:%M:%SZ')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	290 # Note we rename energy to power here to match what it actually means
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	291 vals = [ts, d['battery_charge'], d['battery_energy'], d['energy_consumed'], d['energy_expected'], d['energy_exported'], d['energy_generated'],
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	292 d['energy_imported'], d['estimated_savings'], d['pv_forecast'], d['pv_generation']['battery_energy'],
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	293 d['pv_generation']['grid_energy'], d['pv_generation']['site_energy'], d['site_consumption']['battery_energy'],
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	294 d['site_consumption']['grid_energy'], d['site_consumption']['pv_energy']]
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	295 skip = True
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	296 for v in vals[1:]:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	297 if v != None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	298 skip = False
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	299 break
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	300 if skip:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	301 print('Skipping empty record at ' + str(ts))
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	302 continue
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	303 cur.execute('INSERT OR IGNORE INTO agl(t_stamp, battery_charge, battery_power, power_consumed, power_expected, power_exported, power_generated, power_imported, estimated_savings, pv_forecast, pv_gen_battery, pv_gen_grid, pv_gen_site, site_cons_battery, site_cons_grid, site_cons_pv) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', vals)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	304
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	305 def gettoken(username, password):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	306 authblob = json.encoder.JSONEncoder().encode({'email' : username, 'password' : password})
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	307 reply = requests.request('POST', loginurl, data = authblob, headers = {'Content-Type' : 'application/json'})
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	308 if reply.status_code != 200:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	309 return None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	310 return json.decoder.JSONDecoder().decode(reply.content)['access_token']
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	311
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	312 def getdata(token, startdate, enddate):
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	313 #print('getting ' + startdate.strftime('%Y-%m-%d'))
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	314 reply = requests.request('GET', dataurl, params = {
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	315 'startDate' : startdate.strftime('%Y-%m-%d'),
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	316 'endDate' : enddate.strftime('%Y-%m-%d'),
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	317 'granularity' : 'Minute',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	318 'metrics' : 'read',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	319 'units' : 'W',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	320 }, headers = { 'Authorization' : 'Bearer ' + token})
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	321
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	322 if reply.status_code != 200:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	323 return None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	324
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	325 return json.decoder.JSONDecoder().decode(reply.content)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	326
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	327 def logout(token):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	328 reply = requests.request('GET', logouturl, headers = { 'Authorization' : 'Bearer ' + token})
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	329 return reply.status_code == 200
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	330
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	331 if __name__ == '__main__':
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	332 main()

Mercurial > ~darius > hgwebdir.cgi > agl

annotate agl.py @ 12:b610ce4ec081