Merge pull request 'work' (#7) from work into main

Reviewed-on: #7

.gitea/workflows/check-build.yml

@@ -26,4 +26,4 @@ jobs:
         run: |
           echo "${{ secrets.GITEASECRET_TOKEN }}" | docker login git.hamik.net -u paradizelost --password-stdin
           docker build -t git.hamik.net/paradizelost/enphase:dev .
-          docker push git.hamik.net/paradizelost/enphse:dev
+          docker push git.hamik.net/paradizelost/enphase:dev

.gitea/workflows/push-build.yml

@@ -7,7 +7,6 @@ on:
 jobs:
   Plan:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
         with:
@@ -20,14 +19,14 @@ jobs:
       - name: Deploy
         run: |
           echo "${{ secrets.GITEASECRET_TOKEN }}" | docker login git.hamik.net -u paradizelost --password-stdin
-          docker build -t git.hamik.net/paradizelost/librarynotices:latest .
+          docker build -t git.hamik.net/paradizelost/enphase:latest .
-          docker push git.hamik.net/paradizelost/librarynotices
+          docker push git.hamik.net/paradizelost/enphase:latest
   Deploy:
-    needs: [Plan] # 
+    needs: [Plan]
-    runs-on: librarynoticehost
+    runs-on: enphasecollector
     defaults:
       run:
-        working-directory: /docker/librarynotices
+        working-directory: /docker/enphase
     steps:
       - name: Destroy Container
         id: down

Dockerfile

@@ -1,11 +1,8 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 #
-RUN apt update && apt install python3 python3-pip -y
-COPY enphase.py /usr/local/bin/
 COPY requirements.txt /
 COPY init.sh /
-RUN chmod +x /init.sh
+RUN apt update && apt install python3 python3-pip -y && pip3 install -r /requirements.txt --break-system-packages && apt clean
-RUN chmod +x /usr/local/bin/enphase.py
+COPY enphase.py /usr/local/bin/
-RUN pip3 install -r /requirements.txt
+RUN chmod +x /init.sh && chmod +x /usr/local/bin/enphase.py
-RUN apt clean
 CMD ["/init.sh"]

docker-compose.yml

@@ -1,9 +1,11 @@
 services:
-  libnotices:
+  enphase:
     image: git.hamik.net/paradizelost/enphase:latest
-    container_name: libnotices
+    container_name: enphase
     restart: always
-    ports: 
+    environment:
-      - "80:80"
+      - ENPHASE_TOKEN=${ENPHASE_TOKEN}
-    volumes:
+      - ENPHASE_URL=${ENPHASE_URL}
-      - "./credentials:/var/www/.aws/credentials"
+      - INFLUX_USER=${INFLUX_USER}
+      - INFLUX_PASSWORD=${INFLUX_PASSWORD}
+      - INFLUX_URI=${INFLUX_URI}

enphase.py

@@ -162,7 +162,6 @@ enphaseurl = os.environ["ENPHASE_URL"]
 infdbuser = os.environ["INFLUX_USER"]
 infdbpass = os.environ["INFLUX_PASSWORD"]
 influxuri = os.environ["INFLUX_URI"]
-infdbuser = os.environ["INFLUX_USER"]
 
 
 while True:
@@ -172,18 +171,42 @@ while True:
     session.headers.update({"Authorization":"Bearer "+enphasetoken})
     details = enphaseurl + "/production.json?details=1"
     inverteruri= enphaseurl + "/api/v1/production/inverters"
-    mainresponse = session.get(details,verify=False).json()
+    mainresponse = session.get(details,verify=False)
-    inverterresponse = session.get(inverteruri,verify=False).json()
+    if mainresponse.status_code == 401:
-    #print(json.dumps(mainresponse,indent=1))
+        print("Authentication Error, please renew enphase token at https://entrez.enphaseenergy.com/entrez_tokens")
-    for inverterdata in inverterresponse:
+        quit()
+    print("Status code:", mainresponse.status_code)
+    print("Headers:", mainresponse.headers)
+    print("Raw text:", mainresponse.text[:500])
+    try:
+        mainresponseresult = mainresponse.json()
+        print("Parsed JSON:\n", json.dumps(mainresponseresult, indent=2))
+    except Exception as e:
+        print("Failed to parse JSON:", e)
+        quit()
+
+    inverterresponse = session.get(inverteruri,verify=False)
+    if inverterresponse.status_code == 401:
+        print("Authentication Error, please renew enphase token at https://entrez.enphaseenergy.com/entrez_tokens")
+        quit()
+    print("Status code:", inverterresponse.status_code)
+    print("Headers:", inverterresponse.headers)
+    print("Raw text:", inverterresponse.text[:500])
+    try:
+        inverterresponseresult = inverterresponse.json()
+        print("Parsed JSON:\n", json.dumps(inverterresponseresult, indent=2))
+    except Exception as e:
+        print("Failed to parse JSON:", e)
+        quit()
+    for inverterdata in inverterresponseresult:
         myinverter = inverter(inverterdata['serialNumber'],inverterdata['lastReportDate'],inverterdata['devType'],inverterdata['lastReportWatts'],inverterdata['maxReportWatts'])
         inverterlist.append(myinverter)
     #print(json.dumps(response.json(),indent=1))
     #for myinverter in inverterlist:
         #pass
     #    myinverter.print()
-    print(json.dumps(mainresponse,indent=1))
+    #print(json.dumps(mainresponse,indent=1))
-    maindata = ElectricalData(mainresponse)
+    maindata = ElectricalData(mainresponseresult)
     influxsession = requests.Session()
     influxsession.verify = False
     influxsession.auth = (infdbuser, infdbpass)