casting

.gitlab-ci.yml

@@ -28,7 +28,7 @@ dockerize:
     - tags
   variables:
     GIT_STRATEGY: none
-    CONTAINER_NAME: level-preprocessor
+    CONTAINER_NAME: cem-preprocessor
   script:
     - docker stop $CONTAINER_NAME || echo "container not running, never mind"
     - docker rm $CONTAINER_NAME || echo "container not existing, never mind"

src/preprocess.py

@@ -63,7 +63,7 @@ class DbOp(object):
                         'unit': res[2]
                     }
                 logger.debug(f"{variable=}")
-            return application
+            return variable
         except Exception as e:
             logger.error(f"Error getting variable: {e}")
             raise VariableNotFoundException(appId, converterId, deviceId, variableId)
@@ -79,7 +79,7 @@ class DbOp(object):
                 with conn.cursor() as cur:
                     cur.execute("""
                         insert into measurement_t (time, application, variable, value, unit) 
-                            values (now(), %(application)s, %(variable)s, %(value)s, %(unit)s
+                            values (now(), %(application)s, %(variable)s, %(value)s, %(unit)s)
                         """,
                         { 
                             'application': measurement['application'], 
@@ -100,14 +100,14 @@ def splitTopic(topic):
     except ValueError:
         raise InvalidTopicException(topic)
     r = rest.split('/')
-    if (len(r) == 1:
+    if (len(r) == 1):
         deviceId = 'mains',
         variableId = r[0]
-    elif (len(r) == 2:
-        (deviceId, variableid) = r
+    elif (len(r) == 2):
+        (deviceId, variableId) = r
     else:
         raise InvalidTopicException(topic)
-    return (appId, converterId, deviceId, variableid)
+    return (appId, converterId, deviceId, variableId)
     
 def mqttOnConnectCallback(client, userdata, flags, rc):
     logger.info("mqtt connected")
@@ -124,12 +124,12 @@ def mqttOnMessageCallback(client, userdata, message):
         (appId, converterId, deviceId, variableId) = splitTopic(topic)
 
         dbh = DbOp(config)
-        variable = dbh.getVariable(appId, converterId, deviceId, variableid)
+        variable = dbh.getVariable(appId, converterId, deviceId, variableId)
         measurement = {
             "application": variable["application"],
             "variable": variable["variable"],
             "unit": variable["unit"],
-            "value": payload
+            "value": float(payload)
         }
         
         logger.debug(f"{measurement=}")