Update insert statement to work with sqlalchemy 2.

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

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 586d296bdd65a8a0d25ba30214d60b5b01e16d30..a75acbfd603cbd717b128be547e8a1fb05937d29 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -1,23 +1,23 @@
-import collections
+import configparser
 import datetime
+import io
 import itertools
-import time
-import configparser
 import os
-import sys
 from collections import defaultdict
-import io
-import numpy as np
+
 import matplotlib
-matplotlib.use('pdf')
+import numpy as np
+
 import matplotlib.pyplot as plt
 from matplotlib.backends.backend_pdf import PdfPages
 
 from flask import Flask, render_template, jsonify, request, abort, Response, make_response
-import flask.json
-from flask_sqlalchemy import SQLAlchemy, inspect
+from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy import func
 
+matplotlib.use('pdf')
+
+
 MONTH_DE = [
     'Jänner',
     'Februar',
@@ -42,21 +42,6 @@ DAY_OF_WEEK_DE = [
     'Sonntag']
 
 
-# https://stackoverflow.com/a/37350445
-def sqlalchemy_model_to_dict(model):
-    return {c.key: getattr(model, c.key)
-        for c in inspect(model).mapper.column_attrs}
-
-
-class JSONEncoder(flask.json.JSONEncoder):
-    def default(self, object):
-        if isinstance(object, datetime.datetime):
-            return object.isoformat()
-        elif isinstance(object, db.Model):
-            return sqlalchemy_model_to_dict(object)
-        return super().default(object)
-
-
 def parse_datetime(date_str):
     return datetime.datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S')
 
@@ -81,11 +66,11 @@ cityid = config.get('openweathermap', 'cityid')
 mainsensor = config.get('webapp', 'mainsensor')
 
 app = Flask(__name__)
-app.json_encoder = JSONEncoder
 app.config['SQLALCHEMY_DATABASE_URI'] = get_sqlalchemy_database_uri(config)
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 db = SQLAlchemy(app)
-db.reflect(app=app)
+with app.app_context():
+    db.reflect()
 
 
 class Sensors(db.Model):
@@ -393,12 +378,15 @@ def report(year, month):
                 x, y = data
                 for d in days_datetime:
                     report_datetime = datetime.datetime.combine(d.date(), t)
-                    closest_index = np.argmin(np.abs(x - report_datetime))
-                    if abs(x[closest_index] - report_datetime) > datetime.timedelta(hours=1):
+                    if len(x) == 0:
                         cell = 'N/A'
                     else:
-                        value = y[closest_index]
-                        cell = '{:.1f}'.format(value)
+                        closest_index = np.argmin(np.abs(x - report_datetime))
+                        if abs(x[closest_index] - report_datetime) > datetime.timedelta(hours=1):
+                            cell = 'N/A'
+                        else:
+                            value = y[closest_index]
+                            cell = '{:.1f}'.format(value)
                     row_cells.append(cell)
                 cells.append(row_cells)
         row_colors = list(ntimes(report_colors + ['w'], len(report_times)))