X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/399e4efcc12eb206d749d6bc1cafd02d97f6b040..5ec23d237a6f87fe54a47f04c9a27fe157f59c40:/web/seepark_web.py diff --git a/web/seepark_web.py b/web/seepark_web.py index b9a3bb1..ce4347f 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -1,14 +1,31 @@ -from flask import Flask, render_template, jsonify from random import uniform +import datetime import time import configparser import os +from flask import Flask, render_template, jsonify, request +import flask.json from sqlalchemy import create_engine -app = Flask(__name__) +import requests + + +class JSONEncoder(flask.json.JSONEncoder): + def default(self, object): + if isinstance(object, datetime.datetime): + return object.isoformat() + return super().default(object) + +def parse_datetime(date_str): + return datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S') + + +app = Flask(__name__) +app.json_encoder = JSONEncoder config = configparser.ConfigParser() config.read(os.environ['SEEPARKINI']) apikey = config.get('openweathermap', 'apikey') +cityid = config.get('openweathermap', 'cityid') def open_engine(config): @@ -20,7 +37,89 @@ def open_engine(config): return engine -@app.route('/api//sensors') +def select_sensordata(initial_where, initial_sql_args): + engine = open_engine(config) + with engine.connect() as conn: + where = [initial_where] + sql_args = [initial_sql_args] + begin = None + end = None + if 'begin' in request.args: + where.append('timestamp>=%s') + begin = request.args.get('begin', None, parse_datetime) + sql_args.append(begin) + if 'end' in request.args: + where.append('timestamp<=%s') + end = request.args.get('end', None, parse_datetime) + sql_args.append(end) + sql = 'select * from sensors where {} order by id'.format(' and '.join(where)) + cursor = conn.execute(sql, *sql_args) + result = [dict(row) for row in cursor] + + mode = request.args.get('mode', 'full') + if mode == 'consolidated': + if begin is None or end is None: + pass + else: + # copied from munin/master/_bin/munin-cgi-graph.in + resolutions = dict( + day = 300, + week = 1800, + month = 7200, + year = 86400, + ) + duration = (end - begin).total_seconds() + day = 60 * 60 * 24 + if duration < day: + resolution = resolutions['day'] + elif duration < 7 * day: + resolution = resolutions['week'] + elif duration < 31 * day: + resolution = resolutions['month'] + else: + resolution = resolutions['year'] + # TODO: filter out samples from 'result' + # like loop over results and skip if timestamp(n+1)-timestamp(n)/sensors/') def sensors(version): """List all sensors found in the database""" engine = open_engine(config) @@ -30,6 +129,34 @@ def sensors(version): return jsonify(result) +@app.route('/api//sensor/id/') +def sensorid(version, sensor_id): + """Return all data for a specific sensor + + URL parameters: + begin=, optional, format like "2018-05-19T21:07:53" + end=, optional, format like "2018-05-19T21:07:53" + mode=, optional. return all rows (default) or with lower resolution (for charts) + format=, optional. return result as returned by sqlalchemy (default) or formatted for c3.js + """ + result = select_sensordata('sensor_id=%s', sensor_id) + return jsonify(result) + + +@app.route('/api//sensor/type/') +def sensortype(version, sensor_type): + """Return all data for a specific sensor type + + URL parameters: + begin=, optional, format like "2018-05-19T21:07:53" + end=, optional, format like "2018-05-19T21:07:53" + mode=, optional. return all rows (default) or with lower resolution (for charts) + format=, optional. return result as returned by sqlalchemy (default) or formatted for c3.js + """ + result = select_sensordata('value_type=%s', sensor_type) + return jsonify(result) + + @app.route('/data/', defaults={'timespan': 1}) @app.route("/data/", methods=['GET']) def data(timespan): @@ -62,5 +189,16 @@ def data(timespan): @app.route("/") def index(): - return render_template('seepark_web.html', apikey=apikey) + airvalue, airtime = currentairtemperature(apikey, cityid) + airvalue = "{:.1f}".format(airvalue) if isinstance(airvalue, float) else airvalue + watervalue, watertime = currentwatertemperature('0316a21383ff') # config? mainwatertemp? + watervalue = "{:.1f}".format(watervalue) if isinstance(watervalue, float) else watervalue + return render_template( + 'seepark_web.html', + apikey=apikey, + watervalue=watervalue, + watertime=watertime, + airvalue=airvalue, + airtime=airtime, + )