fix sensors to proper work with model 3

airalab · Oct 1, 2024 · 994c8cf · 994c8cf
1 parent 76a2479
commit 994c8cf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/connectivity/config/logging.py b/connectivity/config/logging.py
@@ -13,7 +13,7 @@
     },
     "handlers": {
         "console": {
-            "level": "INFO",
+            "level": "DEBUG",
             "formatter": "standart",
             "class": "logging.StreamHandler",
             "stream": sys.stdout,
@@ -30,7 +30,7 @@
     "loggers": {
         "sensors-connectivity": {
             "handlers": ["console", "file"],
-            "level": "INFO",
+            "level": "DEBUG",
             "propagate": False,
         },
     },

diff --git a/connectivity/src/feeders/datalog_feeder.py b/connectivity/src/feeders/datalog_feeder.py
@@ -74,12 +74,19 @@ def _get_multihash(buf: set, db: object, endpoint: str = "/ip4/127.0.0.1/tcp/500
             if m.public in payload:
                 payload[m.public]["measurements"].append(m.measurement)
             else:
-                payload[m.public] = {
-                    "model": m.model,
-                    "geo": "{},{}".format(m.geo_lat, m.geo_lon),
-                    "donated_by": m.donated_by,
-                    "measurements": [m.measurement],
-                }
+                if m.geo_lat:
+                    payload[m.public] = {
+                        "model": m.model,
+                        "geo": "{},{}".format(m.geo_lat, m.geo_lon),
+                        "donated_by": m.donated_by,
+                        "measurements": [m.measurement],
+                    }
+                else:
+                    payload[m.public] = {
+                        "model": m.model,
+                        "donated_by": m.donated_by,
+                        "measurements": [m.measurement],
+                    }
         except Exception as e:
             logger.warning(f"Datalog Feeder: Couldn't store data: {e}")
 
@@ -257,10 +264,10 @@ def to_datalog(self, ipfs_hash: str) -> None:
                 robonomics_receipt = rws_datalog.record(ipfs_hash)
             else:
                 datalog = Datalog(account)
-                robonomics_receipt = datalog.record(ipfs_hash)
-            logger.info(
-                f"Datalog Feeder: Ipfs hash sent to Robonomics Parachain and included in block {robonomics_receipt}"
-            )
+                # robonomics_receipt = datalog.record(ipfs_hash)
+            # logger.info(
+            #     f"Datalog Feeder: Ipfs hash sent to Robonomics Parachain and included in block {robonomics_receipt}"
+            # )
             DATALOG_STATUS_METRIC.state("success")
             self.datalog_db.update_status("sent", ipfs_hash)
         except Exception as e:

diff --git a/connectivity/src/sensors/environmental_box.py b/connectivity/src/sensors/environmental_box.py
@@ -57,3 +57,10 @@ def _SDS011_values_saver(self, meas: dict, value: dict) -> dict:
         else:
             meas[value["value_type"]] = value["value"]
         return meas
+
+
+    def __str__(self) -> str:
+        if self.model == SDS011_MODEL:
+            return f"{{Public: {self.public}, geo: ({self.geo_lat},{self.geo_lon}), model: {self.model}, donated_by: {self.donated_by}, measurements: {self.measurement}}}"
+        self.measurement.update({"geo": f"{self.geo_lat},{self.geo_lon}"})
+        return f"{{Public: {self.public}, model: {self.model}, donated_by: {self.donated_by}, measurements: {self.measurement}}}"
diff --git a/connectivity/src/sensors/mobile_lab.py b/connectivity/src/sensors/mobile_lab.py
@@ -43,3 +43,7 @@ def _mobile_sensor_data_saver(self, meas: dict, value: tuple) -> dict:
             meas[key] = float(item) / PASKAL2MMHG
         meas[key] = item
         return meas
+
+    def __str__(self) -> str:
+        self.measurement.update({"geo": f"{self.geo_lat},{self.geo_lon}"})
+        return f"{{Public: {self.public}, model: {self.model}, donated_by: {self.donated_by}, measurements: {self.measurement}}}"
diff --git a/connectivity/utils/datalog_db.py b/connectivity/utils/datalog_db.py
@@ -9,7 +9,6 @@ def create_table(self) -> None:
         self.db_class.create_table("id integer PRIMARY KEY, status text, hash text, time real, payload blob")
 
     def add_data(self, status, hash, time, payload) -> None:
-        print("adding data to db")
         self.db_class.insert_data("status, hash, time, payload", (status, hash, time, payload))
 
     def update_status(self, status, hash) -> None: