timing

.woodpecker.yml

@@ -20,7 +20,7 @@ steps:
     when:
       - event: [push, tag]
   deploy:
-    image: quay.io/wollud1969/k8s-admin-helper:0.1.3
+    image: quay.io/wollud1969/k8s-admin-helper:0.2.1
     environment:
       KUBE_CONFIG_CONTENT:
         from_secret: kube_config

deployment/deploy-yml.tmpl

@@ -5,7 +5,7 @@ metadata:
   labels:
     app: pv-stats
   annotations:
-    secret.reloader.stakater.com/reload=pv-stats
+    secret.reloader.stakater.com/reload: pv-stats
 spec:
   replicas: 1
   selector:

deployment/deploy.sh

@@ -19,10 +19,11 @@ kubectl create namespace $NAMESPACE \
   -o yaml | \
   kubectl -f - apply
 
-SECRETS_FILE=`mktemp`
-gpg --decrypt --passphrase $GPG_PASSPHRASE --yes --batch --homedir /tmp/.gnupg --output $SECRETS_FILE secrets.asc
-. $SECRETS_FILE
-rm $SECRETS_FILE
+# SECRETS_FILE=`mktemp`
+# gpg --decrypt --passphrase $GPG_PASSPHRASE --yes --batch --homedir /tmp/.gnupg --output $SECRETS_FILE secrets.asc
+# . $SECRETS_FILE
+# rm $SECRETS_FILE
+eval "`cat secrets.asc | /usr/local/bin/decrypt-secrets.sh`"
 
 kubectl create secret generic pv-stats \
   --dry-run=client \

src/run.py

@@ -10,6 +10,7 @@ import plotly.express as px
 import pandas as pd
 import psycopg
 import sqlalchemy
+import time
 
 try:
   redis_url = os.environ['REDIS_URL']
@@ -47,13 +48,21 @@ def token_debug():
 @oidc.require_login
 def index():
     try:
+        stepX_time = time.time()
         dbh = psycopg.connect()
         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)
+        step1_time = time.time()
+        duration1 = step1_time - step0_time
+        logger.info(f"{duration1=}")
         fig_1 = px.bar(df, x='month', y='value', color='year', barmode='group')
+        step2_time = time.time()
+        duration2 = step2_time - step1_time
+        logger.info(f"{duration2=}")
         fig_1.update_layout(
-            title="Jahreswerte Exportierte Energie",
+            title=f"Jahreswerte Exportierte Energie {duration1:.3f}, {duration2:.3f}",
             xaxis_title="",
             yaxis_title="",
             legend_title="Jahr",
@@ -64,27 +73,44 @@ def index():
             ),
             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%')
 
+        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)
+        step4_time = time.time()
+        duration3 = step4_time - step3_time
+        logger.info(f"{duration3=}")
         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(
             xaxis_title="",
             yaxis_title="",
-            title="Export gestern",
+            title=f"Export gestern {duration3:.3f}, {duration4:.3f}",
             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%')
 
+        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)
+        step7_time = time.time()
+        duration5 = step7_time - step6_time
+        logger.info(f"{duration5=}")
         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(
             xaxis_title="",
             yaxis_title="",
-            title="Export heute",
+            title=f"Export heute {duration5:.3f}, {duration6:.3f}",
             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"""
             <html>
@@ -95,6 +121,19 @@ def index():
                     {graph_html_1}
                     {graph_html_2}
                     {graph_html_3}
+                    <div style="height:9vh; background-color:lightgrey;">
+                      <table>
+                        <tr>
+                          <td>{duration1}</td><td>{duration2}</td>
+                        </tr><tr>
+                          <td>{duration3}</td><td>{duration4}</td>
+                        </tr><tr>
+                          <td>{duration5}</td><td>{duration6}</td>
+                        </tr><tr>
+                          <td>{duration7}</td>
+                        </tr>
+                      </table>   
+                    </div>
                 </body>
             </html>
         """)