Fix TB timeseries fallback

backend/api/routes/sensors.py

@@ -100,19 +100,36 @@ async def soil_moisture_history(
         return []
 
 
+def _tb_timeseries(device: str, keys: list, hours: int):
+    """Fetch TB time-series with fallback: try AVG aggregation first, then NONE."""
+    from datetime import datetime, timezone, timedelta
+    from src.data.thingsboard_client import ThingsBoardClient
+    client = ThingsBoardClient()
+    end = datetime.now(tz=timezone.utc)
+    start = end - timedelta(hours=hours)
+
+    # Try aggregated first
+    df = client.get_timeseries(device, keys, start=start, end=end,
+        interval_ms=3_600_000, agg="AVG", limit=2000)
+    if not df.empty:
+        return df
+
+    # Fallback: raw data, resample locally
+    import pandas as pd
+    df = client.get_timeseries(device, keys, start=start, end=end,
+        interval_ms=0, agg="NONE", limit=10000)
+    if df.empty:
+        return df
+    return df.resample("1h").mean(numeric_only=True).dropna(how="all")
+
+
 @router.get("/air-leaf-delta")
 async def air_leaf_delta(
     hours: int = Query(168, ge=1, le=8760, description="Hours of history"),
 ):
     """Hourly air-leaf temperature delta from ThingsBoard (Air2 under panels)."""
     try:
-        from datetime import datetime, timezone, timedelta
-        from src.data.thingsboard_client import ThingsBoardClient
-        client = ThingsBoardClient()
-        end = datetime.now(tz=timezone.utc)
-        start = end - timedelta(hours=hours)
-        df = client.get_timeseries("Air2", ["airLeafDeltaT"], start=start, end=end,
-            interval_ms=3_600_000, agg="AVG", limit=2000)
+        df = _tb_timeseries("Air2", ["airLeafDeltaT"], hours)
         if df.empty:
             return []
         return [{"timestamp": ts.isoformat(), "value": round(float(row["airLeafDeltaT"]), 2)}
@@ -128,13 +145,7 @@ async def temp_humidity(
 ):
     """Hourly temperature + humidity from ThingsBoard (Air2 under panels)."""
     try:
-        from datetime import datetime, timezone, timedelta
-        from src.data.thingsboard_client import ThingsBoardClient
-        client = ThingsBoardClient()
-        end = datetime.now(tz=timezone.utc)
-        start = end - timedelta(hours=hours)
-        df = client.get_timeseries("Air2", ["airTemperature", "airHumidity"], start=start, end=end,
-            interval_ms=3_600_000, agg="AVG", limit=2000)
+        df = _tb_timeseries("Air2", ["airTemperature", "airHumidity"], hours)
         if df.empty:
             return []
         rows = []
@@ -157,15 +168,9 @@ async def ndvi_history(
 ):
     """Hourly NDVI from ThingsBoard — treatment (Air2) and reference (Air1)."""
     try:
-        from datetime import datetime, timezone, timedelta
-        from src.data.thingsboard_client import ThingsBoardClient
-        client = ThingsBoardClient()
-        end = datetime.now(tz=timezone.utc)
-        start = end - timedelta(hours=hours)
         rows = []
         for device, label in [("Air2", "treatment"), ("Air1", "ambient")]:
-            df = client.get_timeseries(device, ["NDVI"], start=start, end=end,
-                interval_ms=3_600_000, agg="AVG", limit=2000)
+            df = _tb_timeseries(device, ["NDVI"], hours)
             if not df.empty and "NDVI" in df.columns:
                 for ts, row in df.iterrows():
                     v = row.get("NDVI")
@@ -183,13 +188,7 @@ async def vpd_history(
 ):
     """Hourly VPD from ThingsBoard (Air2 under panels)."""
     try:
-        from datetime import datetime, timezone, timedelta
-        from src.data.thingsboard_client import ThingsBoardClient
-        client = ThingsBoardClient()
-        end = datetime.now(tz=timezone.utc)
-        start = end - timedelta(hours=hours)
-        df = client.get_timeseries("Air2", ["VPD"], start=start, end=end,
-            interval_ms=3_600_000, agg="AVG", limit=2000)
+        df = _tb_timeseries("Air2", ["VPD"], hours)
         if df.empty:
             return []
         return [{"timestamp": ts.isoformat(), "value": round(float(row["VPD"]), 2)}