fix

.gitignore

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

README.md

@@ -1,6 +1,10 @@
 # EnedisGateway2MQTT
 
-## Links
+## IMPORTANT !
+**The tool is still under development.
+It is possible that various functions disappear or be modified**
+
+# Links
 
 Github Repository : https://github.com/m4dm4rtig4n/enedisgateway2mqtt
 

app/contract.py

@@ -30,6 +30,7 @@ def getContract(client):
                 f.publish(client, f"{pdl}/details/usage_points/contracts/{contracts_key}", str(contracts_data))
                 if contracts_key == "last_activation_date":
                     f.publish(client, f"{pdl}/activation_date", str(contracts_data))
+                    last_activation_date = contracts_data
                 if contracts_key == "subscribed_power":
                     f.publish(client, f"{pdl}/subscribed_power", str(contracts_data.split()[0]))
                     ha_discovery[pdl].update({
@@ -52,7 +53,7 @@ def getContract(client):
                     })
         retour = {
             "ha_discovery": ha_discovery,
-            "last_activation_date": contracts_data
+            "last_activation_date": last_activation_date
         }
     else:
         retour = {

app/daily_consumption.py

@@ -85,8 +85,8 @@ def dailyConsumption(cur, client, last_activation_date):
             current_year = current_year + 1
     return ha_discovery
 
-
 def checkHistoryConsumptionDaily(cur, dateBegin, dateEnded):
+    pdl = main.pdl
     dateBegin = datetime.strptime(dateBegin, '%Y-%m-%d')
     dateEnded = datetime.strptime(dateEnded, '%Y-%m-%d')
     delta = dateEnded - dateBegin
@@ -98,7 +98,7 @@ def checkHistoryConsumptionDaily(cur, dateBegin, dateEnded):
     for i in range(delta.days + 1):
         checkDate = dateBegin + timedelta(days=i)
         checkDate = checkDate.strftime('%Y-%m-%d')
-        query = f"SELECT * FROM consumption_daily WHERE pdl = '{main.pdl}' AND date = '{checkDate}'"
+        query = f"SELECT * FROM consumption_daily WHERE pdl = '{pdl}' AND date = '{checkDate}'"
         cur.execute(query)
         if cur.fetchone() is None:
             main.api_no_result.append(checkDate)
@@ -127,25 +127,38 @@ def dailyConsumptionBeetwen(cur, pdl, dateBegin, dateEnded, last_activation_date
     }
 
     try:
+        new_date = []
         current_data = checkHistoryConsumptionDaily(cur, dateBegin, dateEnded)
         if current_data['status'] == True:
             f.log(f"All data loading beetween {dateBegin} / {dateEnded}")
             f.log(f" => Skip API Call")
         else:
-            f.log(f"{current_data['count']} lost date beetween {dateBegin} / {dateEnded} :")
-            for lost_data in current_data['date']:
-                f.log(f" - {lost_data}")
+            f.log(f"Data is missing between {dateBegin} / {dateEnded}")
 
             daily_consumption = requests.request("POST", url=f"{main.url}", headers=main.headers, data=json.dumps(data)).json()
             meter_reading = daily_consumption['meter_reading']
             mesures = {}
+            f.log("Import data :")
+            log_import = []
             for interval_reading in meter_reading["interval_reading"]:
                 date = interval_reading['date']
                 value = interval_reading['value']
                 cur.execute(f"INSERT OR REPLACE INTO consumption_daily VALUES ('{pdl}','{interval_reading['date']}','{interval_reading['value']}')")
+                new_date.append(interval_reading['date'])
                 mesures[date] = value
             list_date = list(reversed(sorted(mesures.keys())))
 
+            f.splitLog(new_date)
+
+            not_found_data = []
+            for current_date in current_data['date']:
+                if not current_date in new_date:
+                    not_found_data.append(current_date)
+
+            if not_found_data != []:
+                f.log("Data not found :")
+                f.splitLog(not_found_data)
+
             dateEnded = datetime.strptime(dateEnded, '%Y-%m-%d')
 
             dateWeek = dateEnded + relativedelta(days=-7)

app/daily_production.py

@@ -86,6 +86,7 @@ def dailyProduction(cur, client, last_activation_date):
     return ha_discovery
 
 def checkHistoryProductionDaily(cur, dateBegin, dateEnded):
+    pdl = main.pdl
     dateBegin = datetime.strptime(dateBegin, '%Y-%m-%d')
     dateEnded = datetime.strptime(dateEnded, '%Y-%m-%d')
     delta = dateEnded - dateBegin
@@ -126,25 +127,38 @@ def dailyProductionBeetwen(cur, pdl, dateBegin, dateEnded, last_activation_date)
     }
 
     try:
+        new_date = []
         current_data = checkHistoryProductionDaily(cur, dateBegin, dateEnded)
         if current_data['status'] == True:
             f.log(f"All data loading beetween {dateBegin} / {dateEnded}")
             f.log(f" => Skip API Call")
         else:
-            f.log(f"{current_data['count']} lost date beetween {dateBegin} / {dateEnded} :")
-            for lost_data in current_data['date']:
-                f.log(f" - {lost_data}")
+            f.log(f"Data is missing between {dateBegin} / {dateEnded}")
 
             daily_production = requests.request("POST", url=f"{main.url}", headers=main.headers, data=json.dumps(data)).json()
             meter_reading = daily_production['meter_reading']
             mesures = {}
+            f.log("Import data :")
+            log_import = []
             for interval_reading in meter_reading["interval_reading"]:
                 date = interval_reading['date']
                 value = interval_reading['value']
                 cur.execute(f"INSERT OR REPLACE INTO production_daily VALUES ('{pdl}','{interval_reading['date']}','{interval_reading['value']}')")
+                new_date.append(interval_reading['date'])
                 mesures[date] = value
             list_date = list(reversed(sorted(mesures.keys())))
 
+            f.splitLog(new_date)
+
+            not_found_data = []
+            for current_date in current_data['date']:
+                if not current_date in new_date:
+                    not_found_data.append(current_date)
+
+            if not_found_data != []:
+                f.log("Data not found :")
+                f.splitLog(not_found_data)
+
             dateEnded = datetime.strptime(dateEnded, '%Y-%m-%d')
 
             dateWeek = dateEnded + relativedelta(days=-7)

app/function.py

@@ -20,16 +20,37 @@ def on_connect(client, userdata, flags, rc):
     client.connect(main.broker, main.port)
     return client
 
-def publish(client, topic, msg, current_prefix="enedis_gateway"):
+def publish(client, topic, msg):
+    prefix = main.prefix
     msg_count = 0
-    result = client.publish(f'{current_prefix}/{topic}', str(msg), qos=main.qos, retain=int(main.retain))
+    result = client.publish(f'{prefix}/{topic}', str(msg), qos=main.qos, retain=int(main.retain))
     status = result[0]
     if status == 0:
-        log(f" MQTT Send : {current_prefix}/{topic} => {msg}")
+        log(f" MQTT Send : {prefix}/{topic} => {msg}")
     else:
-        log(f" - Failed to send message to topic {current_prefix}/{topic}")
+        log(f" - Failed to send message to topic {prefix}/{topic}")
     msg_count += 1
 
 def log(msg):
     now = datetime.now()
     print(f"{now} : {msg}")
+
+def splitLog(msg):
+    format_log = ""
+    i = 1
+    nb_col = 12
+    msg_length = len(msg)
+    cur_length = 1
+    for log_msg in msg:
+        format_log += f" | {log_msg}"
+        if i == nb_col:
+            i = 1
+            format_log += f" |"
+            log(format_log)
+            format_log = ""
+        elif cur_length == msg_length:
+            format_log += f" |"
+            log(format_log)
+        else:
+            i = i + 1
+        cur_length = cur_length + 1