Update agents/live/app/services/sql_agent.py

agents/live/app/services/sql_agent.py

@@ -382,6 +382,66 @@ FROM tank_reading
 
     def try_builtin_query(self, question: str, asset_name: str, schema_name: str | None = None, asset_id: str | None = None) -> SQLPlan | None:
         lowered = question.lower()
+
+        # Multi-asset query check (e.g., "coldroom 1,2,3", "ct1,2,3", "tank 1 and 2", "coldroom 1, coldroom 2, coldroom 3")
+        multi_asset_match = re.findall(r'\b(coldroom|cold\s+room|ct|st|physical|tank|boiler|machine)\s*[-_]?\s*(\d+)\b', lowered)
+        digits = re.findall(r'\d+', lowered)
+        if (len(multi_asset_match) >= 2 or (',' in lowered and len(digits) >= 2)) and digits:
+            prefix = multi_asset_match[0][0].replace(" ", "") if multi_asset_match else "coldroom"
+            schema = schema_name or self.settings.openremote_schema
+            target_norms = []
+            for d in digits:
+                if prefix in ('coldroom', 'cold'):
+                    target_norms.extend([f"coldroom{d}", f"coldroom0{d}"])
+                elif prefix in ('ct', 'tank', 'physical', 'st'):
+                    target_norms.extend([f"ct{d}", f"tank{d}", f"physical{int(d):02d}", f"physical{d}"])
+                elif prefix == 'boiler':
+                    target_norms.extend([f"boiler{d}", f"boiler0{d}"])
+                else:
+                    target_norms.append(f"{prefix}{d}")
+
+            if target_norms:
+                in_clause = ", ".join(f"'{tn}'" for tn in target_norms)
+                sql = f"""
+WITH target_assets AS (
+  SELECT DISTINCT ON (REPLACE(LOWER(name), ' ', ''))
+    id, name
+  FROM {schema}.asset
+  WHERE REPLACE(LOWER(name), ' ', '') IN ({in_clause})
+  ORDER BY REPLACE(LOWER(name), ' ', ''), version DESC
+),
+latest_dp AS (
+  SELECT DISTINCT ON (entity_id, attribute_name)
+    entity_id, attribute_name, value, timestamp
+  FROM {schema}.asset_datapoint
+  WHERE entity_id IN (SELECT id FROM target_assets)
+  ORDER BY entity_id, attribute_name, timestamp DESC
+),
+agg_dp AS (
+  SELECT 
+    entity_id,
+    COALESCE(jsonb_object_agg(attribute_name, value), '{{}}'::jsonb) AS sensor_data
+  FROM latest_dp
+  GROUP BY entity_id
+)
+SELECT 
+  ta.name AS asset_name,
+  NOW() + INTERVAL '3 hours' AS local_time,
+  (
+    COALESCE(
+      (SELECT jsonb_object_agg(key, val->'value')
+       FROM jsonb_each(a.attributes::jsonb) AS x(key, val)
+       WHERE val->'value' IS NOT NULL AND key NOT IN ('notes', 'location', 'info', 'displayIndex')),
+      '{{}}'::jsonb
+    ) || COALESCE(ad.sensor_data, '{{}}'::jsonb)
+  ) AS sensor_data
+FROM target_assets ta
+JOIN {schema}.asset a ON ta.id = a.id
+LEFT JOIN agg_dp ad ON ta.id = ad.entity_id
+ORDER BY ta.name ASC
+""".strip()
+                return SQLPlan(needs_sql=True, scenario="multi_asset_comparison", sql=sql, answer_if_no_sql="")
+
         if not asset_name:
             return None