Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b61a18eb1 | |||
| 1418603007 | |||
| 9926c89ef2 | |||
| fc6f407a52 | |||
| 0e9cb0a7f8 | |||
| e3b2ea704d | |||
| 8bd4a4b695 | |||
| 89f3cbb5d1 | |||
| 37c4a373b7 |
54
src/run.py
54
src/run.py
@ -48,16 +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)
|
||||||
|
|
||||||
start_time = time.time()
|
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()
|
step1_time = time.time()
|
||||||
duration1 = step1_time - start_time
|
duration1 = step1_time - step0_time
|
||||||
|
logger.info(f"{duration1=}")
|
||||||
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()
|
step2_time = time.time()
|
||||||
duration2 = step2_time - start_time
|
duration2 = step2_time - step1_time
|
||||||
|
logger.info(f"{duration2=}")
|
||||||
fig_1.update_layout(
|
fig_1.update_layout(
|
||||||
title=f"Jahreswerte Exportierte Energie {duration1:.3f}, {duration2:.3f}",
|
title=f"Jahreswerte Exportierte Energie {duration1:.3f}, {duration2:.3f}",
|
||||||
xaxis_title="",
|
xaxis_title="",
|
||||||
@ -70,31 +73,44 @@ def index():
|
|||||||
),
|
),
|
||||||
yaxis=dict(ticksuffix=" kWh")
|
yaxis=dict(ticksuffix=" kWh")
|
||||||
)
|
)
|
||||||
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='30%')
|
||||||
|
|
||||||
start_time = time.time()
|
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)
|
||||||
duration = time.time() - start_time
|
step4_time = time.time()
|
||||||
|
duration3 = step4_time - step3_time
|
||||||
|
logger.info(f"{duration3=}")
|
||||||
fig_2 = px.line(df, x='bucket', y='avg_power')
|
fig_2 = px.line(df, x='bucket', y='avg_power')
|
||||||
|
step5_time = time.time()
|
||||||
|
duration4 = step5_time - step4_time
|
||||||
|
logger.info(f"{duration4=}")
|
||||||
fig_2.update_layout(
|
fig_2.update_layout(
|
||||||
xaxis_title="",
|
xaxis_title="",
|
||||||
yaxis_title="",
|
yaxis_title="",
|
||||||
title=f"Export gestern {duration}",
|
title=f"Export gestern {duration3:.3f}, {duration4:.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='30%')
|
||||||
|
|
||||||
start_time = time.time()
|
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)
|
||||||
duration = time.time() - start_time
|
step7_time = time.time()
|
||||||
|
duration5 = step7_time - step6_time
|
||||||
|
logger.info(f"{duration5=}")
|
||||||
fig_3 = px.line(df, x='bucket', y='avg_power')
|
fig_3 = px.line(df, x='bucket', y='avg_power')
|
||||||
|
step8_time = time.time()
|
||||||
|
duration6 = step8_time - step7_time
|
||||||
|
logger.info(f"{duration6=}")
|
||||||
fig_3.update_layout(
|
fig_3.update_layout(
|
||||||
xaxis_title="",
|
xaxis_title="",
|
||||||
yaxis_title="",
|
yaxis_title="",
|
||||||
title=f"Export heute {duration}",
|
title=f"Export heute {duration5:.3f}, {duration6:.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='30%')
|
||||||
|
stepZ_time = time.time()
|
||||||
|
duration7 = stepZ_time - stepX_time
|
||||||
|
logger.info(f"{duration7=}")
|
||||||
|
|
||||||
return render_template_string(f"""
|
return render_template_string(f"""
|
||||||
<html>
|
<html>
|
||||||
@ -105,6 +121,20 @@ def index():
|
|||||||
{graph_html_1}
|
{graph_html_1}
|
||||||
{graph_html_2}
|
{graph_html_2}
|
||||||
{graph_html_3}
|
{graph_html_3}
|
||||||
|
<div style="height:9vh; background-color:lightgrey; font-family: Courier, Consolas, monospace;">
|
||||||
|
<table style="border-collapse: collapse;">
|
||||||
|
<style>table td { padding: 5px 10px; }</style>
|
||||||
|
<tr>
|
||||||
|
<td>Query 1: {duration1:.3f} s</td><td>Graph 1: {duration2:.3f} s</td>
|
||||||
|
</tr><tr>
|
||||||
|
<td>Query 2: {duration3:.3f} s</td><td>Graph 2: {duration4:.3f} s</td>
|
||||||
|
</tr><tr>
|
||||||
|
<td>Query 3: {duration5:.3f} s</td><td>Graph 3: {duration6:.3f} s</td>
|
||||||
|
</tr><tr>
|
||||||
|
<td>Total: {duration7:.3f} s</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
""")
|
""")
|
||||||
|
|||||||
Reference in New Issue
Block a user