[models] added a get static function for variable_type, set "type" attribute of variable_value to VariableType in __init__

pyheatpump/models/variable_type.py

@@ -63,3 +63,19 @@ class VariableType(RowClass):
         return dict([
             (row['label'], VariableType(**dict(row)))
             for row in sql('SELECT * FROM var_type') ])
+
+    @staticmethod
+    def get(slabel: str):
+        if len(slabel) > 1:
+            slabel = slabel[0]
+
+        try:
+            return VariableType(**dict(
+                next(sql(
+                """
+                SELECT * FROM var_type
+                WHERE slabel = '{}'
+                """.format(slabel)))))
+        except StopIteration:
+            raise NameError
+

pyheatpump/models/variable_value.py

@@ -3,13 +3,18 @@ from pyheatpump.db import sql
 from datetime import datetime
 from pprint import pprint
 
+from .variable_type import VariableType
+
 class VariableValue(RowClass):
-    type: str = None
+    type: VariableType = None
     address: int = None
     time: datetime = None
     value: int = None
 
     def __init__(self, **kwargs):
+        if 'type' in kwargs.keys() and type(kwargs['type']) != VariableType:
+            kwargs['type'] = VariableType.get(kwargs['type'])
+
         super().__init__(**kwargs)
 
     def insert(self):
@@ -28,6 +33,10 @@ class VariableValue(RowClass):
             print(e)
             return False
 
+
+    def get_value(self):
+        return self.type.cast()(self.value)
+
     @staticmethod
     def get(type, address, time=datetime.now()):
         try:

tests/models/test_variable_value.py

@@ -38,14 +38,19 @@ def set_test_db():
     os.unlink(tmpdb)
 
 
-def test_last_update(set_test_db):
-    for _, var_type in VariableType.getall().items():
+@pytest.fixture
+def var_types():
+    return VariableType.getall()
+
+
+def test_last_update(set_test_db, var_types):
+    for _, var_type in var_types.items():
         for _, variable in var_type.get_variables().items():
             try:
                 if not variable.last_update:
                     continue
                 time = datetime.fromtimestamp(variable.last_update)
-                
+
                 val = VariableValue.get(variable.type,
                     variable.address,
                     time)
@@ -53,3 +58,50 @@ def test_last_update(set_test_db):
                 assert variable.last_update == val.time
             except StopIteration:
                 assert False
+
+
+def test_var_value_getval(set_test_db, var_types):
+    var_type = var_types['Analog']
+    for _, variable in var_type.get_variables().items():
+        try:
+            if not variable.last_update:
+                continue
+            time = datetime.fromtimestamp(variable.last_update)
+
+            value = VariableValue.get(variable.type,
+                variable.address,
+                time).get_value()
+            assert type(value) == float
+        except StopIteration:
+            assert False
+
+
+    var_type = var_types['Integer']
+    for _, variable in var_type.get_variables().items():
+        try:
+            if not variable.last_update:
+                continue
+            time = datetime.fromtimestamp(variable.last_update)
+
+            value = VariableValue.get(variable.type,
+                variable.address,
+                time).get_value()
+            assert type(value) == int
+        except StopIteration:
+            assert False
+
+
+    var_type = var_types['Digital']
+    for _, variable in var_type.get_variables().items():
+        try:
+            if not variable.last_update:
+                continue
+            time = datetime.fromtimestamp(variable.last_update)
+
+            value = VariableValue.get(variable.type,
+                variable.address,
+                time).get_value()
+            assert type(value) == bool
+        except StopIteration:
+            assert False
+