Merge pull request #30 from ATNoG/hotfix/none_values_on_query

Fixed FluxTable to raw conversion

Author: alxmra

src/routers/v1/raw_router.py

@@ -22,20 +22,27 @@ def get_raw_data(
     limited to a maximum of 50 per request.
     """
     try:
+        import sys
         query_params = {
             "start_time": start_time,
             "end_time": end_time,
             "cell_index": cell_index,
             "batch_number": batch_number,
         }
+        print(f"API called with: start={start_time}, end={end_time}, cell={cell_index}"); sys.stdout.flush()
 
         results,has_next = Influx.service.query_raw_data(**query_params)
+        print(f"Router got {len(results)} results"); sys.stdout.flush()
+
+        with_data = [r for r in results if r.get('mean_latency')]
+        print(f"Rows with data: {len(with_data)}"); sys.stdout.flush()
 
         for row in results:
             for k, v in row.items():
                 if isinstance(v, datetime):
                     row[k] = v.isoformat()
 
+        print(f"Returning {len(results)} results"); sys.stdout.flush()
         return {"data": results, "has_next": has_next}
 
     except Exception as e:

src/services/influx.py

@@ -1,8 +1,13 @@
+from posix import times
+from influxdb_client.client.flux_table import FluxRecord, FluxTable
 from influxdb_client.client.influxdb_client import InfluxDBClient
 from influxdb_client.client.write_api import ASYNCHRONOUS
 from src.configs.influx_conf import InfluxConf
 from src.models.raw import Raw, RAW_MEASUREMENT
 from src.services.influx_query import QueryIF
+import logging
+
+logger = logging.getLogger(__name__)
 
 class InfluxService:
     def __init__(self) -> None:
@@ -32,15 +37,28 @@ def query_raw_data(self, start_time: int, end_time: int, cell_index: int, batch_
             limit=_LIMIT+1,
             offset=offset
         )
-
-        result = self.query_api.query(query)
-
+        print(query)
+        result:list[FluxTable] = self.query_api.query(query)
+        print(result)
         # Convert FluxTable to list of dicts
-        rows = []
+        rows = {}
+        table:FluxTable
+        record:FluxRecord
         for table in result:
             for record in table.records:
-                rows.append(record.values)
-
+                timestamp = record.get_time()
+                if timestamp not in rows:
+                    rows[timestamp] = {k: v for k, v in record.values.items() if not k.startswith('_')}
+                    rows[timestamp]["timestamp"] = timestamp
+                    for col in record.values.keys():
+                        if col.startswith('_'):
+                            rows[timestamp][col] = None
+
+                field = record.get_field()
+                value = record.get_value()
+                rows[timestamp][field] = value
+
+        rows = list(rows.values())
         return rows, len(rows)>_LIMIT