feat(api): extend GET /instruments with classes and channel paths from manifests

- Reads manifest instrument_class features.channels
- Builds channel URLs for each class

Co-authored-by: openhands <openhands@all-hands.dev>

Author: openhands-agent

benchmesh-serial-service/src/benchmesh_service/api.py

@@ -1,8 +1,8 @@
 import os
 import json
-from typing import Any
+from typing import Any, Dict, List
 from fastapi import FastAPI, HTTPException, Response
-from .serial_manager import SerialManager
+from .serial_manager import SerialManager, _load_manifest
 from .config import load_config
 
 app = FastAPI(title="BenchMesh Serial Service", version="0.1.0")
@@ -89,9 +89,50 @@ def get_status():
 def list_instruments():
     global _manager
     items = []
-    if _manager and getattr(_manager, 'registry', None):
-        for dev_id, data in _manager.registry.items():
-            items.append({"id": dev_id, "IDN": data.get("IDN")})
+    if not _manager:
+        return items
+
+    registry = getattr(_manager, 'registry', {}) or {}
+    for dev in _manager.devices:
+        dev_id = dev.get('id')
+        if not dev_id:
+            continue
+        entry: Dict[str, Any] = {"id": dev_id}
+        reg_data = registry.get(dev_id, {})
+        if 'IDN' in reg_data:
+            entry['IDN'] = reg_data['IDN']
+
+        # Attempt to populate classes/channels from manifest based on device driver and model
+        try:
+            driver_key = dev.get('driver')
+            manifest = _load_manifest(driver_key) if driver_key else None
+        except Exception:
+            manifest = None
+        classes_list: List[Dict[str, Any]] = []
+        if isinstance(manifest, dict):
+            models = manifest.get('models') or {}
+            model_key = dev.get('model')
+            model_cfg = None
+            if model_key and isinstance(models.get(model_key), dict):
+                model_cfg = models.get(model_key)
+            elif isinstance(models, dict) and models:
+                # fallback to first model entry
+                model_cfg = next(iter(models.values()))
+            if isinstance(model_cfg, dict):
+                inst_class_block = model_cfg.get('instrument_class') or {}
+                for klass, klass_cfg in inst_class_block.items():
+                    features = (klass_cfg or {}).get('features') or {}
+                    channels = int(features.get('channels', 1) or 1)
+                    # Build channel paths
+                    ch_paths = [f"/instruments/{klass}/{dev_id}/{i+1}" for i in range(max(1, channels))]
+                    classes_list.append({
+                        "class": klass,
+                        "channels": ch_paths,
+                    })
+        if classes_list:
+            entry['classes'] = classes_list
+
+        items.append(entry)
     return items
 
 

benchmesh-serial-service/src/benchmesh_service/drivers/owon_dge/manifest.json

@@ -16,6 +16,12 @@
         "reol": "\r",
         "def_conn_ver_command": "*IDN?"
       },
+      "pooling": [
+        {
+        "method": "poll_status",
+        "interval": 0.9
+        }
+      ],
       "instrument_class": {
         "AFG": {
           "features": {

benchmesh-serial-service/src/benchmesh_service/drivers/owon_oel/manifest.json

@@ -18,24 +18,8 @@
       },
       "pooling": [
         {
-          "command": "MEAS:VOLT?",
-          "name": "output_voltage_1",
-          "every": 0.9
-        },
-        {
-          "command": "MEAS:CURR?",
-          "name": "output_current_1",
-          "every": 0.9
-        },
-        {
-          "command": "MEAS:POWer?",
-          "name": "output_power_1",
-          "every": 0.9
-        },
-        {
-          "command": "MEAS:ALL:INFO?",
-          "name": "output_status_1",
-          "every": 0.9
+        "method": "poll_status",
+        "interval": 0.9
         }
       ],
       "instrument_class": {

benchmesh-serial-service/src/benchmesh_service/drivers/owon_spm/manifest.json

@@ -19,15 +19,14 @@
       },
       "pooling": [
         {
-        "command": "read_status",
-        "name": "status_1",
-        "every": 0.9
+        "method": "poll_status",
+        "interval": 0.9
         }
       ],
       "instrument_class": {
         "PSU": {
           "features": {
-            "channels": 1,
+            "channels": 2,
             "memory_banks": 4,
             "memory_storage": [
               "V",

benchmesh-serial-service/src/benchmesh_service/drivers/owon_xdm/manifest.json

@@ -16,6 +16,12 @@
         "reol": "\r",
         "def_conn_ver_command": "*IDN?"
       },
+      "pooling": [
+        {
+        "method": "poll_status",
+        "interval": 0.9
+        }
+      ],
       "instrument_class": {
         "DMM": {
           "features": {

benchmesh-serial-service/src/benchmesh_service/drivers/tenma_72/manifest.json

@@ -18,13 +18,7 @@
       },
       "pooling": [
         {
-        "method": "read_output_voltage",
-        "name": "output_voltage_1",
-        "interval": 0.9
-        },
-        {
-        "method": "read_output_current",
-        "name": "output_current_1",
+        "method": "poll_status",
         "interval": 0.9
         }
       ],