feat: support querying and merging multiple sensors server-side

Co-authored-by: aider (gemini/gemini-3.1-pro-preview) <aider@aider.chat>

client/src/App.js

@@ -680,21 +680,18 @@ function MultiLineChart({title, measurement, dataKey, sensors, colors, end, dura
 				const api_key = localStorage.getItem('api_key', 'null');
 				const params = { end: end.unix(), duration: duration.len.toLowerCase(), window: duration.win, api_key: api_key };
 				
-				const responses = await Promise.all(
-					sensors.map(name => axios.get(`https://sensors-api.dns.t0.vc/history/${measurement}/${name}`, { params }))
-				);
+				const names = sensors.join(',');
+				const res = await axios.get(`https://sensors-api.dns.t0.vc/history/${measurement}/${names}`, { params });
 				
-				const timeMap = {};
-				responses.forEach((res, i) => {
-					const sensorName = sensors[i];
-					res.data.forEach(d => {
-						if (!timeMap[d.time]) timeMap[d.time] = { time: d.time };
-						timeMap[d.time][sensorName] = d[dataKey];
+				const formattedData = res.data.map(d => {
+					const newObj = { time: d.time };
+					sensors.forEach(sensor => {
+						newObj[sensor] = d[`${sensor}_${dataKey}`];
 					});
+					return newObj;
 				});
 				
-				const merged = Object.values(timeMap).sort((a, b) => a.time.localeCompare(b.time));
-				setData(merged);
+				setData(formattedData);
 				setLoading(false);
 			} catch (error) {
 				console.log(error);

main.py

@@ -445,7 +445,8 @@ async def history(request):
     authed = api_key == settings.SENSORS_API_KEY
 
     measurement = request.match_info.get('measurement')
-    name = request.match_info.get('name')
+    name_param = request.match_info.get('name')
+    names = name_param.split(',')
 
     share_start = request.rel_url.query.get('shareStart', '')
     share_end = request.rel_url.query.get('shareEnd', '')
@@ -458,6 +459,7 @@ async def history(request):
     if not authed and measurement in ['owntracks', 'sleep']:
         return web.json_response([])
 
+    for name in names:
         if name not in [x.name for x in sensors.sensors]:
             raise
 
@@ -496,13 +498,6 @@ async def history(request):
     if window not in ['1m', '3m', '10m', '30m', '1h', '2h', '1d', '7d', '30d']:
         raise
 
-    if name == 'Water':
-        scale = 10
-    elif name == 'Gas':
-        scale = 0.001055*1000
-    else:
-        scale = 1
-
     start = int(start.timestamp())
     end = int(end.timestamp())
 
@@ -512,6 +507,15 @@ async def history(request):
         if end >= int(share_end):
             end = int(share_end)
 
+    time_map = {}
+
+    for name in names:
+        if name == 'Water':
+            scale = 10
+        elif name == 'Gas':
+            scale = 0.001055*1000
+        else:
+            scale = 1
 
         if measurement == 'temperature':
             client = sensors_client
@@ -551,8 +555,21 @@ async def history(request):
 
         q += ' tz(\'America/Edmonton\')'
 
-    result = list(client.query(q).get_points())
+        points = list(client.query(q).get_points())
         
+        for p in points:
+            t = p['time']
+            if t not in time_map:
+                time_map[t] = {'time': t}
+            
+            if len(names) > 1:
+                for k, v in p.items():
+                    if k != 'time':
+                        time_map[t][f"{name}_{k}"] = v
+            else:
+                time_map[t].update(p)
+
+    result = sorted(time_map.values(), key=lambda x: x['time'])
     return web.json_response(result)