X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/0c3d93ded6a9a7d6fec0156ad1de3965ad78fefb..f87afe736463c73529488050e5190a7ca9d0e1f8:/web/seepark_web.py?ds=inline

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 340c7b6..c0fd440 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -3,9 +3,14 @@ import datetime
 import time
 import configparser
 import os
+import sys
 from flask import Flask, render_template, jsonify, request
 import flask.json
 from sqlalchemy import create_engine
+import requests
+
+sys.path.append('..')
+from seeparklib.openweathermap import openweathermap_json, OpenWeatherMapError
 
 
 class JSONEncoder(flask.json.JSONEncoder):
@@ -24,6 +29,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):
@@ -79,9 +85,38 @@ def select_sensordata(initial_where, initial_sql_args):
             # 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):
+    """Retruns the tuple temperature, datetime (as float, datetime) in case of success, otherwise None, None."""
+    try:
+        weatherdata = openweathermap_json(apikey, cityid)
+        return weatherdata['main']['temp'], datetime.datetime.fromtimestamp(weatherdata['dt'])
+    except OpenWeatherMapError:
+        return None, None
+
+
+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"""
@@ -100,6 +135,7 @@ def sensorid(version, sensor_id):
     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)
@@ -113,6 +149,7 @@ def sensortype(version, sensor_type):
     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)
@@ -150,5 +187,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,
+    )