wn/numbers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wn:0.0.8
Branches Tags
wn:main wn:ntpserver_added
wn:0.6.0 wn:0.5.6 wn:0.5.5 wn:0.5.4 wn:0.5.3 wn:0.5.2 wn:0.5.1 wn:0.5.0 wn:0.4.5 wn:0.4.4 wn:0.4.3 wn:0.4.2 wn:0.4.1 wn:0.4.0 wn:0.3.2 wn:0.3.1 wn:0.2.12 wn:0.2.11 wn:0.2.10 wn:0.2.9 wn:0.2.8 wn:0.2.7 wn:0.2.6 wn:0.2.5 wn:0.2.4 wn:0.2.3 wn:0.2.2 wn:0.2.1 wn:0.1.11 wn:0.1.10 wn:0.1.9 wn:0.1.8 wn:0.1.7 wn:0.1.6 wn:0.1.5 wn:0.1.4 wn:0.1.3 wn:0.1.2 wn:0.1.1 wn:0.0.37 wn:0.0.36 wn:0.0.35 wn:0.0.34 wn:0.0.33 wn:0.0.32 wn:0.0.31 wn:0.0.30 wn:0.0.29 wn:0.0.28 wn:0.0.27 wn:0.0.26 wn:0.0.25 wn:0.0.24 wn:0.0.22 wn:0.0.21 wn:0.0.20 wn:0.0.19 wn:0.0.18 wn:0.0.17 wn:0.0.16 wn:0.0.15 wn:0.0.14 wn:0.0.13 wn:0.0.12 wn:0.0.11 wn:0.0.10 wn:0.0.9 wn:0.0.8 wn:0.0.7 wn:0.0.6 wn:0.0.5 wn:0.0.4 wn:0.0.3 wn:0.0.2 wn:0.0.1
...
compare: wn:0.0.14
Branches Tags
wn:main wn:ntpserver_added
wn:0.6.0 wn:0.5.6 wn:0.5.5 wn:0.5.4 wn:0.5.3 wn:0.5.2 wn:0.5.1 wn:0.5.0 wn:0.4.5 wn:0.4.4 wn:0.4.3 wn:0.4.2 wn:0.4.1 wn:0.4.0 wn:0.3.2 wn:0.3.1 wn:0.2.12 wn:0.2.11 wn:0.2.10 wn:0.2.9 wn:0.2.8 wn:0.2.7 wn:0.2.6 wn:0.2.5 wn:0.2.4 wn:0.2.3 wn:0.2.2 wn:0.2.1 wn:0.1.11 wn:0.1.10 wn:0.1.9 wn:0.1.8 wn:0.1.7 wn:0.1.6 wn:0.1.5 wn:0.1.4 wn:0.1.3 wn:0.1.2 wn:0.1.1 wn:0.0.37 wn:0.0.36 wn:0.0.35 wn:0.0.34 wn:0.0.33 wn:0.0.32 wn:0.0.31 wn:0.0.30 wn:0.0.29 wn:0.0.28 wn:0.0.27 wn:0.0.26 wn:0.0.25 wn:0.0.24 wn:0.0.22 wn:0.0.21 wn:0.0.20 wn:0.0.19 wn:0.0.18 wn:0.0.17 wn:0.0.16 wn:0.0.15 wn:0.0.14 wn:0.0.13 wn:0.0.12 wn:0.0.11 wn:0.0.10 wn:0.0.9 wn:0.0.8 wn:0.0.7 wn:0.0.6 wn:0.0.5 wn:0.0.4 wn:0.0.3 wn:0.0.2 wn:0.0.1

6 Commits
0.0.8 ... 0.0.14

Author SHA1 Message Date
Wolfgang Hottgenroth
c4fd8b2cfd fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details
2025-01-28 14:51:56 +01:00
Wolfgang Hottgenroth
37ce3d47ca fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details
2025-01-28 14:41:18 +01:00
Wolfgang Hottgenroth
988f24994b fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details
2025-01-28 14:28:24 +01:00
Wolfgang Hottgenroth
b8dd70e5ae fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details
2025-01-28 14:20:09 +01:00
Wolfgang Hottgenroth
6ba9352edc second graph
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details
2025-01-28 14:13:30 +01:00
Wolfgang Hottgenroth
aaa23a9839 only one graph
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/tag/woodpecker Pipeline was successful
Details
2025-01-28 13:54:11 +01:00
1 changed files with 27 additions and 6 deletions
Expand all files Collapse all files

33
src/run.py
View File

@ -40,11 +40,12 @@ def index():
try: try:
dbh = psycopg.connect() dbh = psycopg.connect()
engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh) engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
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)
fig = px.bar(df, x='month', y='value', color='year', barmode='group') fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
fig.update_layout( fig_1.update_layout(
title="Jahreswerte Exportierte Energie", title="Jahreswerte Exportierte Energie",
xaxis_title="Monat", xaxis_title="",
yaxis_title="", yaxis_title="",
legend_title="Jahr", legend_title="Jahr",
xaxis=dict( xaxis=dict(
@ -54,8 +55,27 @@ def index():
), ),
yaxis=dict(ticksuffix=" kWh") yaxis=dict(ticksuffix=" kWh")
) )
graph_html = fig.to_html(full_html=False) graph_html_1 = fig_1.to_html(full_html=False, default_height='33%')
graph_html_2 = fig.to_html(full_html=False)
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)
fig_2 = px.line(df, x='bucket', y='avg_power')
fig_2.update_layout(
xaxis_title="",
yaxis_title="",
title="Export gestern",
yaxis=dict(ticksuffix=" W")
)
graph_html_2 = fig_2.to_html(full_html=False, default_height='33%')
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)
fig_3 = px.line(df, x='bucket', y='avg_power')
fig_3.update_layout(
xaxis_title="",
yaxis_title="",
title="Export heute",
yaxis=dict(ticksuffix=" W")
)
graph_html_3 = fig_3.to_html(full_html=False, default_height='33%')
return render_template_string(f""" return render_template_string(f"""
<html> <html>
@ -63,8 +83,9 @@ def index():
<title>Jahreswerte PV-Energie</title> <title>Jahreswerte PV-Energie</title>
</head> </head>
<body> <body>
{graph_html} {graph_html_1}
{graph_html_2} {graph_html_2}
{graph_html_3}
</body> </body>
</html> </html>
""") """)