Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
2c93c7ec47 | |||
e0b1c469d2 | |||
d646090802 | |||
c4fd8b2cfd | |||
37ce3d47ca | |||
988f24994b | |||
b8dd70e5ae | |||
6ba9352edc | |||
aaa23a9839 | |||
812989df47 | |||
452161ff03 | |||
cd3bf25fa1 | |||
9baa648382 |
@ -16,7 +16,7 @@ steps:
|
||||
scan_image:
|
||||
image: aquasec/trivy
|
||||
commands:
|
||||
- trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
|
||||
- TRIVY_DISABLE_VEX_NOTICE=1 trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
|
||||
when:
|
||||
- event: [push, tag]
|
||||
deploy:
|
||||
|
@ -1,15 +1,15 @@
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
jA0ECQMCGiCDDKK8KgP/0sExAeQ99bvndkYa/C1rLsDj14oKDgqea1ylRMTSm3if
|
||||
jUdbOyaNR0p0R32AS1wVlR9qxE1g/e/dCNmGjYQ0lqpyRwX6uqJFZ8KubZp0rRCV
|
||||
40VpAfuu4eKE6NsxW8U4wlY5aDR21YUndoaHCwNQDgFV2exCDVeOsF1hyGgurWBG
|
||||
QeAtlCN+HV6t9Gg6KUXRlr89C/wdZkkYScVGXxqemqetGntGhS96u37EFzyjnDaD
|
||||
P09d6LKOIuHnKHZgBcKUZSqkYYwlNk05Wum9FqoWQc8KgCMvMv0WQNaaQxkrRah5
|
||||
DRgyXkNYrDg3WGt7357H3LO+IP1gTVAyjEsZl0OpazXLKGfrsWis+191t9omXk+x
|
||||
Y9g/dx1aSqgeIQ3SiTpjdHHItSYcJ+ZYvJy+4u6FeKFrk/5Z9nBA0LxEmo5ObGmg
|
||||
SrMCnzU1/JDCsAEp8mvAMQWFjJUrgUMUHM00uFm32Nq6SOAT50rW4/XIxak2w6/x
|
||||
Zi7j3kxD6dfEXAeGRqCbDeTPQHNWPlvq0Rez2uaYA8w8S1hNoS8iSOSUbBoMCdFK
|
||||
k61VApVRty0g35IsemcEuocIBw3YLWLLngHk7/xpKKWjbFO9H5AmxZT6FKcq7BwK
|
||||
Q4DPHAmHDSCniiMzdcbcH7Y8GvO8q9jFPfQWE5MDETVlQ7Q=
|
||||
=gOlN
|
||||
jA0ECQMCjSYtdE7M+rT/0sEmAbK6tjOB7cduweJyS3sULIl017BrOM1HGV1v4QkN
|
||||
NWtceKHpJEFmk1ZFh1EmyS724bDxtVLm8qJN4VzV+cLPa8/IiTzOHJEg4PDRcc0U
|
||||
LRCZOb5PtfKWBcQdRshT3JhIxxOKG53ZKOHJ2VodZ/iqmpSbjZ39GtzLJoXlXwCJ
|
||||
jHAHgADdvq5J7joSaozjxVCXQI2nOmlEcZosZVd6LZDvemWtmci4ARJtOEqad4Wi
|
||||
mbleupBF18pA7b63hfmHocO89b9pTpUZWw10b0SHrUiKZG6kHeQXE8GGu+4HiRcG
|
||||
xJN/yYe2Ly4tHwT54gQ7ytLrxOnJUQKelSpq370t/lrGTf8L4b2eq+tED8/7z5Ho
|
||||
E12VDreYLFaS2IeJCFBefiGGbKgttPcHZvDCPCUpCpfSShlqtTaidwsTq2lPFGyo
|
||||
0Lz9NHsqp4/U+4nabCWNVWhnZhwqIPYOt/kKsYvjq40U29q7RORnxz8l/Ym4vB1P
|
||||
kLeouElJvAz6vt/1+nFQJb65YykTqKQpbKgbziFiUFwb37QzBqRO7tuv3/MUzJ1Q
|
||||
KB7+IOQ43vFbAK6DZAhJZtAspVYiZ95niVxepaghzf33/FquhtZ+XpFEBDv525z7
|
||||
pML7BxFxuwF5q7HBTPtc4IeJBgGi16wm
|
||||
=K6Qq
|
||||
-----END PGP MESSAGE-----
|
||||
|
50
src/run.py
50
src/run.py
@ -34,25 +34,27 @@ app.config.update({
|
||||
Session(app)
|
||||
oidc = OpenIDConnect(app)
|
||||
|
||||
@app.route('/token_debug', methods=['GET'])
|
||||
@oidc.require_login
|
||||
def token_debug():
|
||||
# Access Token vom Identity Provider abrufen
|
||||
access_token = oidc.get_access_token()
|
||||
return json.dumps({
|
||||
"access_token": access_token
|
||||
})
|
||||
|
||||
@app.route('/')
|
||||
@oidc.require_login
|
||||
def index():
|
||||
counter = int(session.get('counter', '0'))
|
||||
counter += 1
|
||||
session['counter'] = f"{counter}"
|
||||
return f"Hello, Flask! Called for the {counter}. time."
|
||||
|
||||
@app.route('/plot')
|
||||
@oidc.require_login
|
||||
def plot():
|
||||
try:
|
||||
dbh = psycopg.connect()
|
||||
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)
|
||||
fig = px.bar(df, x='month', y='value', color='year', barmode='group')
|
||||
fig.update_layout(
|
||||
fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
|
||||
fig_1.update_layout(
|
||||
title="Jahreswerte Exportierte Energie",
|
||||
xaxis_title="Monat",
|
||||
xaxis_title="",
|
||||
yaxis_title="",
|
||||
legend_title="Jahr",
|
||||
xaxis=dict(
|
||||
@ -62,7 +64,27 @@ def plot():
|
||||
),
|
||||
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%')
|
||||
|
||||
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"""
|
||||
<html>
|
||||
@ -70,7 +92,9 @@ def plot():
|
||||
<title>Jahreswerte PV-Energie</title>
|
||||
</head>
|
||||
<body>
|
||||
{graph_html}
|
||||
{graph_html_1}
|
||||
{graph_html_2}
|
||||
{graph_html_3}
|
||||
</body>
|
||||
</html>
|
||||
""")
|
||||
|
Reference in New Issue
Block a user