[heatpump] fix conversion adresses

pyheatpump/cli.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python3
 # builtins
 import click
-import uvicorn
+from datetime import datetime
+import importlib
+import json
 import os
-import sys
 import re
-import importlib
-from pprint import pprint
+import sys
+import time
 import urllib
+import uvicorn
+from pprint import pprint
 import requests
-import json
-from datetime import datetime
 
 from pyheatpump.logger import logger_init
 from pyheatpump.models import *
@@ -205,23 +206,20 @@ def supervise(since):
 
     logger.info(build_url(post_url))
 
-    for packet in post_packets:
-        try:
-            logger.debug(json.dumps(shift_response(packet)))
-        except Exception as e:
-            print(e)
-            sys.exit(1)
-
-
     for packet in post_packets:
         logger.debug('Will send %s', shift_response(packet))
         post_resp = requests.post(
             url=build_url(post_url),
             json=shift_response(packet),
-            verify=False
+            verify=False,
+            timeout=20
         )
+        time.sleep(5)
         if post_resp.status_code == 200:
             logger.info('POST to supervisor succeeded')
+            continue
+
+        logger.info('POST to supervisor failed')
 
     set_last_update(int(datetime.now().strftime('%s')))
 

pyheatpump/lib.py

@@ -10,7 +10,7 @@ def shift_response(d):
         d_res = {
             str(k - offset): d_[k]
             for k in d_k
-            if (k in d_ and isinstance(d_[k], int))
+            if (k in d_ and (isinstance(d_[k], int) or isinstance(d_[k], float)))
         }
 
         return d_res

pyheatpump/models/heatpump.py

@@ -31,7 +31,8 @@ class Heatpump:
 
     def __dict__(self):
         r = {'macAddress': self.macformat}
-        if self.last_update is None:
+        if not self.last_update:
+            # Since beginning
             return { **r, **self.get_var_values() }
         return { **r, **self.get_var_values_since() }
 
@@ -52,8 +53,8 @@ class Heatpump:
         return r
 
     def control(self, data):
-        logger.warn('Received orders data :')
-        logger.warn(data)
+        logger.warning('Received orders data :')
+        logger.warning(data)
         if 'macAddress' not in data.keys():
             logger.info(f'No orders')
             return True

pyheatpump/models/variable.py

@@ -6,6 +6,9 @@ from pyheatpump.modbus import rtu
 from .variable_type import VariableType
 from .variable_value import VariableValue
 
+from pyheatpump.logger import logger_init
+logger = logger_init()
+
 class Variable(RowClass):
     address: int = None
     unit: str = None

tests/cli/test_supervise.py

@@ -33,8 +33,8 @@ def fetch(set_test_db, runner):
     except ValueError:
         pass
 
-@patch('pyheatpump.cli.requests')
-def test_supervise(requestsMock, fetch, runner):
+@pytest.fixture
+def default_config():
     config['supervisor']['scheme'] = 'http'
     config['supervisor']['host'] = '127.0.0.1'
     config['supervisor']['port'] = '8080'
@@ -42,7 +42,38 @@ def test_supervise(requestsMock, fetch, runner):
     config['supervisor']['get_path'] = '/get'
     config['heatpump']['mac_address'] = '00:11:22:33:44:55'
 
+@pytest.mark.skip
+@patch('pyheatpump.cli.requests')
+def test_supervise(requestsMock, fetch, runner, default_config):
+    data = {'macAddress':'001122334455'}
+    data_analog = { **data, **{'Analog':{} } }
+    data_integer = { **data, **{'Integer':{} } }
+    data_digital = { **data, **{'Digital':{} } }
+
+    try:
+        r = runner.invoke(cli, 'supervise')
+    except ValueError:
+        pass
+
+    requestsMock.post.assert_called()
+    requestsMock.post.assert_called_with(
+        url='http://127.0.0.1:8080/post',
+        json=data_integer,
+        verify=False
+    )
+
+    requestsMock.get.assert_called()
+    requestsMock.get.assert_called_with(
+        url=''.join('http://127.0.0.1:8080/get/001122334455'),
+        verify=False)
+
+
+@patch('pyheatpump.cli.requests')
+def test_supervise_values(requestsMock, fetch, runner, default_config, set_db_values):
     data = {'macAddress':'001122334455'}
+    data_analog = { **data, **{'Analog':{} } }
+    data_integer = { **data, **{'Integer':{} } }
+    data_digital = { **data, **{'Digital':{} } }
 
     try:
         r = runner.invoke(cli, 'supervise')
@@ -52,9 +83,11 @@ def test_supervise(requestsMock, fetch, runner):
     requestsMock.post.assert_called()
     requestsMock.post.assert_called_with(
         url='http://127.0.0.1:8080/post',
-        json=data
+        json=data_integer,
+        verify=False
     )
 
     requestsMock.get.assert_called()
     requestsMock.get.assert_called_with(
-        url=''.join('http://127.0.0.1:8080/get/001122334455'))
+        url=''.join('http://127.0.0.1:8080/get/001122334455'),
+        verify=False)

tests/test_lib.py

@@ -6,15 +6,15 @@ from pyheatpump.lib import shift_response
 def test_shift_response():
     heatpump_dict = {}
     heatpump_dict['Analog'] = {
-        key: 0
+        key: (0 if key % 2 == 0 else 1)
         for key in range(1, 1251)
     }
     heatpump_dict['Integer'] = {
-        key: 0
+        key: (0 if key % 2 == 0 else 1)
         for key in range(5002, 6252 )
     }
     heatpump_dict['Digital'] = {
-        key: 0
+            key: (0 if key % 2 == 0 else 1 )
         for key in range(1, 1001)
     }
 
@@ -25,10 +25,19 @@ def test_shift_response():
 
     assert 'Analog' in shifted.keys()
     assert isinstance(shifted['Analog'], dict)
+    analog_keys = list(map(int, shifted['Analog'].keys()))
+    assert min(analog_keys) == 1
+    assert shifted['Analog']["1"] == 1
+    assert shifted['Analog']["2"] == 0
 
     assert 'Digital' in shifted.keys()
     assert isinstance(shifted['Digital'], dict)
 
+    digital_keys = list(map(int, shifted['Digital'].keys()))
+    assert min(digital_keys) == 1
+    assert shifted['Digital']["1"] == 1
+    assert shifted['Digital']["2"] == 0
+
     assert 'Integer' in shifted.keys()
     assert isinstance(shifted['Integer'], dict)
     for k in shifted['Integer'].keys():
@@ -37,3 +46,5 @@ def test_shift_response():
     int_keys = list(map(int, shifted['Integer'].keys()))
     assert min(int_keys) == 1
     assert max(int_keys) == 1250
+    assert shifted['Integer']["1"] == 0
+    assert shifted['Integer']["2"] == 1