[heatpump] fix fonction de correction des adresses

pyheatpump/cli.py

@@ -14,6 +14,7 @@ from datetime import datetime
 
 from pyheatpump.logger import logger_init
 from pyheatpump.models import *
+from pyheatpump.lib import shift_response
 
 CONTEXT_SETTINGS={
     'default_map':{'run': {}}
@@ -166,32 +167,6 @@ def supervise(since):
 
     from .models.heatpump import Heatpump
 
-    def shift_response(d):
-        def shift_dict(d):
-            d_k = list(map(int, d.keys()))
-            if not len(d_k):
-                return d
-
-            d_k.sort()
-            offset = d_k[0]-1
-            return {
-                str(k - offset): d[str(k)]
-                for k in d_k
-                if str(k) in d
-            }
-
-        if 'Analog' in d.keys():
-            d.update({"Analog": shift_dict(d['Analog'])})
-
-        if 'Integer' in d.keys():
-            d.update({"Integer": shift_dict(d['Integer'])})
-
-        if 'Digital' in d.keys():
-            d.update({"Digital": shift_dict(d['Digital'])})
-
-        return d
-
-
     if not since:
         last_update = 0
     else:

pyheatpump/heatpump.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from starlette.routing import Router, Route
 from starlette.responses import JSONResponse
 from .config import config
+from .lib import shift_response
 
 from pyheatpump.models import *
 
@@ -14,7 +15,7 @@ def get_variable_values(request):
         time = datetime.fromisoformat(request.params['time'])
         h = Heatpump(config.get('heatpump', 'mac_address'), request.params['time'])
 
-    return JSONResponse(h.__dict__())
+    return JSONResponse(shift_response(h.__dict__()))
 
 
 ROUTES=[

pyheatpump/lib.py

@@ -0,0 +1,27 @@
+def shift_response(d):
+    def shift_dict(d_):
+        d_k = list(map(int, d_.keys()))
+        if not len(d_k):
+            return d_
+
+        d_k.sort()
+        offset = d_k[0]-1
+
+        d_res = {
+            str(k - offset): d_[k]
+            for k in d_k
+            if (k in d_ and isinstance(d_[k], int))
+        }
+
+        return d_res
+
+    if 'Analog' in d.keys():
+        d.update({"Analog": shift_dict(d['Analog'])})
+
+    if 'Integer' in d.keys():
+        d.update({"Integer": shift_dict(d['Integer'])})
+
+    if 'Digital' in d.keys():
+        d.update({"Digital": shift_dict(d['Digital'])})
+
+    return d