brown paper bag commit: always test after changing variable names

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

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 065e3f2a6365535dfae30cff3146d3e43c7cc9a0..c96632191781caae2a5df734a36197f68b804076 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -7,10 +7,12 @@ import sys
 from collections import defaultdict
 from flask import Flask, render_template, jsonify, request
 import flask.json
 from collections import defaultdict
 from flask import Flask, render_template, jsonify, request
 import flask.json

-from flask_sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy, inspect

 
 
 
 

-sys.path.append('..')
+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
 
 
 from seeparklib.openweathermap import openweathermap_json, OpenWeatherMapError
 
 


@@ -37,6 +39,7 @@ config = configparser.ConfigParser()
 config.read(os.environ['SEEPARKINI'])
 apikey = config.get('openweathermap', 'apikey')
 cityid = config.get('openweathermap', 'cityid')
 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 = Flask(__name__)
 app.json_encoder = JSONEncoder


@@ -49,6 +52,10 @@ db.reflect(app=app)
 class Sensors(db.Model):
     __tablename__ = 'sensors'
 
 class Sensors(db.Model):
     __tablename__ = 'sensors'
 

+    # https://stackoverflow.com/a/37350445
+    def to_dict(self):
+        return {c.key: getattr(self, c.key)
+            for c in inspect(self).mapper.column_attrs}

 
 def select_sensordata(initial_where):
     query = Sensors.query.filter(initial_where)
 
 def select_sensordata(initial_where):
     query = Sensors.query.filter(initial_where)


@@ -92,8 +99,9 @@ def select_sensordata(initial_where):
             c3result[row.sensor_id].append(row.value)
             dt = row.timestamp.strftime('%Y-%m-%d %H:%M:%S')
             c3result[row.sensor_id + '_x'].append(dt)
             c3result[row.sensor_id].append(row.value)
             dt = row.timestamp.strftime('%Y-%m-%d %H:%M:%S')
             c3result[row.sensor_id + '_x'].append(dt)

-        result = c3result
-    return result
+        return c3result
+    else:
+        return [row.to_dict() for row in result]

 
 
 def currentairtemperature(apikey, cityid):
 
 
 def currentairtemperature(apikey, cityid):


@@ -128,7 +136,7 @@ def sensorid(version, sensor_id):
     format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js
     """
     result = select_sensordata(Sensors.sensor_id == sensor_id)
     format=<default|c3>, 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])
+    return jsonify(result)

 
 
 @app.route('/api/<version>/sensor/type/<sensor_type>')
 
 
 @app.route('/api/<version>/sensor/type/<sensor_type>')


@@ -178,7 +186,7 @@ def data(timespan):
 @app.route("/")
 def index():
     airvalue, airtime     = currentairtemperature(apikey, cityid)
 @app.route("/")
 def index():
     airvalue, airtime     = currentairtemperature(apikey, cityid)

-    watervalue, watertime = currentwatertemperature('0316a21383ff') # config? mainwatertemp?
+    watervalue, watertime = currentwatertemperature(mainsensor)

 
     return render_template(
         'seepark_web.html',
 
     return render_template(
         'seepark_web.html',