import os
import sys
from collections import defaultdict
-from flask import Flask, render_template, jsonify, request
+from flask import Flask, render_template, jsonify, request, abort, Response
import flask.json
from flask_sqlalchemy import SQLAlchemy, inspect
__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.timestamp >= begin)
if end is not None:
query = query.filter(Sensors.timestamp <= end)
- if mode == 'consolidated' and begin is None and end is None:
+ 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(
resolution = resolutions['year']
# TODO: filter out samples from 'result'
# something like
- # select mean(temperature) from sensors where ... group by mod(timestamp, resolution)
- # func.avg(...)
- #
- # from https://stackoverflow.com/questions/4342370/grouping-into-interval-of-5-minutes-within-a-time-range
- # SELECT
- # timestamp, -- not sure about that
- # name,
- # count(b.name)
- # FROM time a, id
- # WHERE …
- # GROUP BY
- # UNIX_TIMESTAMP(timestamp) DIV 300, name
+ # 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):
+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:
+ 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, id, field_x, field_y):
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)
+ c3result[getattr(row, id)].append(getattr(row, field_y))
+ dt = getattr(row, field_x).strftime('%Y-%m-%d %H:%M:%S')
+ c3result[str(getattr(row, 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.args.get('begin', None, parse_datetime)
- end = request.args.get('end', None, parse_datetime)
+ 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 convert_to_c3(result, 'sensor_id', 'timestamp', 'value')
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 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')
+
+ result = select_openweatherdata(cityid, begin, end, mode)
+
+ if format == 'c3':
+ return convert_to_c3(result, 'cityid', 'datetime', 'temp')
+ 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):
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)
+
+
@app.route('/data/', defaults={'timespan': 1})
@app.route("/data/<int:timespan>", methods=['GET'])
def data(timespan):
@app.route("/")
def index():
- airvalue, airtime = currentairtemperature(apikey, cityid)
+ airvalue, airtime = currentairtemperature(cityid)
watervalue, watertime = currentwatertemperature(mainsensor)
return render_template(
ToastFreeware / chrisu / seepark.git / blobdiff