manage erreur lors du call contract

meilleure gestion des reprises sur erreur
saniho · Jun 2, 2021 · d4db63f · d4db63f
1 parent dd3b54b
commit d4db63f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/custom_components/apiEnedis/const.py b/custom_components/apiEnedis/const.py
@@ -1,6 +1,6 @@
 """ Constants """
 
-__VERSION__ = "1.2.0.3" # attention updater aussi manifest.json
+__VERSION__ = "1.2.0.4rc1" # attention updater aussi manifest.json
 __name__ = "myEnedis"
 
 try:

diff --git a/custom_components/apiEnedis/manifest.json b/custom_components/apiEnedis/manifest.json
@@ -3,7 +3,7 @@
     "name": "myEnedis sensor",
     "documentation": "https://github.com/saniho/apiEnedis/",
     "config_flow": true,
-    "version": "1.2.0.3",
+    "version": "1.2.0.4rc1",
     "requirements": [
     ],
     "dependencies": [],

diff --git a/custom_components/apiEnedis/myCheckData.py b/custom_components/apiEnedis/myCheckData.py
@@ -9,8 +9,9 @@ def analyseValueAndAdd(self, data):
             raise Exception('call', None)
         else:
             tot = 0
-            for x in data["meter_reading"]["interval_reading"]:
-                tot += int(x["value"])
+            if ( "meter_reading" in data.keys()): # meter reading present
+                for x in data["meter_reading"]["interval_reading"]:
+                    tot += int(x["value"])
             return tot
 
     def analyseValueAndMadeDico(self, data):
@@ -19,13 +20,14 @@ def analyseValueAndMadeDico(self, data):
             raise Exception('call', None)
         else:
             niemejour = 0
-            for x in reversed(data["meter_reading"]["interval_reading"]):
-                niemejour += 1
-                days = {}
-                days['date'] = x['date']
-                days['niemejour'] = niemejour
-                days['value'] = int(x['value'])
-                dicoLast7days.append(days)
+            if ( "meter_reading" in data.keys()): # meter reading present
+                for x in reversed(data["meter_reading"]["interval_reading"]):
+                    niemejour += 1
+                    days = {}
+                    days['date'] = x['date']
+                    days['niemejour'] = niemejour
+                    days['value'] = int(x['value'])
+                    dicoLast7days.append(days)
         return dicoLast7days
 
     def analyseValue(self, data):

diff --git a/custom_components/apiEnedis/myClientEnedis.py b/custom_components/apiEnedis/myClientEnedis.py
@@ -628,6 +628,8 @@ def update(self):
                             self.updateYesterdayProduction()
                         self.updateTimeLastCall()
                         self.updateStatusLastCall(True)
+                    log.error("myEnedis ...%s update termine, status courant : %s, lastCall :%s" \
+                          % (self.getContract().get_PDL_ID(), self.getStatusLastCall(), self.getLastMethodCallError()))
 
                 except Exception as inst:
                     if (inst.args == ("call", None)):

diff --git a/testEnedis.py b/testEnedis.py
@@ -44,7 +44,7 @@ def testMulti():
 
         # Lecture fichier Json de sortie
         dataJson = readDataJson()
-        #dataJson = {}
+        dataJson = {}
         myDataEnedis = myClientEnedis.myClientEnedis( token=token, PDL_ID=PDL_ID, delai=3600,
             heuresCreuses=heureCreusesCh, heuresCreusesCost=0.0797, heuresPleinesCost=0.1175,
             version = __version__, heuresCreusesON=heuresCreusesON )