[lint] clean models/variable.py

pyheatpump/models/variable.py

@@ -1,10 +1,8 @@
 from pyheatpump.db import RowClass
 from pyheatpump.db import DB
 from datetime import date
-from pyheatpump.modbus import rtu
 
 from .variable_type import VariableType
-from .variable_value import VariableValue
 
 from pyheatpump.logger import logger_init
 logger = logger_init()
@@ -21,18 +19,22 @@ class Variable(RowClass):
 
         super().__init__(**kwargs)
 
+    @property
+    def type_slabel(self):
+        return self.type.slabel
 
     def insert(self):
 
         try:
-            self.type_slabel = self.type.slabel
-
             DB.sql(
             """INSERT INTO variable
             (type, address)
             VALUES
             (:type_slabel, :address)
-            """, self.__dict__)
+            """, {
+                'type_slabel': self.type_slabel,
+                'address': self.address
+            })
             return True
         except Exception as e:
             print(e)
@@ -52,36 +54,44 @@ class Variable(RowClass):
 
     @staticmethod
     def getall():
-        return dict([
-            (str(row), Variable.getall_of_type(row))
+        return {
+            str(row): Variable.getall_of_type(row)
             for _, row in VariableType.getall().items()
-        ])
+        }
 
 
     @staticmethod
-    def getall_of_type(type: VariableType) -> dict:
+    def getall_of_type(var_type: VariableType) -> dict:
         return {
             row['address']: Variable(**dict(row))
             for row in DB.sql(
             """SELECT * FROM variable
-            WHERE type = :slabel
+            WHERE var_type = :slabel
                 AND address >= :start_address
-                AND address <= :end_address""",
-            type.__dict__)
+                AND address <= :end_address""", {
+
+                'slabel': var_type.slabel,
+                'start_address': var_type.start_address,
+                'end_address': var_type.end_address
+            })
        }
 
 
     @staticmethod
-    def getall_values_of_type(type: VariableType) -> dict:
-        return Variable.getall_values_of_type_since(type, 0)
+    def getall_values_of_type(var_type: VariableType) -> dict:
+        return Variable.getall_values_of_type_since(var_type, 0)
 
 
     @staticmethod
-    def getall_values_of_type_since(type: VariableType, since: int) -> dict:
+    def getall_values_of_type_since(var_type: VariableType, since: int) -> dict:
         floatcast = lambda x: round(float(x) / 10, 2)
         cast_fct = floatcast if type.slabel == 'A' else lambda x: x
-        params = type.__dict__.copy()
-        params.update({'since': since})
+        params = {
+            'slabel': var_type.slabel,
+            'start_address': var_type.start_address,
+            'end_address': var_type.end_address,
+            'since': since
+        }
 
         return {
             row['address']: cast_fct(row['value'])