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
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')
def openweathermapdata(cityid):
- 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')