X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/58fc4774a3ada8e7092c01fc5ea25f1c2c6a9b99..94b0847841c4f5a81b08f282654c41830c611d28:/web/seepark_web.py

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 1b1285a..ce4347f 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -6,6 +6,7 @@ import os
 from flask import Flask, render_template, jsonify, request
 import flask.json
 from sqlalchemy import create_engine
+import requests
 
 
 class JSONEncoder(flask.json.JSONEncoder):
@@ -24,6 +25,7 @@ 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):
@@ -35,29 +37,11 @@ def open_engine(config):
     return engine
 
 
-@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)
-
-
-@app.route('/api/<version>/sensor/<sensor_id>')
-def sensor(version, sensor_id):
-    """Return all sensor data
-
-    URL parameters:
-    begin=<datetime>, optional, format like "2018-05-19T21:07:53"
-    end=<datetime>, optional, format like "2018-05-19T21:07:53"
-    mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
-    """
+def select_sensordata(initial_where, initial_sql_args):
     engine = open_engine(config)
     with engine.connect() as conn:
-        where = ['sensor_id=%s']
-        sql_args = [sensor_id]
+        where = [initial_where]
+        sql_args = [initial_sql_args]
         begin = None
         end = None
         if 'begin' in request.args:
@@ -72,34 +56,107 @@ def sensor(version, sensor_id):
         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
+    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:
-                # 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'
+            # like loop over results and skip if timestamp(n+1)-timestamp(n)<resolution
+
+    format = request.args.get('format', 'default')
+    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 result
+
+
+def currentairtemperature(apikey, cityid):
+    baseurl = 'http://api.openweathermap.org/data/2.5/weather'
+    query = baseurl + '?units=metric&APPID={}&id={}&lang=de'.format(apikey, cityid)
+    try:
+        response = requests.get(query)
+        if response.status_code != 200:
+            response = 'N/A'
+            return response, datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
+        else:
+            weatherdata = response.json()
+            return weatherdata['main']['temp'], datetime.datetime.fromtimestamp(weatherdata['dt']).strftime('%Y-%m-%d %H:%M')
+    except requests.exceptions.RequestException as error:
+        print (error)
+
+
+def currentwatertemperature(sensorid):
+    engine = open_engine(config)
+    with engine.connect() as conn:
+        cursor = conn.execute('select value, timestamp from sensors where sensor_id=%s order by timestamp desc limit 1', sensorid)
+        result = [dict(row) for row in cursor]
+        return result[0]['value'], result[0]['timestamp'].strftime('%Y-%m-%d %H:%M')
+
 
+@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)
 
 
+@app.route('/api/<version>/sensor/id/<sensor_id>')
+def sensorid(version, sensor_id):
+    """Return all data for a specific sensor
+
+    URL parameters:
+    begin=<datetime>, optional, format like "2018-05-19T21:07:53"
+    end=<datetime>, optional, format like "2018-05-19T21:07:53"
+    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)
+    return jsonify(result)
+
+
+@app.route('/api/<version>/sensor/type/<sensor_type>')
+def sensortype(version, sensor_type):
+    """Return all data for a specific sensor type
+
+    URL parameters:
+    begin=<datetime>, optional, format like "2018-05-19T21:07:53"
+    end=<datetime>, optional, format like "2018-05-19T21:07:53"
+    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)
+    return jsonify(result)
+
+
 @app.route('/data/', defaults={'timespan': 1})
 @app.route("/data/<int:timespan>", methods=['GET'])
 def data(timespan):
@@ -132,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,
+    )