Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e3b2ea704d | |||
| 8bd4a4b695 | |||
| 89f3cbb5d1 | |||
| 37c4a373b7 | |||
| 408cff442c | |||
| 67b88aa2a1 |
28
src/run.py
28
src/run.py
@ -10,6 +10,7 @@ import plotly.express as px
|
|||||||
import pandas as pd
|
import pandas as pd
|
||||||
import psycopg
|
import psycopg
|
||||||
import sqlalchemy
|
import sqlalchemy
|
||||||
|
import time
|
||||||
|
|
||||||
try:
|
try:
|
||||||
redis_url = os.environ['REDIS_URL']
|
redis_url = os.environ['REDIS_URL']
|
||||||
@ -47,13 +48,19 @@ def token_debug():
|
|||||||
@oidc.require_login
|
@oidc.require_login
|
||||||
def index():
|
def index():
|
||||||
try:
|
try:
|
||||||
|
stepX_time = time.time()
|
||||||
dbh = psycopg.connect()
|
dbh = psycopg.connect()
|
||||||
engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
|
engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
|
||||||
|
|
||||||
|
step0_time = time.time()
|
||||||
df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM pv_energy_by_month", con=engine)
|
df = pd.read_sql("SELECT month, cast(year AS varchar), current_energy AS value FROM pv_energy_by_month", con=engine)
|
||||||
|
step1_time = time.time()
|
||||||
|
duration1 = step1_time - step0_time
|
||||||
fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
|
fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
|
||||||
|
step2_time = time.time()
|
||||||
|
duration2 = step2_time - step1_time
|
||||||
fig_1.update_layout(
|
fig_1.update_layout(
|
||||||
title="Jahreswerte Exportierte Energie",
|
title=f"Jahreswerte Exportierte Energie {duration1:.3f}, {duration2:.3f}",
|
||||||
xaxis_title="",
|
xaxis_title="",
|
||||||
yaxis_title="",
|
yaxis_title="",
|
||||||
legend_title="Jahr",
|
legend_title="Jahr",
|
||||||
@ -66,25 +73,37 @@ def index():
|
|||||||
)
|
)
|
||||||
graph_html_1 = fig_1.to_html(full_html=False, default_height='33%')
|
graph_html_1 = fig_1.to_html(full_html=False, default_height='33%')
|
||||||
|
|
||||||
|
step3_time = time.time()
|
||||||
df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time >= date_trunc('day', now()) - '1 day'::interval AND time < date_trunc('day', now()) GROUP BY bucket ORDER BY bucket", con=engine)
|
df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time >= date_trunc('day', now()) - '1 day'::interval AND time < date_trunc('day', now()) GROUP BY bucket ORDER BY bucket", con=engine)
|
||||||
|
step4_time = time.time()
|
||||||
|
duration1 = step4_time - step3_time
|
||||||
fig_2 = px.line(df, x='bucket', y='avg_power')
|
fig_2 = px.line(df, x='bucket', y='avg_power')
|
||||||
|
step5_time = time.time()
|
||||||
|
duration2 = step5_time - step4_time
|
||||||
fig_2.update_layout(
|
fig_2.update_layout(
|
||||||
xaxis_title="",
|
xaxis_title="",
|
||||||
yaxis_title="",
|
yaxis_title="",
|
||||||
title="Export gestern",
|
title=f"Export gestern {duration1:.3f}, {duration2:.3f}",
|
||||||
yaxis=dict(ticksuffix=" W")
|
yaxis=dict(ticksuffix=" W")
|
||||||
)
|
)
|
||||||
graph_html_2 = fig_2.to_html(full_html=False, default_height='33%')
|
graph_html_2 = fig_2.to_html(full_html=False, default_height='33%')
|
||||||
|
|
||||||
|
step6_time = time.time()
|
||||||
df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval GROUP BY bucket ORDER BY bucket", con=engine)
|
df = pd.read_sql("SELECT time_bucket('5 minutes', time) AS bucket, AVG(power) AS avg_power FROM pv_power_v WHERE time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval GROUP BY bucket ORDER BY bucket", con=engine)
|
||||||
|
step7_time = time.time()
|
||||||
|
duration1 = step7_time - step6_time
|
||||||
fig_3 = px.line(df, x='bucket', y='avg_power')
|
fig_3 = px.line(df, x='bucket', y='avg_power')
|
||||||
|
step8_time = time.time()
|
||||||
|
duration2 = step8_time - step7_time
|
||||||
fig_3.update_layout(
|
fig_3.update_layout(
|
||||||
xaxis_title="",
|
xaxis_title="",
|
||||||
yaxis_title="",
|
yaxis_title="",
|
||||||
title="Export heute",
|
title=f"Export heute {duration1:.3f}, {duration2:.3f}",
|
||||||
yaxis=dict(ticksuffix=" W")
|
yaxis=dict(ticksuffix=" W")
|
||||||
)
|
)
|
||||||
graph_html_3 = fig_3.to_html(full_html=False, default_height='33%')
|
graph_html_3 = fig_3.to_html(full_html=False, default_height='33%')
|
||||||
|
stepZ_time = time.time()
|
||||||
|
duration = stepZ_time - stepX_time
|
||||||
|
|
||||||
return render_template_string(f"""
|
return render_template_string(f"""
|
||||||
<html>
|
<html>
|
||||||
@ -95,6 +114,9 @@ def index():
|
|||||||
{graph_html_1}
|
{graph_html_1}
|
||||||
{graph_html_2}
|
{graph_html_2}
|
||||||
{graph_html_3}
|
{graph_html_3}
|
||||||
|
<p>
|
||||||
|
{duration:.3f}
|
||||||
|
</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
""")
|
""")
|
||||||
|
|||||||
Reference in New Issue
Block a user