oops, looks like we made a logic error when refactoring

[chrisu/seepark.git] / web / seepark_web.py

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 9ad59f124d3a78f18b81f49bf43f17885cd958ef..82715dc1449dfd583392801d3fce08ad7c82bc5a 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -3,15 +3,31 @@ import datetime
 import time
 import configparser
 import os
 import time
 import configparser
 import os

-from flask import Flask, render_template, jsonify, request
+import sys
+from collections import defaultdict
+from flask import Flask, render_template, jsonify, request, abort, Response

 import flask.json
 import flask.json

-from sqlalchemy import create_engine
+from flask_sqlalchemy import SQLAlchemy, inspect
+
+
+app_path = os.path.dirname(os.path.realpath(__file__))
+lib_path = os.path.join(app_path, '..')
+sys.path.append(lib_path)
+from seeparklib.openweathermap import openweathermap_json, OpenWeatherMapError
+
+
+# https://stackoverflow.com/a/37350445
+def sqlalchemy_model_to_dict(model):
+    return {c.key: getattr(model, c.key)
+        for c in inspect(model).mapper.column_attrs}

 
 
 class JSONEncoder(flask.json.JSONEncoder):
     def default(self, object):
         if isinstance(object, datetime.datetime):
             return object.isoformat()
 
 
 class JSONEncoder(flask.json.JSONEncoder):
     def default(self, object):
         if isinstance(object, datetime.datetime):
             return object.isoformat()

+        elif isinstance(object, db.Model):
+            return sqlalchemy_model_to_dict(object)

         return super().default(object)
 
 
         return super().default(object)
 
 


@@ -19,89 +35,166 @@ def parse_datetime(date_str):
     return datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S')
 
 
     return datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S')
 
 

-app = Flask(__name__)
-app.json_encoder = JSONEncoder
+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')
+    return 'mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db)
+
+

 config = configparser.ConfigParser()
 config.read(os.environ['SEEPARKINI'])
 apikey = config.get('openweathermap', 'apikey')
 config = configparser.ConfigParser()
 config.read(os.environ['SEEPARKINI'])
 apikey = config.get('openweathermap', 'apikey')

+cityid = config.get('openweathermap', 'cityid')
+mainsensor = config.get('temperature', 'mainsensor')

 
 

+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)

 
 

-def open_engine(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
-
-
-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
+class Sensors(db.Model):
+    __tablename__ = 'sensors'
+
+
+class OpenWeatherMap(db.Model):
+    __tablename__ = 'openweathermap'
+
+
+def select_sensordata(sensor_id, sensor_type, begin, end, mode):
+    query = Sensors.query
+    if sensor_id is not None:
+        query = query.filter(Sensors.sensor_id == sensor_id)
+    if sensor_type is not None:
+        query = query.filter(Sensors.value_type == sensor_type)
+    if begin is not None:
+        query = query.filter(Sensors.timestamp >= begin)
+    if end is not None:
+        query = query.filter(Sensors.timestamp <= end)
+    if mode == 'consolidated' and begin is not None and end is not None:
+        # copied from munin/master/_bin/munin-cgi-graph.in
+        # interval in seconds for data points
+        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'
+        # something like 
+        # select to_seconds(datetime) DIV (60*60*24) as interval_id, min(datetime), max(datetime), min(temp), avg(temp), max(temp), count(temp) from openweathermap group by interval_id order by interval_id;
+    return query.all()
+
+
+def select_openweatherdata(cityid, begin, end, mode):
+    query = OpenWeatherMap.query.filter(OpenWeatherMap.cityid == cityid)
+    if begin is not None:
+        query = query.filter(OpenWeatherMap.datetime >= begin)
+    if end is not None:
+        query = query.filter(OpenWeatherMap.datetime <= end)
+    if mode == 'consolidated' and begin is not None and end is not None:
+        # copied from munin/master/_bin/munin-cgi-graph.in
+        # interval in seconds for data points
+        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:
         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)<resolution
+            resolution = resolutions['year']
+        # TODO: filter out samples from 'result'
+        # something like 
+        # select to_seconds(datetime) DIV (60*60*24) as interval_id, min(datetime), max(datetime), min(temp), avg(temp), max(temp), count(temp) from openweathermap group by interval_id order by interval_id;
+    return query.all()
+

 
 

+def convert_to_c3(result):
+    c3result = defaultdict(list)
+    for row in result:
+        c3result[row.sensor_id].append(row.value)
+        dt = row.timestamp.strftime('%Y-%m-%d %H:%M:%S')
+        c3result[row.sensor_id + '_x'].append(dt)
+    return c3result
+
+
+def request_arg(key, type, default=None):
+    """Returns the key from the request if available, otherwise the default value.
+    In case type is provided and the key is present, the value is converted by calling type.
+    In other words: Reimplement request.args.get but don't return default value if
+    type raises a ValueError."""
+    if key in request.args:
+        try:
+            return type(request.args[key])
+        except ValueError as e:
+            abort(Response(str(e), 400))
+    else:
+        return default
+
+
+def sensordata(sensor_id=None, sensor_type=None):
+    begin = request_arg('begin', parse_datetime)
+    end = request_arg('end', parse_datetime)
+    mode = request.args.get('mode', 'full')
+    format = request.args.get('format', 'default')
+
+    result = select_sensordata(sensor_id, sensor_type, begin, end, mode)
+
+    if format == 'c3':
+        return convert_to_c3(result)
+    return result
+
+
+def openweathermapdata(cityid):
+    begin = request_arg('begin', parse_datetime)
+    end = request_arg('end', parse_datetime)
+    mode = request.args.get('mode', 'full')

     format = request.args.get('format', 'default')
     format = request.args.get('format', 'default')

+
+    result = select_openweatherdata(cityid, begin, end, mode)
+

     if format == 'c3':
     if format == 'c3':

-        c3result = dict()
-        for row in result:
-            if not row['sensor_id'] in c3result:
-                c3result[row['sensor_id']] = list()
-            c3result[row['sensor_id']].append(row['value'])
-            if not row['sensor_id'] + '_x' in c3result:
-                c3result[row['sensor_id'] + '_x'] = list()
-            dt = row['timestamp'].strftime('%Y-%m-%d %H:%M:%S')
-            c3result[row['sensor_id'] + '_x'].append(dt)
-        result = c3result
+        return convert_to_c3(result)

     return result
 
 
     return result
 
 

+def currentairtemperature(cityid):
+    result = OpenWeatherMap.query.filter_by(cityid=cityid).order_by(OpenWeatherMap.datetime.desc()).first()
+    return result.temp, result.datetime
+
+
+def currentwatertemperature(sensorid):
+    result = Sensors.query.filter_by(sensor_id=sensorid).order_by(Sensors.timestamp.desc()).first()
+    return result.value, result.timestamp
+
+

 @app.route('/api/<version>/sensors/')
 def sensors(version):
     """List all sensors found in the database"""
 @app.route('/api/<version>/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/<version>/sensor/id/<sensor_id>')
 
 
 @app.route('/api/<version>/sensor/id/<sensor_id>')


@@ -114,7 +207,7 @@ def sensorid(version, sensor_id):
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """

-    result = select_sensordata('sensor_id=%s', sensor_id)
+    result = sensordata(sensor_id=sensor_id)

     return jsonify(result)
 
 
     return jsonify(result)
 
 


@@ -128,7 +221,21 @@ def sensortype(version, sensor_type):
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """

-    result = select_sensordata('value_type=%s', sensor_type)
+    result = sensordata(sensor_type=sensor_type)
+    return jsonify(result)
+
+
+@app.route('/api/<version>/openweathermap/cities')
+def openweathermap_cities(version):
+    """List all city IDs found in the database"""
+    result = db.session.query(OpenWeatherMap.cityid).distinct().all()
+    return jsonify(result)
+
+
+@app.route('/api/<version>/openweathermap/city/<cityid>')
+def openweathermap_city(version, cityid):
+    """List all data found for a city"""
+    result = openweathermapdata(cityid=cityid)

     return jsonify(result)
 
 
     return jsonify(result)
 
 


@@ -164,5 +271,14 @@ def data(timespan):
 
 @app.route("/")
 def index():
 
 @app.route("/")
 def index():

-    return render_template('seepark_web.html', apikey=apikey)
+    airvalue, airtime     = currentairtemperature(cityid)
+    watervalue, watertime = currentwatertemperature(mainsensor)

 
 

+    return render_template(
+        'seepark_web.html',
+        apikey=apikey,
+        watervalue=watervalue,
+        watertime=watertime,
+        airvalue=airvalue,
+        airtime=airtime,
+    )