benchlab-pytools 3.0.2__tar.gz → 3.0.4__tar.gz

{benchlab_pytools-3.0.2 → benchlab_pytools-3.0.4}/CHANGELOG.md

@@ -4,6 +4,41 @@ All notable changes to BENCHLAB PyTools are documented here. Format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); versioning follows
 [SemVer](https://semver.org/).
 
+## [3.0.4] - 2026-08-18
+
+### Fixed
+- 12VHPWR tab per-pin sense lines (`HPWR{1,2}_W{1..6}`) read 0.0 over
+  `service_http`/`named_pipe`, even though other apps using the same
+  `service_http` API showed correct values. The C# service's telemetry
+  normalization mapped the HPWR1/HPWR2 rail summaries but never mapped
+  the 12 individual per-pin sense-line sensors, so their C#
+  `ShortName`s (`HPWR{n}_W{m}_{P,I,V}`) passed through unmapped instead
+  of becoming the `..._{Power,Current,Voltage}` keys the TUI reads.
+
+## [3.0.3] - 2026-08-18
+
+### Fixed
+- TUI: the 12VHPWR tab's Voltage section was cut off with no way to
+  scroll, since `MIN_TERMINAL_ROWS` (35) was well under the ~48 rows
+  the stacked Power/Current/Voltage layout plus status bar actually
+  needs. Raised to 48.
+- `mqtt`, `service_http`, and `named_pipe` data sources never surfaced
+  `vendor_id`/`product_id`/`firmware_version`, so the Fleet TUI's
+  Model column (BL1 vs BL2 detection) was always wrong for these
+  sources:
+  - `mqtt`: the publisher's retained info payload only sent
+    `uid`/`com_port`/`firmware`; it now also reads
+    `ProductId`/`VendorId`/`FwVersion` via `read_device()` and
+    computes `variant`.
+  - `named_pipe`: the C# service's camelCase `productId` is now
+    mapped to the PascalCase keys the TUI expects
+    (`vendorId`/`firmwareVersion` also mapped), with `variant`
+    computed — field names verified against the
+    `BENCHLAB.BENCHLAB_Service` source.
+  - `service_http`: added a device-info normalization step (the C#
+    HTTP API only ever sends `productId`, confirmed against source —
+    vendor/firmware are unavailable there and default to unknown).
+
 ## [3.0.2] - 2026-08-18
 
 ### Fixed
@@ -67,6 +102,8 @@ export, MQTT publisher, VU dials, WigiDash, and config import/export tools,
 sharing a common data-source layer (direct serial, FastAPI, MQTT, named
 pipe, service HTTP).
 
+[3.0.4]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.0.3...v3.0.4
+[3.0.3]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.0.2...v3.0.3
 [3.0.2]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.0.0...v3.0.1
 [3.0.0]: https://github.com/BenchLab-io/benchlab-pytools/compare/v0.8.2...v3.0.0

{benchlab_pytools-3.0.2 → benchlab_pytools-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: benchlab-pytools
-Version: 3.0.2
+Version: 3.0.4
 Summary: Python control suite for BENCHLAB telemetry devices
 Project-URL: Homepage, https://benchlab.io/
 Project-URL: Repository, https://github.com/BenchLab-io/benchlab-pytools

{benchlab_pytools-3.0.2 → benchlab_pytools-3.0.4}/benchlab/__init__.py

@@ -2,4 +2,4 @@
 BENCHLAB Telemetry Package
 """
 
-__version__ = "3.0.2"
+__version__ = "3.0.4"

{benchlab_pytools-3.0.2 → benchlab_pytools-3.0.4}/benchlab/core/datasource.py

@@ -595,7 +595,15 @@ class MQTTDataSource(DataSource):
 
         with self._lock:
             return [
-                {'uid': uid, 'port': info.get('com_port', 'unknown')}
+                {
+                    'uid': uid,
+                    'port': info.get('com_port', 'unknown'),
+                    'firmware': info.get('firmware', '?'),
+                    'variant': info.get('variant'),
+                    'VendorId': info.get('VendorId', 0),
+                    'ProductId': info.get('ProductId', 0),
+                    'FwVersion': info.get('FwVersion', 0),
+                }
                 for uid, info in self._device_info.items()
             ]
 
@@ -690,6 +698,16 @@ def _normalise_cs_telemetry(sensors_raw: list) -> Dict[str, Any]:
         "HPWR2_P": "HPWR2_Power", "HPWR2_V": "HPWR2_Voltage",
         "HPWR2_I": "HPWR2_Current",
 
+        # BL2 12VHPWR per-pin sense lines (HPWR{1,2}_W{1..6}), shown on
+        # the TUI's 12VHPWR tab as HPWR{n}_W{m}_{Power,Current,Voltage}
+        **{
+            f"HPWR{n}_W{m}_{suffix}": f"HPWR{n}_W{m}_{tui_suffix}"
+            for n in (1, 2)
+            for m in range(1, 7)
+            for suffix, tui_suffix in (
+                ("P", "Power"), ("I", "Current"), ("V", "Voltage"))
+        },
+
         # Board voltages
         "VDD": "Vdd",
         "VREF": "Vref",
@@ -729,6 +747,34 @@ def _normalise_cs_telemetry(sensors_raw: list) -> Dict[str, Any]:
     return result
 
 
+def _normalise_cs_device_info(d: Dict[str, Any]) -> Dict[str, Any]:
+    """Normalise a C# service device dict into the shape the TUI expects.
+
+    The C# service's /devices, /device/{uid}/info, and discovery-pipe
+    responses use camelCase keys (productId, vendorId, firmwareVersion —
+    confirmed against BenchlabSensorWorker.cs/HttpApiServer.cs in the
+    BENCHLAB_Service repo). Note the HTTP API's /devices and
+    /device/{uid}/info endpoints only send productId — no vendorId or
+    firmwareVersion — so those default to 0 there; only the named-pipe
+    discovery/GetServiceInfo responses include all three.
+    DirectDataSource/FastAPIDataSource populate PascalCase keys
+    (ProductId, VendorId, FwVersion) plus a computed 'variant' — this
+    adds those same keys without discarding what the C# service sent.
+    """
+    result = dict(d)
+    product_id = d.get("ProductId", d.get("productId", 0))
+    vendor_id = d.get("VendorId", d.get("vendorId", 0))
+    fw_version = d.get("FwVersion", d.get("firmwareVersion", 0))
+    result["ProductId"] = product_id
+    result["VendorId"] = vendor_id
+    result["FwVersion"] = fw_version
+    result.setdefault("firmware", d.get("firmware", fw_version))
+    # 0x11 = BENCHLAB_BL2_PRODUCT_ID (see DirectDataSource/tui_core.py).
+    result.setdefault(
+        "variant", "BL2" if product_id == 0x11 else "ORIGINAL")
+    return result
+
+
 class NamedPipeDataSource(DataSource):
     """Data source that connects to the C# BenchLab Windows service via
     named pipes.
@@ -792,14 +838,31 @@ class NamedPipeDataSource(DataSource):
             self._pipe_names.clear()
             for d in devices:
                 uid = d.get("guid") or d.get("deviceName", "unknown")
+                # Field names confirmed against BenchlabSensorWorker.cs's
+                # ListDevices response in the BENCHLAB_Service repo.
+                product_id = d.get("productId", 0)
+                vendor_id = d.get("vendorId", 0)
+                fw_version = d.get("firmwareVersion", 0)
+                # 0x11 = BENCHLAB_BL2_PRODUCT_ID (see
+                # DirectDataSource/tui_core.py); hardcoded rather than
+                # importing benchlab_pycore, which named_pipe consumers
+                # of the C# service don't necessarily have installed.
+                variant = "BL2" if product_id == 0x11 else "ORIGINAL"
                 self._devices[uid] = {
                     "uid": uid,
                     "port": d.get("port", "unknown"),
                     "name": d.get("deviceName", "unknown"),
-                    "productId": d.get("productId", 0),
+                    "productId": product_id,
                     "status": d.get("status", "unknown"),
                     "sensorCount": d.get("sensorCount", 0),
                     "pipeName": d.get("pipeName", ""),
+                    # PascalCase aliases matching DirectDataSource's shape,
+                    # so consumers (e.g. the TUI) can detect BL1/BL2.
+                    "firmware": fw_version,
+                    "variant": variant,
+                    "VendorId": vendor_id,
+                    "ProductId": product_id,
+                    "FwVersion": fw_version,
                 }
                 self._pipe_names[uid] = d.get("pipeName", "")
 
@@ -1041,7 +1104,7 @@ class ServiceHttpDataSource(DataSource):
                 for d in devices:
                     uid = d.get("uid", "")
                     if uid:
-                        self._devices[uid] = d
+                        self._devices[uid] = _normalise_cs_device_info(d)
 
         self._connected = True
         self._stop_event.clear()
@@ -1146,7 +1209,8 @@ class ServiceHttpDataSource(DataSource):
                         for d in devices:
                             uid = d.get("uid", "")
                             if uid:
-                                self._devices[uid] = d
+                                self._devices[uid] = (
+                                    _normalise_cs_device_info(d))
 
                 # Poll telemetry for each device
                 with self._lock:

{benchlab_pytools-3.0.2 → benchlab_pytools-3.0.4}/benchlab/mqtt/mqtt_publisher.py

@@ -17,6 +17,11 @@ from benchlab_pycore.core import (
     read_device,
     BENCHLAB_ORIGINAL_PRODUCT_ID,
 )
+try:
+    from benchlab_pycore.core import BENCHLAB_BL2_PRODUCT_ID
+except ImportError:
+    from benchlab_pycore.core import (
+        BENCHLAB_CFE_PRODUCT_ID as BENCHLAB_BL2_PRODUCT_ID)
 from benchlab_pycore.core.serial_io import get_fleet_info
 
 # Import DeviceRegistry so the MQTT publisher publishes device lifecycle events
@@ -340,12 +345,36 @@ def device_thread(device, cfg, publish_interval=1):
                     time.sleep(1)
                     continue
 
+                # Read device info (ProductId/VendorId/FwVersion) so the
+                # info payload lets consumers (e.g. the TUI) detect the
+                # BL1/BL2 variant, matching DirectDataSource's shape.
+                vendor_id = 0
+                product_id = BENCHLAB_ORIGINAL_PRODUCT_ID
+                fw_version = device.get("firmware")
+                try:
+                    dev_info = read_device(ser)
+                    if dev_info:
+                        vendor_id = dev_info.get('VendorId', 0)
+                        product_id = dev_info.get(
+                            'ProductId', BENCHLAB_ORIGINAL_PRODUCT_ID)
+                        fw_version = dev_info.get('FwVersion', fw_version)
+                except Exception:
+                    pass
+                variant = (
+                    "BL2" if product_id == BENCHLAB_BL2_PRODUCT_ID
+                    else "ORIGINAL")
+
                 # Send initial info payload (retain=True so late subscribers
                 # like the TUI can discover this device)
                 info_payload = {
                     "uid": uid,
                     "com_port": port,
-                    "firmware": device.get("firmware")}
+                    "firmware": device.get("firmware"),
+                    "VendorId": vendor_id,
+                    "ProductId": product_id,
+                    "FwVersion": fw_version,
+                    "variant": variant,
+                }
                 topic_info = f"{cfg['topic_prefix']}/{uid}/info"
                 mqtt_publish(
                     client,

{benchlab_pytools-3.0.2 → benchlab_pytools-3.0.4}/benchlab/tui/config.py

@@ -14,7 +14,10 @@ from typing import Tuple
 # ═══════════════════════════════════════════════════════════════════════════════
 
 # Minimum terminal size requirements
-MIN_TERMINAL_ROWS = 35
+# The 12VHPWR tab's stacked Power/Current/Voltage sections (12 channels
+# each) need rows through ~45 for the last Voltage bar, plus 2 rows for
+# the status bar at the bottom (drawn at height-2/height-1).
+MIN_TERMINAL_ROWS = 48
 MIN_TERMINAL_COLS = 100
 
 # Tab configuration