maj adr

.gitignore

@@ -1,3 +1,4 @@
 .idea
 /data
-/app/__pycache__/
+/app/__pycache__/
+/tmp

README.md

@@ -167,7 +167,8 @@ volumes:
 - Add **DJU18**
 - Add HC/HP
 - Create Home Assistant OS Addons
-- Add Postgres/MariaDB connector
+- Add Postgres/MariaDB connector*
+- Add option export W or kWh 
 
 ## Change log:
 

app/daily.py

@@ -33,12 +33,15 @@ def getDaily(cur, client, mode="consumption", last_activation_date=datetime.now(
         for key, value in data.items():
             f.publish(client, f"{pdl}/{mode}/current_year/errorMsg/{key}", str(value))
     else:
+        f.publish(client, f"{pdl}/{mode}/current_year/error", str(0))
         for key, value in data.items():
+
             if key != "dateBegin" and key != "dateEnded":
                 current_value = int(value["value"])
                 current_date = value["date"]
                 current_date = datetime.strptime(current_date, '%Y-%m-%d')
                 day = current_date.strftime('%A')
+                f.publish(client, f"{pdl}/{mode}/current_year/{key}", str(current_value))
                 ha_discovery[pdl].update({
                     f"{mode}_{key.replace('-', '_')}": {
                         "value": str(current_value),
@@ -100,6 +103,7 @@ def getDaily(cur, client, mode="consumption", last_activation_date=datetime.now(
                             current_date = value["date"]
                             current_date = datetime.strptime(current_date, '%Y-%m-%d')
                             day = current_date.strftime('%A')
+                            f.publish(client, f"{pdl}/{mode}/year-{current_year}/{key}", str(current_value))
                             if f"{mode}_{key.replace('-', '_')}" in ha_discovery[pdl]:
                                 # CALC VARIATION
                                 if key in lastData:
@@ -283,37 +287,37 @@ def dailyBeetwen(cur, pdl, mode, dateBegin, dateEnded, last_activation_date):
 
                 # WEEK DAYS
                 if current_date == j1:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }
                 if current_date == j2:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }
                 if current_date == j3:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }
                 if current_date == j4:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }
                 if current_date == j5:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }
                 if current_date == j6:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }
                 if current_date == j7:
-                    response[day] = {
+                    response[f"week/{day}"] = {
                         "value": value,
                         "date": date
                     }

app/function.py

@@ -11,7 +11,8 @@ def on_connect(client, userdata, flags, rc):
         if rc == 0:
             log("Connected to MQTT Broker!")
         else:
-            log("Failed to connect, return code %d\n", rc)
+            log(f"Failed to connect, return code {rc}\n")
+            quit()
 
     # Set Connecting Client ID
     client = mqtt_client.Client(main.client_id)

app/main.py

@@ -149,8 +149,11 @@
 api_no_result = []
 
 def run():
-    client = f.connect_mqtt()
-    client.loop_start()
+    try:
+        client = f.connect_mqtt()
+        client.loop_start()
+    except:
+        f.log("MQTT : Connection failed")
 
     # client = f.connect_mqtt()
     # f.subscribe(client,topic)

docker-compose.yml

@@ -24,4 +24,4 @@ services:
       YEARS: 1
       BASE_PRICE: 0.1445
 volumes:
-  mydata:
+  mydata: