fix, 3

.woodpecker.yml

@@ -13,14 +13,44 @@ steps:
       dockerfile: Dockerfile
     when:
       - event: [push, tag]
-  scan_image:
-    image: aquasec/trivy
+        
+  scan:
+    image: quay.io/wollud1969/woodpecker-helper:0.5.1
+    environment:
+      TRIVY_TOKEN:
+        from_secret: trivy_token
+      TRIVY_URL:
+        from_secret: trivy_url
+      DTRACK_API_KEY:
+        from_secret: dtrack_api_key
+      DTRACK_API_URL:
+        from_secret: dtrack_api_url
     commands:
-      - trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
+      - HOME=/home/`id -nu`
+      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
+      - |
+        trivy image \
+              --server $TRIVY_URL \
+              --token $TRIVY_TOKEN \
+              --format cyclonedx \
+              --scanners license \
+              --output /tmp/sbom.xml \
+              $FORGE_NAME/$CI_REPO:$TAG
+      - cat /tmp/sbom.xml
+      - |
+        curl -X "POST" \
+             -H "Content-Type: multipart/form-data" \
+             -H "X-Api-Key: $DTRACK_API_KEY" \
+             -F "autoCreate=true" \
+             -F "projectName=$CI_REPO" \
+             -F "projectVersion=$TAG" \
+             -F "bom=@/tmp/sbom.xml"\
+             "$DTRACK_API_URL/api/v1/bom"        
     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

debug-build-run.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -x
+
+IMAGE_NAME=numberimage
+
+docker build --progress=plain -t $IMAGE_NAME .
+
+
+SECRETS=`mktemp`
+gpg --decrypt --passphrase $GPG_PASSPHRASE --yes --batch --output $SECRETS ./deployment/secrets.asc
+. $SECRETS
+rm $SECRETS
+
+DB_NAMESPACE=database1
+DB_DEPLOYNAME=database
+
+REDIS_NAMESPACE=redis
+REDIS_SERVICE_NAME=redis
+
+PGHOST=`kubectl get services $DB_DEPLOYNAME -n $DB_NAMESPACE -o jsonpath="{.status.loadBalancer.ingress[0].ip}"`
+REDISHOST=`kubectl get services $REDIS_SERVICE_NAME -n $REDIS_NAMESPACE -o jsonpath="{.status.loadBalancer.ingress[0].ip}"`
+
+REDIS_URL=redis://$REDISHOST:6379/4
+
+
+docker run \
+  -it \
+  --rm \
+  -e "REDIS_URL=$REDIS_URL" \
+  -e "SECRET_KEY=$SECRET_KEY" \
+  -e "OIDC_CLIENT_SECRETS=$OIDC_CLIENT_SECRETS" \
+  -e "PGHOST=$PGHOST" \
+  -e "PGDATABASE=$PGDATABASE" \
+  -e "PGSSLMODE=$PGSSLMODE" \
+  -e "PGUSER=$PGUSER" \
+  -e "PGPASSWORD=$PGPASSWORD" \
+  -p 8080:8080 \
+  $IMAGE_NAME
+

deployment/deploy-yml.tmpl

@@ -1,17 +1,64 @@
-apiVersion: batch/v1
-kind: CronJob
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: pv-energy-calculator
-spec:
-  schedule: "15 * * * *"
-  jobTemplate:
+  name: numbers
+  labels:
+    app: numbers
+  annotations:
+    secret.reloader.stakater.com/reload: numbers
 spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: numbers
   template:
+    metadata:
+      labels:
+        app: numbers
     spec:
-          restartPolicy: OnFailure
       containers:
-            - name: pv-energy-calculator
+        - name: numbers
           image: %IMAGE%
           envFrom:
             - secretRef: 
-                    name: pv-energy-calculator
+                name: numbers
+          ports:
+            - containerPort: 8080
+              protocol: TCP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: numbers
+spec:
+  type: ClusterIP
+  selector:
+    app: numbers
+  ports:
+    - name: http
+      targetPort: 8080
+      port: 80
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: numbers
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production-http
+spec:
+  tls:
+    - hosts:
+        - numbers.hottis.de
+      secretName: numbers-cert
+  rules:
+    - host: numbers.hottis.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: numbers
+                port:
+                  number: 80
+

deployment/deploy.sh

@@ -9,7 +9,7 @@ if [ "$GPG_PASSPHRASE" == "" ]; then
   exit 1
 fi
 
-IMAGE_NAME=gitea.hottis.de/wn/pv-stats
+IMAGE_NAME=gitea.hottis.de/wn/numbers
 NAMESPACE=homea
 DEPLOYMENT_DIR=$PWD/deployment
 
@@ -19,12 +19,13 @@ 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 \
+kubectl create secret generic numbers \
   --dry-run=client \
   -o yaml \
   --save-config \
@@ -38,9 +39,9 @@ kubectl create secret generic pv-stats \
   --from-literal=OIDC_CLIENT_SECRETS="$OIDC_CLIENT_SECRETS" | \
   kubectl apply -f - -n $NAMESPACE
 
-# cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
-#   sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
-#   kubectl apply -f - -n $NAMESPACE
+cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
+  sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
+  kubectl apply -f - -n $NAMESPACE
 
 popd > /dev/null
 

deployment/secrets.asc

@@ -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
+jA0ECQMC4tvOFCp2PT7/0sE+AcZmiGwroHYdWW/vJA1sCoMrM2oW8xUc1KndDGto
+dFev2KcoZ4FRL9liCrJ7on773bZFCTDu2xiBNMeKF1p8drub1Ej5l61Oq15mLTYf
+XjXknFiWWq4PTzhhy53zvDyIV5yIcGfjotpGC83/qH5CBWIcCw9PZHI5+uHRVRKL
+OpdTpekJ8ljPAGQ4F3vbOeBbG1PMoclx8r5SpKxLwQco2iaXd71dXHtPkEnLujd4
+ZRCthVNVfxrIIRcTJfgxewz2oJWYF9008nmtxpKzqfBtNpFIdBtnTTVvv2lfcVuS
+S4eav9ljPPd/exZaT7fOGD/kuCdiiu6e0yGLzo2ykf0uBy7hG7ZJg8TH5e+LMBm9
+Q1OFD+5LWeEsOEdSTlT5UbV5EaVEiawKWQn7rMZOyvBNiPwLaOlquHirWoll5eIm
+OHgBVN0FiY/righpIoei/KP705FIg+hrpMUvc29PahiL8dgsxJycnKIo4t+2/nac
+H144hP/rqBeaobG05TkZIr+Cpt4rpwwfNWOHgmNFHVpxdmPfoeAmpT4nz760hTEN
+2ol4Qh8xL7n4GFiCpNg8tNZiZkPPa/aRUAFxgdq5beossvKukxCexQmlCFvxITSG
+x9RwssFMnT+wqTuzBN8neBeEF1d9AtAFQKPtg3wkMUyJAlYkxiGS/2NJuYDVpmEQ
+=Wr4f
 -----END PGP MESSAGE-----

src/app.py

@@ -0,0 +1,32 @@
+from flask import Flask, session, g, render_template_string
+from flask_session import Session
+from flask_oidc import OpenIDConnect
+from werkzeug.middleware.proxy_fix import ProxyFix
+from loguru import logger
+import redis
+import json
+import os
+
+try:
+  redis_url = os.environ['REDIS_URL']
+  oidc_client_secrets = os.environ['OIDC_CLIENT_SECRETS']
+  secret_key = os.environ['SECRET_KEY']
+except KeyError as e:
+  logger.error(f"Required environment variable not set ({e})")
+  raise e
+
+app = Flask(__name__)
+app.config.update({
+  'SECRET_KEY': secret_key,
+  'SESSION_TYPE': 'redis',
+  'SESSION_REDIS': redis.from_url(redis_url),
+  'OIDC_CLIENT_SECRETS': json.loads(oidc_client_secrets),
+  'OIDC_SCOPES': 'openid email',
+  'OIDC_USER_INFO_ENABLED': True,
+  'SESSION_USE_SIGNER': True,
+})
+Session(app)
+oidc = OpenIDConnect(app)
+
+
+

src/debug_routes.py

@@ -0,0 +1,16 @@
+from loguru import logger
+import json
+
+from app import app
+from app import oidc
+
+
+@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
+    })
+

src/ntp_routes.py

@@ -0,0 +1,162 @@
+from flask import Flask, session, g, render_template_string, Response
+from loguru import logger
+import json
+import plotly.express as px
+import plotly.graph_objects as po
+import matplotlib.pyplot as plt
+import pandas as pd
+import psycopg
+import sqlalchemy
+import time
+import io
+
+from app import app
+from app import oidc
+
+
+
+@app.route('/ntpserver')
+def ntpserver():
+    try:
+        dbh = psycopg.connect()
+        engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
+
+        query = """
+          select   time_bucket('5 minutes', time) as bucket,
+            device,
+            avg(cast(values->'rootdisp'->>'value'  as float)) as rootdisp,
+            max(cast(values->'stratum'->>'value'  as int)) as stratum
+          from measurements
+          where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and 
+            application = 'TSM' and attributes->>'Label' = 'david'
+          group by bucket, device
+          order by bucket, device
+        """      
+
+        df = pd.read_sql(query, con=engine)
+
+        fig = po.Figure()
+        fig.add_trace(po.Scatter(x=df['bucket'], y=df['rootdisp'], mode='lines', name='Root Dispersion', yaxis='y1', line=dict(color='red')))
+        fig.add_trace(po.Scatter(x=df['bucket'], y=df['stratum'], mode='lines', name='Stratum', yaxis='y2', line=dict(color='blue')))
+
+        fig.update_layout(
+            title='NTP Server Numbers',
+            
+            # Linke Y-Achse
+            yaxis=dict(
+                title='Root Dispersion',
+                ticksuffix=' ms'
+            ),
+            
+            # Rechte Y-Achse
+            yaxis2=dict(
+                title='Stratum',
+                overlaying='y',  # Legt die zweite Y-Achse über die erste
+                side='right',  # Setzt sie auf die rechte Seite
+                tickmode='linear',  # Stellt sicher, dass die Ticks in festen Intervallen sind
+                dtick=1,  # Zeigt nur ganzzahlige Ticks
+            ),
+            
+            legend=dict(x=0.05, y=1)  # Position der Legende
+        )
+
+        graph_html_1 = fig.to_html(full_html=False, default_height='30%')
+
+        query = """
+            select   time_bucket('5 minutes', time) as bucket,
+              device,
+              avg(cast(values->'time-req-pkts'->>'value'  as float)) as packets
+            from measurements
+            where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and 
+              application = 'SNMP' and attributes->>'Label' = 'david'
+            group by bucket, device
+            order by bucket, device
+        """
+        df = pd.read_sql(query, con=engine)
+        fig_2 = px.line(df, x='bucket', y='packets')
+        fig_2.update_layout(
+            xaxis_title="",
+            yaxis_title="",
+            yaxis_ticksuffix="p/s",
+            title=f"Time Requests"
+        )
+        graph_html_2 = fig_2.to_html(full_html=False, default_height='30%')
+
+        query = """
+            select   time_bucket('5 minutes', time) as bucket,
+              device,
+              avg(cast(values->'load1'->>'value'  as float)) as loadaverage1min
+            from measurements
+            where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and 
+              application = 'SNMP' and attributes->>'Label' = 'david'
+            group by bucket, device
+            order by bucket, device
+        """
+        df = pd.read_sql(query, con=engine)
+        fig_3 = px.line(df, x='bucket', y='loadaverage1min')
+        fig_3.update_layout(
+            xaxis_title="",
+            yaxis_title="",
+            title=f"CPU Load"
+        )
+        graph_html_3 = fig_3.to_html(full_html=False, default_height='30%')
+
+        return render_template_string(f"""
+            <html>
+                <head>
+                    <title>NTP Server Numbers</title>
+                </head>
+                <body>
+                    {graph_html_1}
+                    {graph_html_2}
+                    {graph_html_3}
+                </body>
+            </html>
+        """)
+    except Exception as e:
+        raise Exception(f"Error when querying NTP server values: {e}")
+    finally:
+        if dbh is not None:
+            dbh.close()
+
+
+@app.route('/plot.png')
+def plot_png():
+    dbh = psycopg.connect()
+    engine = sqlalchemy.create_engine("postgresql+psycopg://", creator=lambda: dbh)
+    query = """
+      select   time_bucket('5 minutes', time) as bucket,
+        device,
+        avg(cast(values->'rootdisp'->>'value'  as float)) as rootdisp,
+        max(cast(values->'stratum'->>'value'  as int)) as stratum
+      from measurements
+      where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and
+        application = 'TSM' and attributes->>'Label' = 'david'
+      group by bucket, device
+      order by bucket, device
+    """
+    df = pd.read_sql(query, con=engine)
+
+    fig, ax1 = plt.subplots()
+
+    ax1.plot(df['bucket'], df['rootdisp'], 'r-', label='Root Dispersion')
+    ax1.set_xlabel('Time')
+    ax1.set_ylabel('Root Dispersion (ms)', color='r')
+    ax1.tick_params(axis='y', labelcolor='r')
+
+    ax2 = ax1.twinx()
+    ax2.plot(df['bucket'], df['stratum'], 'b-', label='Stratum')
+    ax2.set_ylabel('Stratum', color='b')
+    ax2.tick_params(axis='y', labelcolor='b')
+    ax2.set_yticks(range(int(df['stratum'].min()), int(df['stratum'].max()) + 1))
+
+    fig.suptitle('NTP Server Numbers')
+    fig.tight_layout()
+    
+    img_io = io.BytesIO()
+    plt.savefig(img_io, format='png')
+    img_io.seek(0)
+    plt.close(fig)
+    
+    return Response(img_io, mimetype='image/png')
+

src/pv_routes.py

@@ -0,0 +1,117 @@
+from flask import Flask, session, g, render_template_string
+from loguru import logger
+import json
+import plotly.express as px
+import plotly.graph_objects as po
+import pandas as pd
+import psycopg
+import sqlalchemy
+import time
+
+from app import app
+from app import oidc
+
+
+@app.route('/pvstats')
+@oidc.require_login
+def pvstats():
+    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=f"Jahreswerte Exportierte Energie {duration1:.3f}, {duration2:.3f}",
+            xaxis_title="",
+            yaxis_title="",
+            legend_title="Jahr",
+            xaxis=dict(
+                tickmode="array",
+                tickvals=list(range(1, 13)),  # Monate 1–12
+                ticktext=["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"]
+            ),
+            yaxis=dict(ticksuffix=" kWh")
+        )
+        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=f"Export gestern {duration3:.3f}, {duration4:.3f}",
+            yaxis=dict(ticksuffix=" W")
+        )
+        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=f"Export heute {duration5:.3f}, {duration6:.3f}",
+            yaxis=dict(ticksuffix=" W")
+        )
+        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>
+                <head>
+                    <title>Jahreswerte PV-Energie</title>
+                </head>
+                <body>
+                    {graph_html_1}
+                    {graph_html_2}
+                    {graph_html_3}
+                    <div style="height:9vh; background-color:lightgrey; font-family: Courier, Consolas, monospace;">
+                      <table style="border-collapse: collapse;">
+                        <style>
+                          td.smallsep {{ padding-right: 10px }}
+                          td.largesep {{ padding-right: 30px }}
+                        </style> 
+                        <tr>
+                          <td class="smallsep">Query 1:</td><td class="largesep"> {duration1:.3f} s</td><td class="smallsep">Graph 1:</td><td> {duration2:.3f} s</td>
+                        </tr><tr>
+                          <td class="smallsep">Query 2:</td><td class="largesep"> {duration3:.3f} s</td><td class="smallsep">Graph 2:</td><td> {duration4:.3f} s</td>
+                        </tr><tr>
+                          <td class="smallsep">Query 3:</td><td class="largesep"> {duration5:.3f} s</td><td class="smallsep">Graph 3:</td><td> {duration6:.3f} s</td>
+                        </tr><tr>
+                          <td class="smallsep">Total:</td><td> {duration7:.3f} s</td><td></td><td></td>
+                        </tr>
+                      </table>   
+                    </div>
+                </body>
+            </html>
+        """)
+    except Exception as e:
+        raise Exception(f"Error when querying energy export values: {e}")
+    finally:
+        if dbh is not None:
+            dbh.close()
+

src/requirements.txt

@@ -10,6 +10,8 @@ cryptography==44.0.0
 Flask==3.1.0
 flask-oidc==2.2.2
 Flask-Session==0.8.0
+greenlet==3.1.1
+gunicorn==23.0.0
 idna==3.10
 importlib_metadata==8.6.1
 itsdangerous==2.2.0
@@ -36,3 +38,6 @@ tzdata==2025.1
 urllib3==2.3.0
 Werkzeug==3.1.3
 zipp==3.21.0
+pillow==11.1.0
+matplotlib==3.10.1
+

src/routes.py

@@ -0,0 +1,24 @@
+from flask import abort, Response
+from PIL import Image, ImageDraw
+import io
+from app import app
+from app import oidc
+
+
+@app.route('/')
+def index():
+    abort(404)
+
+@app.route('/generate_image')
+def generate_image():
+    img = Image.new('RGB', (200, 100), color=(255, 255, 255))
+    
+    draw = ImageDraw.Draw(img)
+    draw.text((50, 40), "Hello, Flask!", fill=(0, 0, 0))  # Schwarzer Text
+    
+    img_io = io.BytesIO()
+    img.save(img_io, 'PNG')
+    img_io.seek(0)  # Zeiger zurücksetzen
+
+    return Response(img_io, mimetype='image/png')
+

src/run.py

@@ -1,86 +1,12 @@
-from flask import Flask, session, g, render_template_string
-from flask_session import Session
-from flask_oidc import OpenIDConnect
 from werkzeug.middleware.proxy_fix import ProxyFix
 from loguru import logger
-import redis
-import json
-import os
-import plotly.express as px
-import pandas as pd
-import psycopg
-import sqlalchemy
-
-try:
-  redis_url = os.environ['REDIS_URL']
-  oidc_client_secrets = os.environ['OIDC_CLIENT_SECRETS']
-  secret_key = os.environ['SECRET_KEY']
-except KeyError as e:
-  logger.error(f"Required environment variable not set ({e})")
-  raise e
-  
-
-app = Flask(__name__)
-
-app.config.update({
-  'SECRET_KEY': secret_key,
-  'SESSION_TYPE': 'redis',
-  'SESSION_REDIS': redis.from_url(redis_url),
-  'OIDC_CLIENT_SECRETS': json.loads(oidc_client_secrets),
-  'OIDC_SCOPES': 'openid email',
-  'OIDC_USER_INFO_ENABLED': True,
-  'SESSION_USE_SIGNER': True,
-})
-Session(app)
-oidc = OpenIDConnect(app)
-
-@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(
-            title="Jahreswerte Exportierte Energie",
-            xaxis_title="Monat",
-            yaxis_title="",
-            legend_title="Jahr",
-            xaxis=dict(
-                tickmode="array",
-                tickvals=list(range(1, 13)),  # Monate 1–12
-                ticktext=["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"]
-            ),
-            yaxis=dict(ticksuffix=" kWh")
-        )
-        graph_html = fig.to_html(full_html=False)
-
-        return render_template_string(f"""
-            <html>
-                <head>
-                    <title>Jahreswerte PV-Energie</title>
-                </head>
-                <body>
-                    {graph_html}
-                </body>
-            </html>
-        """)
-    except Exception as e:
-        raise Exception(f"Error when querying energy export values: {e}")
-    finally:
-        if dbh is not None:
-            dbh.close()
 
+from app import app
 
+import routes
+import debug_routes
+import pv_routes
+import ntp_routes
 
 
 if __name__ == '__main__':