agl: agl.py annotate

annotate agl.py @ 8:22d31cee19b1

Misc tidyup, no functional change

author	Daniel O'Connor <darius@dons.net.au>
date	Mon, 11 Sep 2017 16:48:36 +0930
parents	27540ac7879d
children	e2807c99e107

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
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	20 class UTC(datetime.tzinfo):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	21 def utcoffset(self, dt):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	22 return datetime.timedelta(0)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	23
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	24 def dst(self, dt):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	25 return datetime.timedelta(0)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	26
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	27 def tzname(self, dt):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	28 return "UTC"
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	29
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	30
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	31 def valid_date(s):
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	32 try:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	33 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	34 except ValueError:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	35 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	36
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	37 def main():
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	38 parser = argparse.ArgumentParser()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	39 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	40 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	41 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	42 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	43 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	44
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	45 args = parser.parse_args()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	46
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	47 conf = ConfigParser.ConfigParser()
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	48 confname = os.environ['HOME'] + '/.agl.ini'
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	49 conf.read(confname)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	50 username = conf.get('DEFAULT', 'username')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	51 password = conf.get('DEFAULT', 'password')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	52 dbfn = conf.get('DEFAULT', 'db')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	53
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	54 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	55 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	56
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	57 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	58 parser.error('Nothing to do')
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	59
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	60 start = args.start
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	61 if start is None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	62 start = datetime.date.today()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	63 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	64
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	65 end = args.end
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	66 if end is None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	67 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	68 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	69
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	70 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	71 cur = dbh.cursor()
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	72 if args.update:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	73 date = start
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	74 while date < end:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	75 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	76 token = conf.get('DEFAULT', 'token')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	77 else:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	78 token = gettoken(username, password)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	79 conf.set('DEFAULT', 'token', token)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	80 conf.write(file(confname, 'w'))
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 data = getdata(token, date, date)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	83 if data == None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	84 #print('Getting new token')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	85 token = gettoken(username, password)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	86 data = getdata(token, date, date)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	87 if data == None:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	88 print('Unable to fetch data')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	89 updatedb(cur, data)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	90 dbh.commit()
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	91 date += datetime.timedelta(days = 1)
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	92
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	93 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	94 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	95
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	96 def mkdb(cur):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	97 cur.execute('''
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	98 CREATE TABLE IF NOT EXISTS agl (
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	99 t_stamp TIMESTAMP PRIMARY KEY,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	100 battery_charge NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	101 battery_power NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	102 power_consumed NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	103 power_expected NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	104 power_exported NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	105 power_generated NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	106 power_imported NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	107 estimated_savings NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	108 pv_forecast NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	109 pv_gen_battery NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	110 pv_gen_grid NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	111 pv_gen_site NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	112 site_cons_battery NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	113 site_cons_grid NUMBER,
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	114 site_cons_pv NUMBER
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	115 )''')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	116
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	117 units = {
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	118 'battery_charge' : '%',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	119 'battery_power' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	120 'power_consumed' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	121 'power_expected' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	122 'power_exported' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	123 'power_generated' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	124 'power_imported' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	125 'estimated_savings' : '$',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	126 'pv_forecast' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	127 'pv_gen_battery' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	128 'pv_gen_grid' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	129 'pv_gen_site' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	130 'site_cons_battery' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	131 'site_cons_grid' : 'Watt',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	132 'site_cons_pv' : 'Watt'
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	133 }
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	134
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	135 convs = {
8 22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	136 'battery_power' : lambda a: a / 1000.0,
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	137 }
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	138
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	139 scale_limits = {
22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	140 '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	141 }
b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	142
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	143 names = {
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	144 'battery_charge' : 'Battery Charge',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	145 'battery_power' : 'Battery Power',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	146 'power_consumed' : 'Power Consumed',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	147 'power_expected' : 'Power Expected',
6 2e50426c946f Use correct name for power_exported Daniel O'Connor <darius@dons.net.au> parents: 5 diff changeset	148 'power_exported' : 'Power Exported',
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	149 'power_generated' : 'Power Generated',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	150 'power_imported' : 'Power Imported',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	151 'estimated_savings' : 'Estimated Savings',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	152 'pv_forecast' : 'PV Forecast',
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	153 '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	154 '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	155 '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	156 '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	157 '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	158 '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	159 }
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	160
4 deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	161 def graph(fname, cur, cols, start, end):
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	162 import numpy
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	163 import matplotlib
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	164 import matplotlib.dates
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	165
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	166 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	167
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	168 # Work out what axes we are using
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	169 yaxisunits1 = None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	170 yaxisunits2 = None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	171 ax1lines = []
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	172 ax2lines = []
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	173 colouridx = 0
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	174 for col in cols:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	175 unit = units[col]
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	176 if yaxisunits1 == None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	177 yaxisunits1 = unit
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	178 if yaxisunits2 == None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	179 if unit != yaxisunits1:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	180 yaxisunits2 = unit
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	181 else:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	182 if unit != yaxisunits1 and unit != yaxisunits2:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	183 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	184
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	185 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	186 lt = dateutil.tz.gettz(ltname)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	187 utc = dateutil.tz.gettz('UTC')
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	188 matplotlib.rcParams['timezone'] = ltname
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	189
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	190 if start.tzinfo == None:
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	191 start = start.replace(tzinfo = lt)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	192 if end.tzinfo == None:
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	193 end = end.replace(tzinfo = lt)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	194
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	195 start = start.astimezone(utc)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	196 end = end.astimezone(utc)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	197
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	198 # Actually get the data
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	199 colstr = reduce(lambda a, b: a + ', ' + b, cols)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	200 # 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	201 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	202 (start, end))
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	203 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	204 if ary.shape[0] == 0:
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	205 print('No data')
2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	206 return
8 22d31cee19b1 Misc tidyup, no functional change Daniel O'Connor <darius@dons.net.au> parents: 7 diff changeset	207 # 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	208 xdata = map(lambda f: f.replace(tzinfo = utc).astimezone(lt), ary[:,0])
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	209 for idx in range(len(cols)):
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	210 ydata = ary[:,idx + 1]
b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	211 if cols[idx] in convs:
b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	212 ydata = convs[cols[idx]](ydata)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	213 if units[cols[idx]] == yaxisunits1:
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	214 ax1lines.append([xdata, ydata, names[cols[idx]], colourlist[colouridx]])
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	215 else:
5 b42baa411817 Display battery_power (which seems to be in milliwatts..?) Daniel O'Connor <darius@dons.net.au> parents: 4 diff changeset	216 ax2lines.append([xdata, ydata, names[cols[idx]], colourlist[colouridx]])
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	217 colouridx += 1
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	218
4 deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	219 if fname == None:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	220 import matplotlib.pylab
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	221 fig = matplotlib.pylab.figure()
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	222 else:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	223 import matplotlib.backends.backend_agg
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	224 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	225
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	226 ax1 = fig.add_subplot(111)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	227 ax1.set_ylabel(yaxisunits1)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	228
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	229 for line in ax1lines:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	230 ax1.plot(line[0], line[1], label = line[2])
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	231
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	232 ax1.legend(loc = 'upper left')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	233
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	234 if yaxisunits2 != None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	235 ax2 = ax1.twinx()
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	236 ax2.set_ylabel(yaxisunits2)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	237
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	238 for line in ax2lines:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	239 ax2.plot(line[0], line[1], label = line[2], color = line[3])
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	240 ax2.legend(loc = 'upper right')
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	241
2 2b7fb26f9114 - Make an actual usable command line program. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	242 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	243 for ax in fig.get_axes():
7 27540ac7879d Set the graph title Daniel O'Connor <darius@dons.net.au> parents: 6 diff changeset	244 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	245 ax.set_xlim([start, end])
3 525a66486282 Fix mouse hover formatting. Daniel O'Connor <darius@dons.net.au> parents: 2 diff changeset	246 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	247 ax.xaxis.grid(True)
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	248 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	249 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	250 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	251 for label in ax.get_xticklabels():
1 6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	252 label.set_ha('center')
6e3ca5bfda04 Improve plotting/timezone stuff. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	253 label.set_rotation(90)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	254
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	255 # 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	256 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	257 if fname == None:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	258 matplotlib.pyplot.show()
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	259 else:
deb3adc4e086 Add graph saving option. Daniel O'Connor <darius@dons.net.au> parents: 3 diff changeset	260 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	261 fig.savefig(fname)
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	262
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	263 def updatedb(cur, data):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	264 mkdb(cur)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	265 for d in data['reads']['data']:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	266 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	267 # 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	268 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	269 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	270 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	271 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	272 skip = True
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	273 for v in vals[1:]:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	274 if v != None:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	275 skip = False
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	276 break
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	277 if skip:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	278 print('Skipping empty record at ' + str(ts))
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	279 continue
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	280 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	281
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	282 def gettoken(username, password):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	283 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	284 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	285 if reply.status_code != 200:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	286 return None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	287 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	288
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	289 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	290 #print('getting ' + startdate.strftime('%Y-%m-%d'))
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	291 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	292 '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	293 'endDate' : enddate.strftime('%Y-%m-%d'),
0 8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	294 'granularity' : 'Minute',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	295 'metrics' : 'read',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	296 'units' : 'W',
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	297 }, headers = { 'Authorization' : 'Bearer ' + token})
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	298
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	299 if reply.status_code != 200:
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	300 return None
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	301
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	302 return json.decoder.JSONDecoder().decode(reply.content)
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	303
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	304 def logout(token):
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	305 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	306 return reply.status_code == 200
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	307
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	308 if __name__ == '__main__':
8d6ba11c1b76 Fetch & graphing code basically works. Daniel O'Connor <darius@dons.net.au> parents: diff changeset	309 main()

Mercurial > ~darius > hgwebdir.cgi > agl

annotate agl.py @ 8:22d31cee19b1