benchlab-pytools 3.3.0__tar.gz → 3.4.0__tar.gz

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/CHANGELOG.md

@@ -4,6 +4,40 @@ 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.4.0] - 2026-10-22
+
+### Added
+- TUI: BENCHLAB2 fault status is now surfaced. The Device tab shows a
+  quick-glance warning when a fault is currently active, and a new Faults
+  tab lists all 34 known BL2 faults with their live (`FaultStatus`) and
+  latched (`FaultLog`) state. Requires BL2 firmware 05+; ORIGINAL devices
+  and earlier BL2 firmware show an explanatory message instead. (#95)
+
+### Fixed
+- `-flash`: confirmed against real hardware that a device doesn't always
+  re-enumerate as CDC on its own after leaving DFU mode, even though the
+  flash and verify already succeeded. The tool now says so plainly instead
+  of a vague "may just be slow re-enumeration" warning, and the
+  interactive flow prompts to replug the USB cable and re-checks the
+  device before exiting instead of leaving the user to guess. (#97)
+
+## [3.3.1] - 2026-10-17
+
+### Fixed
+- Packaging: `benchlab-pytools[flash]` was missing `pydantic` and
+  `requests` (`flash_manager` imports `config_manager` -> `config.schema`
+  -> `pydantic`; `--source service_http` needs `requests`), so a clean
+  `[flash]`-only install crashed with `ModuleNotFoundError` on first use.
+  The launcher also reported `ModuleNotFoundError` as "Flash tool module
+  not available in this build" regardless of cause; it now prints the
+  real missing module and the install command. (#90)
+- `check_bootloader_supported()` only gated BENCHLAB1 firmware against
+  the CMD_BOOTLOADER version floor; a BENCHLAB2 unit on firmware below
+  `0x05` (which predates CMD_BOOTLOADER on BL2, per the firmware repo's
+  protocol contract freeze history) passed the check and then hit a 5s
+  timeout in `enter_dfu_mode()` instead of being told up front to use a
+  physical BOOT0/jumper bootloader entry. (#94)
+
 ## [3.3.0] - 2026-10-01
 
 ### Added
@@ -193,6 +227,7 @@ 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, service WebSocket).
 
+[3.3.1]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.3.0...v3.3.1
 [3.3.0]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.2.1...v3.3.0
 [3.2.1]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.2.0...v3.2.1
 [3.2.0]: https://github.com/BenchLab-io/benchlab-pytools/compare/v3.1.0...v3.2.0

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: benchlab-pytools
-Version: 3.3.0
+Version: 3.4.0
 Summary: Python control suite for BENCHLAB telemetry devices
 Project-URL: Homepage, https://benchlab.io/
 Project-URL: Repository, https://github.com/BenchLab-io/benchlab-pytools
@@ -24,13 +24,14 @@ Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.10
 Requires-Dist: benchlab-pycore>=0.8.0
 Requires-Dist: packaging<26.0,>=23.0
+Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-dotenv<2.0,>=1.2.2
 Requires-Dist: pywin32>=306; platform_system == 'Windows'
+Requires-Dist: requests>=2.33.1
 Requires-Dist: textual<9.0,>=0.60
 Requires-Dist: windows-curses>=2.4.1; platform_system == 'Windows'
 Provides-Extra: all
 Requires-Dist: amqtt<0.13.0,>=0.12.0; extra == 'all'
-Requires-Dist: benchlab-pycore>=0.8.0; extra == 'all'
 Requires-Dist: blessed>=1.20.0; extra == 'all'
 Requires-Dist: dearpygui>=2.1.1; extra == 'all'
 Requires-Dist: fastapi==0.111.1; extra == 'all'
@@ -42,25 +43,20 @@ Requires-Dist: numpy>=2.2.0; extra == 'all'
 Requires-Dist: paho-mqtt<3.0,>=2.0; extra == 'all'
 Requires-Dist: pillow>=10.0.0; extra == 'all'
 Requires-Dist: pillow>=11.3.0; extra == 'all'
-Requires-Dist: pydantic>=2.0.0; extra == 'all'
 Requires-Dist: pyelftools>=0.31; extra == 'all'
 Requires-Dist: pyserial>=3.5; extra == 'all'
 Requires-Dist: python-dotenv==1.2.2; extra == 'all'
 Requires-Dist: pyusb>=1.3.1; extra == 'all'
 Requires-Dist: pyyaml<7.0,>=6.0; extra == 'all'
 Requires-Dist: pyyaml>=6.0; extra == 'all'
-Requires-Dist: requests>=2.31.0; extra == 'all'
-Requires-Dist: requests>=2.33.1; extra == 'all'
 Requires-Dist: ruamel-yaml; extra == 'all'
 Requires-Dist: tornado; extra == 'all'
 Requires-Dist: tqdm>=4.66; extra == 'all'
 Requires-Dist: uvicorn[standard]==0.24.0; extra == 'all'
 Requires-Dist: websockets<16.0,>=13.0; extra == 'all'
 Provides-Extra: csv-log
-Requires-Dist: benchlab-pycore>=0.8.0; extra == 'csv-log'
 Requires-Dist: pyserial>=3.5; extra == 'csv-log'
 Provides-Extra: flash
-Requires-Dist: benchlab-pycore>=0.8.0; extra == 'flash'
 Requires-Dist: intelhex>=2.3.0; extra == 'flash'
 Requires-Dist: libusb-package>=1.0.26.1; (sys_platform == 'win32') and extra == 'flash'
 Requires-Dist: pyelftools>=0.31; extra == 'flash'
@@ -72,29 +68,28 @@ Requires-Dist: dearpygui>=2.1.1; extra == 'graph'
 Requires-Dist: pyserial>=3.5; extra == 'graph'
 Provides-Extra: hwinfo
 Requires-Dist: pyserial>=3.5; extra == 'hwinfo'
+Provides-Extra: link
+Requires-Dist: paho-mqtt<3.0,>=2.0; extra == 'link'
+Requires-Dist: pyserial>=3.5; extra == 'link'
 Provides-Extra: mqtt
 Requires-Dist: amqtt<0.13.0,>=0.12.0; extra == 'mqtt'
 Requires-Dist: paho-mqtt<3.0,>=2.0; extra == 'mqtt'
 Requires-Dist: pyyaml<7.0,>=6.0; extra == 'mqtt'
 Provides-Extra: restapi
 Requires-Dist: fastapi==0.111.1; extra == 'restapi'
-Requires-Dist: pydantic>=2.0.0; extra == 'restapi'
 Requires-Dist: pyserial>=3.5; extra == 'restapi'
 Requires-Dist: python-dotenv==1.2.2; extra == 'restapi'
 Requires-Dist: uvicorn[standard]==0.24.0; extra == 'restapi'
 Provides-Extra: service-ws
 Requires-Dist: websockets<16.0,>=13.0; extra == 'service-ws'
 Provides-Extra: tui
-Requires-Dist: pydantic>=2.0.0; extra == 'tui'
 Requires-Dist: pyserial>=3.5; extra == 'tui'
-Requires-Dist: requests>=2.33.1; extra == 'tui'
 Provides-Extra: vu
 Requires-Dist: blessed>=1.20.0; extra == 'vu'
 Requires-Dist: numpy; extra == 'vu'
 Requires-Dist: pillow>=10.0.0; extra == 'vu'
 Requires-Dist: pyserial>=3.5; extra == 'vu'
 Requires-Dist: pyyaml>=6.0; extra == 'vu'
-Requires-Dist: requests>=2.31.0; extra == 'vu'
 Requires-Dist: ruamel-yaml; extra == 'vu'
 Requires-Dist: tornado; extra == 'vu'
 Provides-Extra: wigidash
@@ -191,6 +186,22 @@ python -m benchlab -config ...  # Device configuration import/export
 python -m benchlab -flash ...   # Firmware flash tool (STM32 ROM DFU)
 ```
 
+The flash tool needs its extra: `pip install "benchlab-pytools[flash]"`. It takes a firmware
+image with `--file` and does not download one; releases live in
+[BENCHLAB-FW](https://github.com/BenchLab-io/BENCHLAB-FW/releases). Start with `--list` to see what
+is connected, and `--verify-only` to check an image against a device without erasing or writing:
+
+```bash
+python -m benchlab -flash --list
+python -m benchlab -flash --file benchlab2-fw07-v0.7.2.bin --verify-only
+```
+
+**On Windows, flashing needs a one-time driver step.** In DFU mode the board enumerates as
+ST's ROM bootloader (VID `0483`, PID `DF11`), which does not bind to a driver libusb can use,
+so the tool cannot see a device that is plugged in and sitting in its bootloader. Bind WinUSB
+to it with [Zadig](https://zadig.akeo.ie/) first -- see
+[Windows: USB driver setup](benchlab/flash/README.md#windows-usb-driver-setup-zadig).
+
 Running with no flags is equivalent to launching the interactive menu.
 
 ### Data Sources

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/README.md

@@ -83,6 +83,22 @@ python -m benchlab -config ...  # Device configuration import/export
 python -m benchlab -flash ...   # Firmware flash tool (STM32 ROM DFU)
 ```
 
+The flash tool needs its extra: `pip install "benchlab-pytools[flash]"`. It takes a firmware
+image with `--file` and does not download one; releases live in
+[BENCHLAB-FW](https://github.com/BenchLab-io/BENCHLAB-FW/releases). Start with `--list` to see what
+is connected, and `--verify-only` to check an image against a device without erasing or writing:
+
+```bash
+python -m benchlab -flash --list
+python -m benchlab -flash --file benchlab2-fw07-v0.7.2.bin --verify-only
+```
+
+**On Windows, flashing needs a one-time driver step.** In DFU mode the board enumerates as
+ST's ROM bootloader (VID `0483`, PID `DF11`), which does not bind to a driver libusb can use,
+so the tool cannot see a device that is plugged in and sitting in its bootloader. Bind WinUSB
+to it with [Zadig](https://zadig.akeo.ie/) first -- see
+[Windows: USB driver setup](benchlab/flash/README.md#windows-usb-driver-setup-zadig).
+
 Running with no flags is equivalent to launching the interactive menu.
 
 ### Data Sources

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/__init__.py

@@ -2,4 +2,4 @@
 BENCHLAB Telemetry Package
 """
 
-__version__ = "3.3.0"
+__version__ = "3.4.0"

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/core/datasource.py

@@ -312,6 +312,15 @@ class DirectDataSource(DataSource):
                         ser, product_id=product_id)
                     if sensors:
                         data = self._pycore['translate_sensor_struct'](sensors)
+                        # translate_sensor_struct_bl2() doesn't read these
+                        # off the raw struct (BL2 fw05+ only), so pull them
+                        # directly here.
+                        fault_status = getattr(sensors, 'FaultStatus', None)
+                        fault_log = getattr(sensors, 'FaultLog', None)
+                        if fault_status is not None:
+                            data['FaultStatus'] = fault_status
+                        if fault_log is not None:
+                            data['FaultLog'] = fault_log
                         data['timestamp'] = datetime.now(UTC).isoformat()
                         with self._lock:
                             self._latest_data[uid] = data
@@ -722,6 +731,10 @@ CS_SHORT_NAME_MAP: Dict[str, str] = {
         **{f"FAN{i}_T": f"Fan{i}_RPM" for i in range(1, 10)},
         **{f"FAN{i}_D": f"Fan{i}_Duty" for i in range(1, 10)},
         "FAN_EXT": "FanExtDuty",
+
+        # BL2 fault bitmasks (fw05+ only) — see Fault enum in benchlab_pycore
+        "FAULT_STATUS": "FaultStatus",
+        "FAULT_LOG": "FaultLog",
 }
 
 

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/flash/README.md

@@ -178,10 +178,26 @@ WinUSB (or libusbK) driver to it using
 
 1. Start the flash operation so the device enters DFU mode (or put it into
    DFU mode and let it stay there briefly).
-2. Open Zadig, enable "List All Devices", find the device (it should show
-   up as an STM32 BOOTLOADER or similar, VID/PID `0483`/`DF11`).
-3. Select the WinUSB driver and click "Install Driver" / "Replace Driver".
-4. Re-run the flash command.
+2. Open Zadig **as Administrator** and find the device -- it should show up
+   as `STM32  BOOTLOADER`. A driverless device is listed by default; only
+   enable "List All Devices" if it does not appear.
+3. **Check the USB ID reads `0483  DF11`** before continuing, so the driver
+   cannot go onto the wrong device.
+4. Select the WinUSB driver and click "Install Driver" / "Replace Driver".
+   This takes around 30 seconds and the window may appear frozen.
+5. Re-run the flash command.
+
+To confirm the bind before re-running, on Windows:
+
+```powershell
+Get-PnpDevice | Where-Object { $_.InstanceId -like '*VID_0483&PID_DF11*' } |
+  Select-Object Status, FriendlyName, Service
+```
+
+`Service : WinUSB` with `Status : OK` means libusb can now see it. An
+unbound device instead reports `Status : Error` and
+`ConfigManagerErrorCode : 28` ("no driver installed"), which is the
+underlying cause of the timeout above.
 
 This is a one-time setup per machine/USB port combination. This is a
 Windows driver-binding limitation, independent of this tool being pure

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/flash/flash_manager.py

@@ -32,6 +32,11 @@ logger = logging.getLogger("benchlab.flash.manager")
 # ignore the opcode).
 MIN_BOOTLOADER_FW_VERSION = 0x04
 
+# Same opcode, same commit (c722244), but BL2's frozen protocol contracts
+# show it landed between the fw04 and fw05 freezes -- benchlab2-fw03.json/
+# benchlab2-fw04.json have no BOOTLOADER entry, benchlab2-fw05.json does.
+MIN_BOOTLOADER_FW_VERSION_BL2 = 0x05
+
 _KNOWN_PRODUCT_IDS = (BENCHLAB_ORIGINAL_PRODUCT_ID, BENCHLAB_BL2_PRODUCT_ID)
 _BENCHLAB_VENDOR_ID = 0xEE
 
@@ -155,16 +160,20 @@ class FlashManager:
 
     def check_bootloader_supported(
             self, device_info: dict, product_id: int) -> None:
-        if (product_id == BENCHLAB_ORIGINAL_PRODUCT_ID
-                and device_info.get("FwVersion", 0)
-                < MIN_BOOTLOADER_FW_VERSION):
+        if product_id == BENCHLAB_ORIGINAL_PRODUCT_ID:
+            min_fw = MIN_BOOTLOADER_FW_VERSION
+        elif product_id == BENCHLAB_BL2_PRODUCT_ID:
+            min_fw = MIN_BOOTLOADER_FW_VERSION_BL2
+        else:
+            return
+
+        if device_info.get("FwVersion", 0) < min_fw:
             raise UnsupportedFirmwareError(
                 "This device's firmware "
                 f"(0x{device_info.get('FwVersion', 0):02X}) predates "
-                f"CMD_BOOTLOADER support (requires "
-                f"0x{MIN_BOOTLOADER_FW_VERSION:02X}+). It cannot be put "
-                "into DFU mode via software -- use a physical BOOT0/jumper "
-                "bootloader entry instead.")
+                f"CMD_BOOTLOADER support (requires 0x{min_fw:02X}+). It "
+                "cannot be put into DFU mode via software -- use a "
+                "physical BOOT0/jumper bootloader entry instead.")
 
     def enter_dfu_mode(
             self, identifier: str, port: Optional[str] = None,
@@ -316,7 +325,9 @@ class FlashManager:
 
         logger.warning(
             "%s did not reappear within %.0fs after leaving DFU mode -- "
-            "this may just be slow re-enumeration, verify manually.",
+            "flash/verify already succeeded, but it didn't re-enumerate "
+            "as CDC on its own. Unplug and replug the USB cable to "
+            "reconnect it.",
             port, timeout)
         return None
 
@@ -344,7 +355,11 @@ class FlashManager:
                 "Flash completed but verification failed")
 
         if port is not None:
-            self.leave_and_reboot(usb_dev, port)
+            reboot_info = self.leave_and_reboot(usb_dev, port)
+            if reboot_info is None and self.source == "direct":
+                message += (
+                    f" -- {port} did not come back on its own; unplug and "
+                    "replug the USB cable to reconnect it")
         else:
             # No CDC port to wait for -- just trigger the DfuSe leave
             # sequence so the device reboots into the newly-flashed app.

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/flash/flash_tool.py

@@ -226,8 +226,9 @@ def cmd_flash(args):
 
     def progress_cb(port, written, total):
         pct = (written / total * 100) if total else 100
+        done = total and written >= total
         print(f"\r  {port}: {written}/{total} bytes ({pct:.0f}%)",
-              end="", flush=True)
+              end="\n" if done else "", flush=True)
 
     results = manager.flash_many(
         [port for port, _ in targets], args.file,
@@ -316,8 +317,9 @@ def cmd_flash_bare_dfu(args):
 
     def progress_cb(written, total):
         pct = (written / total * 100) if total else 100
+        done = total and written >= total
         print(f"\r  {written}/{total} bytes ({pct:.0f}%)",
-              end="", flush=True)
+              end="\n" if done else "", flush=True)
 
     result = manager.flash_bare_dfu(
         product_id, data, verify_only=args.verify_only,
@@ -453,24 +455,45 @@ def interactive_mode(args):
 
     def progress_cb(port, written, total):
         pct = (written / total * 100) if total else 100
+        done = total and written >= total
         print(f"\r  {port}: {written}/{total} bytes ({pct:.0f}%)",
-              end="", flush=True)
+              end="\n" if done else "", flush=True)
 
     print()
     results = manager.flash_many(
         [_device_identifier(args, device) for device in targets],
         file_path, progress_cb=progress_cb,
         on_unsupported_firmware=_make_boot0_fallback_prompt())
-    print()
 
     print()
     print("Results:")
     any_failed = False
+    needs_reconnect_check = []
     for result in results:
         status = "OK" if result.ok else "FAILED"
         if not result.ok:
             any_failed = True
         print(f"  {result.port}  [{status}]  {result.message}")
+        if result.ok and "unplug and replug" in result.message:
+            needs_reconnect_check.append(result.port)
+
+    for port in needs_reconnect_check:
+        print()
+        while True:
+            choice = input(
+                f"Replug {port}'s USB cable, then press Enter to check "
+                "it's back (or type 'skip' to continue without "
+                "checking): ").strip().lower()
+            if choice == "skip":
+                break
+            info = manager.identify_device(port)
+            if info is not None:
+                fw = info.get('FwVersion', 0)
+                print(f"  {port} is back (FW: 0x{fw:02X})")
+                break
+            print(f"  {port} not detected yet -- check the cable and try "
+                  "again.")
+
     print()
     input("Press Enter to exit...")
 

benchlab_pytools-3.4.0/benchlab/flash/requirements.txt

@@ -0,0 +1,11 @@
+pyserial>=3.5
+pyusb>=1.3.1
+intelhex>=2.3.0
+pyelftools>=0.31
+tqdm>=4.66
+benchlab-pycore>=0.8.0
+libusb-package>=1.0.26.1; sys_platform == 'win32'
+# flash_manager -> config_manager -> config.schema (see #90)
+pydantic>=2.0.0
+# needed by --source service_http (see #90)
+requests>=2.33.1

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/flash/test_flash_manager.py

@@ -108,11 +108,22 @@ def test_check_bootloader_supported_bl1_version_gate(
             info, BENCHLAB_ORIGINAL_PRODUCT_ID)
 
 
-def test_check_bootloader_supported_bl2_not_version_gated(manager):
-    # BL2's CMD_BOOTLOADER gating isn't modeled here (all shipped BL2
-    # firmware postdates it) -- should never raise regardless of fw value.
-    info = _device_info(product_id=BENCHLAB_BL2_PRODUCT_ID, fw=0x01)
-    manager.check_bootloader_supported(info, BENCHLAB_BL2_PRODUCT_ID)
+@pytest.mark.parametrize("fw,should_raise", [
+    (0x03, True),
+    (0x04, True),
+    (0x05, False),
+    (0x07, False),
+])
+def test_check_bootloader_supported_bl2_version_gate(
+        manager, fw, should_raise):
+    info = _device_info(product_id=BENCHLAB_BL2_PRODUCT_ID, fw=fw)
+    if should_raise:
+        with pytest.raises(UnsupportedFirmwareError):
+            manager.check_bootloader_supported(
+                info, BENCHLAB_BL2_PRODUCT_ID)
+    else:
+        manager.check_bootloader_supported(
+            info, BENCHLAB_BL2_PRODUCT_ID)
 
 
 # -- enter_dfu_mode / wait_for_dfu_device ----------------------------------
@@ -354,6 +365,33 @@ def test_flash_bare_dfu_flashes_without_cdc_round_trip(
     assert "Flashed and verified successfully" in result.message
 
 
+def test_erase_verify_leave_hints_replug_when_port_does_not_reappear(
+        manager, monkeypatch):
+    """leave_and_reboot() returning None for a 'direct' flash (the CDC
+    port never came back on its own) must not be silently swallowed --
+    append an actionable unplug/replug hint to the result message rather
+    than reporting a bare success. Confirmed against real hardware: the
+    flash+verify succeed but the device needs a manual USB replug to
+    re-enumerate as CDC (see PR discussion)."""
+    fake_usb_dev = MagicMock()
+    monkeypatch.setattr(
+        manager, "verify_image", lambda usb_dev, d, pid: True)
+    monkeypatch.setattr(
+        manager, "erase_and_flash",
+        lambda usb_dev, d, pid, progress_cb=None: None)
+    monkeypatch.setattr(
+        manager, "leave_and_reboot", lambda usb_dev, port: None)
+
+    ok, message = manager._erase_verify_leave(
+        fake_usb_dev, b"\x00" * 16, BENCHLAB_ORIGINAL_PRODUCT_ID,
+        "COM3", verify_only=False)
+
+    assert ok
+    assert "Flashed and verified successfully" in message
+    assert "unplug and replug" in message.lower()
+    assert "COM3" in message
+
+
 def test_flash_bare_dfu_catches_exceptions(manager, monkeypatch):
     monkeypatch.setattr(
         manager, "wait_for_dfu_device",

benchlab_pytools-3.4.0/benchlab/link/requirements.txt

@@ -0,0 +1,3 @@
+# benchlab/link/requirements.txt
+paho-mqtt>=2.0,<3.0
+pyserial>=3.5

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/main.py

@@ -402,34 +402,50 @@ def launch_mode() -> None:
         try:
             sys.argv.remove('-config')
             from benchlab.config.config_tool import main as config_main
+        except ModuleNotFoundError as exc:
+            # A missing transitive dependency is not a missing build: name the
+            # real cause. There is no install hint because config's only
+            # third-party import (pydantic) is a core dependency, so a miss
+            # here means a broken install rather than a missing extra (#90,
+            # #92).
+            print(f"Config tool unavailable: {exc}")
+        else:
             sys.exit(config_main())
-        except ModuleNotFoundError:
-            print("Config tool module not available in this build.")
 
     elif args.flash:
         # Flash tool handles its own argument parsing
         try:
             sys.argv.remove('-flash')
             from benchlab.flash.flash_tool import main as flash_main
+        except ModuleNotFoundError as exc:
+            # A missing transitive dependency is not a missing build: name
+            # it, and point at the extra that supplies it (see #90).
+            print(f"Flash tool unavailable: {exc}")
+            print('Install it with: pip install "benchlab-pytools[flash]"')
+        else:
             sys.exit(flash_main())
-        except ModuleNotFoundError:
-            print("Flash tool module not available in this build.")
 
     elif args.fastapi:
         try:
             from benchlab.restapi.telemetry_api import run_server
+        except ModuleNotFoundError as exc:
+            # Same reasoning as -flash: a missing dependency is not a missing
+            # build, so report which module is absent (see #90).
+            print(f"FastAPI / Uvicorn unavailable: {exc}")
+            print('Install it with: pip install "benchlab-pytools[restapi]"')
+        else:
             run_server()
-        except ModuleNotFoundError:
-            print("FastAPI / Uvicorn not available in this build.")
 
     elif args.mqtt:
         try:
             from benchlab.mqtt.mqtt_publisher import run_mqtt_mode
+        except ModuleNotFoundError as exc:
+            print(f"MQTT module unavailable: {exc}")
+            print('Install it with: pip install "benchlab-pytools[mqtt]"')
+        else:
             broker = args.mqtt if args.mqtt else "localhost"
             os.environ.setdefault("MQTT_BROKER", broker)
             run_mqtt_mode(broker)
-        except ModuleNotFoundError:
-            print("MQTT module not available in this build.")
 
     elif args.link:
         _export_link_env(args)

benchlab_pytools-3.4.0/benchlab/mqtt/requirements.txt

@@ -0,0 +1,3 @@
+paho-mqtt>=2.0,<3.0
+amqtt>=0.12.0,<0.13.0
+pyyaml>=6.0,<7.0 

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/tools.py

@@ -25,7 +25,9 @@ CONSUMER_TOOLS = {
         "flag": "-config",
         "module": "benchlab.config.config_tool",
         "function": "main",
-        "requirements": "requirements.txt",
+        # No requirements file: config's only third-party import is pydantic,
+        # which is a core dependency, so there is nothing tool-specific to
+        # install (see #92).
         "supported_sources": ["direct", "named_pipe"],
     },
     "flash": {

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/tui/README.md

@@ -33,7 +33,7 @@ The BENCHLAB Enhanced TUI provides a modern, feature-rich curses-based interface
 
 ## 📊 Telemetry Tabs
 
-The TUI has 8 tabs: `Fleet`, `Device`, `System`, `Motherboard`, `12VHPWR`, `Voltage`, `Temperature`, `Fans` (in this order; see `Config.TAB_NAMES` in `benchlab/tui/config.py`). Tabs can also be jumped to directly with the number keys `0`-`7`.
+The TUI has 9 tabs: `Fleet`, `Device`, `System`, `Motherboard`, `12VHPWR`, `Voltage`, `Temperature`, `Fans`, `Faults` (in this order; see `Config.TAB_NAMES` in `benchlab/tui/config.py`). Tabs can also be jumped to directly with the number keys `0`-`8`.
 
 ### **Fleet Tab (Tab 0)**
 - Device list with connection status indicators
@@ -46,6 +46,7 @@ The TUI has 8 tabs: `Fleet`, `Device`, `System`, `Motherboard`, `12VHPWR`, `Volt
 - Device identification (Model, Vendor ID, Product ID, UID)
 - Firmware version display
 - TUI refresh interval
+- Quick-glance active-fault warning (BL2 fw05+ only); see the Faults tab for full detail
 
 ### **System / Motherboard / 12VHPWR Tabs (Tabs 2-4)**
 - Real-time power consumption with progress bars
@@ -76,12 +77,16 @@ The TUI has 8 tabs: `Fleet`, `Device`, `System`, `Motherboard`, `12VHPWR`, `Volt
 - External fan duty monitoring
 - Fan statistics (average duty, max RPM, active count)
 
+### **Faults Tab (Tab 8)**
+- Per-fault Active/Logged status for all BENCHLAB 2 fault conditions
+- BL2 firmware 05+ only; shows an unavailable message on ORIGINAL devices or older BL2 firmware
+
 ## 🎮 Keyboard Shortcuts
 
 ### **Navigation**
 - `h`, `←` - Move to previous tab
 - `l`, `→` - Move to next tab
-- `0`-`7` - Jump directly to a tab by index
+- `0`-`8` - Jump directly to a tab by index
 - `q`, `Q` - Quit application
 - `?` - Show/hide help modal
 

{benchlab_pytools-3.3.0 → benchlab_pytools-3.4.0}/benchlab/tui/config.py

@@ -29,7 +29,8 @@ TAB_NAMES = [
     "12VHPWR",
     "Voltage",
     "Temperature",
-    "Fans"]
+    "Fans",
+    "Faults"]
 
 # Statistics display width
 STAT_COLUMN_WIDTH = 10
@@ -323,6 +324,18 @@ class Layout:
         'STATS': 52,            # Statistics column
     }
 
+    # Faults tab column positions — two-column grid (17 rows each) so all
+    # 34 Fault enum members fit on one screen under MIN_TERMINAL_ROWS/COLS.
+    FAULT_COLS = {
+        'NAME': 2,              # Fault name column (left grid column)
+        'ACTIVE': 26,           # Active status column (left grid column)
+        'LOGGED': 36,           # Logged status column (left grid column)
+        'NAME2': 48,            # Fault name column (right grid column)
+        'ACTIVE2': 72,          # Active status column (right grid column)
+        'LOGGED2': 82,          # Logged status column (right grid column)
+    }
+    FAULT_ROWS_PER_COL = 17     # Rows per grid column (34 faults / 2)
+
 
 # ═══════════════════════════════════════════════════════════════════════════════
 #  Help Text