From 7b05fc04ce09b77fd9b8d7d739ababed0891f55b Mon Sep 17 00:00:00 2001 From: Andreas Date: Wed, 9 Oct 2024 12:33:00 +0200 Subject: [PATCH] JSON Response fixed --- src/akkudoktoreos/class_ems.py | 6 ++++++ src/akkudoktoreosserver/flask_server.py | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/akkudoktoreos/class_ems.py b/src/akkudoktoreos/class_ems.py index f20443a..36d21bb 100644 --- a/src/akkudoktoreos/class_ems.py +++ b/src/akkudoktoreos/class_ems.py @@ -142,7 +142,13 @@ class EnergieManagementSystem: keys_to_modify = [ "Last_Wh_pro_Stunde", "Netzeinspeisung_Wh_pro_Stunde", + "akku_soc_pro_stunde", "Netzbezug_Wh_pro_Stunde", + "Kosten_Euro_pro_Stunde", + "Einnahmen_Euro_pro_Stunde", + "E-Auto_SoC_pro_Stunde", + "Verluste_Pro_Stunde", + "Haushaltsgeraet_wh_pro_stunde" ] # Loop through each key in the list diff --git a/src/akkudoktoreosserver/flask_server.py b/src/akkudoktoreosserver/flask_server.py index c97373f..80b0cb9 100755 --- a/src/akkudoktoreosserver/flask_server.py +++ b/src/akkudoktoreosserver/flask_server.py @@ -3,14 +3,14 @@ import os from datetime import datetime from typing import Any, TypeGuard - +import json import matplotlib # Sets the Matplotlib backend to 'Agg' for rendering plots in environments without a display matplotlib.use("Agg") import pandas as pd -from flask import Flask, jsonify, redirect, request, send_from_directory, url_for +from flask import Flask, jsonify, redirect, request, send_from_directory, url_for, Response from akkudoktoreos.class_load import LoadForecast from akkudoktoreos.class_load_container import Gesamtlast @@ -252,7 +252,9 @@ def flask_optimize(): if "min_soc_prozent" not in parameter: parameter["min_soc_prozent"] = None - return jsonify(result) # Return optimization results as JSON + # convert to JSON (None accepted by dumps) + json_data = json.dumps(result) + return Response(json_data, mimetype='application/json') @app.route("/visualisierungsergebnisse.pdf")