X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/399e4efcc12eb206d749d6bc1cafd02d97f6b040..b986a4736e1027ea0f74e14f040c8241cb5760f7:/web/seepark_web.py?ds=sidebyside diff --git a/web/seepark_web.py b/web/seepark_web.py index b9a3bb1..065e3f2 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -1,33 +1,148 @@ -from flask import Flask, render_template, jsonify from random import uniform +import datetime import time import configparser import os -from sqlalchemy import create_engine -app = Flask(__name__) +import sys +from collections import defaultdict +from flask import Flask, render_template, jsonify, request +import flask.json +from flask_sqlalchemy import SQLAlchemy + + +sys.path.append('..') +from seeparklib.openweathermap import openweathermap_json, OpenWeatherMapError + + +class JSONEncoder(flask.json.JSONEncoder): + def default(self, object): + if isinstance(object, datetime.datetime): + return object.isoformat() + return super().default(object) -config = configparser.ConfigParser() -config.read(os.environ['SEEPARKINI']) -apikey = config.get('openweathermap', 'apikey') +def parse_datetime(date_str): + return datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S') -def open_engine(config): + +def get_sqlalchemy_database_uri(config): user = config.get('database', 'user') pwd = config.get('database', 'password') host = config.get('database', 'hostname') db = config.get('database', 'database') - engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False) - return engine + return 'mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db) + + +config = configparser.ConfigParser() +config.read(os.environ['SEEPARKINI']) +apikey = config.get('openweathermap', 'apikey') +cityid = config.get('openweathermap', 'cityid') + +app = Flask(__name__) +app.json_encoder = JSONEncoder +app.config['SQLALCHEMY_DATABASE_URI'] = get_sqlalchemy_database_uri(config) +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +db = SQLAlchemy(app) +db.reflect(app=app) -@app.route('/api//sensors') +class Sensors(db.Model): + __tablename__ = 'sensors' + + +def select_sensordata(initial_where): + query = Sensors.query.filter(initial_where) + begin = request.args.get('begin', None, parse_datetime) + end = request.args.get('end', None, parse_datetime) + if begin is not None: + query = query.filter(Sensors.timestamp >= begin) + if end is not None: + query = query.filter(Sensors.timestamp <= end) + result = query.all() + + 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) - with engine.connect() as conn: - cursor = conn.execute('select distinct sensor_id, sensor_name, value_type from sensors') - result = [dict(row) for row in cursor] - return jsonify(result) + result = db.session.query(Sensors.sensor_id, Sensors.sensor_name, Sensors.value_type).distinct().all() + 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(Sensors.sensor_id == sensor_id) + return jsonify([row._asdict() for row in 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(Sensors.value_type == sensor_type) + return jsonify(result) @app.route('/data/', defaults={'timespan': 1}) @@ -62,5 +177,14 @@ def data(timespan): @app.route("/") def index(): - return render_template('seepark_web.html', apikey=apikey) + airvalue, airtime = currentairtemperature(apikey, cityid) + watervalue, watertime = currentwatertemperature('0316a21383ff') # config? mainwatertemp? + return render_template( + 'seepark_web.html', + apikey=apikey, + watervalue=watervalue, + watertime=watertime, + airvalue=airvalue, + airtime=airtime, + )