Use defaultdict to simplify code.
[chrisu/seepark.git] / web / seepark_web.py
index 9ad59f124d3a78f18b81f49bf43f17885cd958ef..95c3f9dea734df366631f66bc8d3f1b12eb2aa01 100644 (file)
@@ -3,9 +3,15 @@ import datetime
 import time
 import configparser
 import os
+import sys
+from collections import defaultdict
 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 +30,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):
@@ -81,19 +88,32 @@ def select_sensordata(initial_where, initial_sql_args):
 
     format = request.args.get('format', 'default')
     if format == 'c3':
-        c3result = dict()
+        c3result = defaultdict(list)
         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']
+
+
 @app.route('/api/<version>/sensors/')
 def sensors(version):
     """List all sensors found in the database"""
@@ -164,5 +184,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,
+    )