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

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

@@ -4,6 +4,32 @@ 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.2] - 2026-08-18
+
+### Fixed
+- Several f-strings had their `{...}` expression split across a line
+  break, which is [PEP 701](https://peps.python.org/pep-0701/) syntax
+  only valid on Python 3.12+. Despite `requires-python = ">=3.10"`, this
+  raised `SyntaxError` immediately on 3.10/3.11 (e.g. `benchlab -tui`
+  failing with `SyntaxError: unterminated string literal` in
+  `benchlab/core/datasource.py`) — invisible in CI since every workflow
+  pins Python 3.13. Collapsed all such f-strings back onto single lines
+  across 27 files.
+
+## [3.0.1] - 2026-08-18
+
+### Fixed
+- PyPI install was broken: `bootstrap.py` and the core `requirements.txt`
+  lived at the repo root and were never included in the wheel (only
+  `benchlab/` is packaged), so `pip install benchlab-pytools` followed by
+  `benchlab ...` failed with `ModuleNotFoundError: No module named
+  'bootstrap'`. Both files moved into `benchlab/`, with internal imports
+  updated to relative imports.
+- `pywin32` was missing from `pyproject.toml`'s core dependencies, so
+  PyPI installs on Windows did not pull it in despite the `named_pipe`
+  data source depending on it. Added `pywin32>=306; platform_system ==
+  'Windows'` alongside the existing `windows-curses` entry.
+
 ## [3.0.0] - 2026-08-15
 
 ### Added
@@ -41,4 +67,6 @@ 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.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.0 → benchlab_pytools-3.0.2}/CONTRIBUTING.md

@@ -5,7 +5,7 @@
 ```bash
 git clone https://github.com/BenchLab-io/benchlab-pytools.git
 cd benchlab-pytools
-pip install -r requirements.txt
+pip install -r benchlab/requirements.txt
 pip install -r benchlab/csv_log/requirements.txt
 pip install -r benchlab/graph/requirements.txt
 pip install -r benchlab/wigidash/requirements.txt

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: benchlab-pytools
-Version: 3.0.0
+Version: 3.0.2
 Summary: Python control suite for BENCHLAB telemetry devices
 Project-URL: Homepage, https://benchlab.io/
 Project-URL: Repository, https://github.com/BenchLab-io/benchlab-pytools
@@ -25,6 +25,7 @@ Requires-Python: >=3.10
 Requires-Dist: benchlab-pycore>=0.5.1
 Requires-Dist: packaging<26.0,>=23.0
 Requires-Dist: python-dotenv<2.0,>=1.0.0
+Requires-Dist: pywin32>=306; platform_system == 'Windows'
 Requires-Dist: textual<9.0,>=0.60
 Requires-Dist: windows-curses>=2.4.1; platform_system == 'Windows'
 Provides-Extra: all
@@ -111,8 +112,18 @@ All tools share a common data-source layer, so the same telemetry can be read di
 
 Requires Python 3.10+.
 
+### From PyPI
+
+```bash
+pip install benchlab-pytools
+```
+
+This installs a `benchlab` console command on your PATH (see [Command-Line Flags](#command-line-flags) below). Install with extras for the tools you need, e.g. `pip install "benchlab-pytools[tui]"`.
+
+### From source
+
 ```bash
-pip install -r requirements.txt
+pip install -r benchlab/requirements.txt
 ```
 
 Each tool has its own `requirements.txt` (e.g. `benchlab/graph/requirements.txt`, `benchlab/vu/requirements.txt`). The launcher installs a tool's requirements automatically the first time it's run — you generally don't need to install them by hand.
@@ -135,11 +146,17 @@ or equivalently:
 python -m benchlab
 ```
 
+If installed from PyPI, use the `benchlab` command instead:
+
+```bash
+benchlab
+```
+
 The interactive menu (prompt_toolkit-based, with a plain-input fallback if `prompt_toolkit` isn't installed) lets you pick a data source and one or more tools, then launches them — installing any missing per-tool dependencies along the way.
 
 ### Command-Line Flags
 
-Each tool can also be launched directly with a flag:
+Each tool can also be launched directly with a flag. If installed from PyPI, replace `python -m benchlab` with `benchlab` in the examples below (e.g. `benchlab -tui`).
 
 ```bash
 python -m benchlab -tui         # Interactive terminal dashboard

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/README.md

@@ -21,8 +21,18 @@ All tools share a common data-source layer, so the same telemetry can be read di
 
 Requires Python 3.10+.
 
+### From PyPI
+
+```bash
+pip install benchlab-pytools
+```
+
+This installs a `benchlab` console command on your PATH (see [Command-Line Flags](#command-line-flags) below). Install with extras for the tools you need, e.g. `pip install "benchlab-pytools[tui]"`.
+
+### From source
+
 ```bash
-pip install -r requirements.txt
+pip install -r benchlab/requirements.txt
 ```
 
 Each tool has its own `requirements.txt` (e.g. `benchlab/graph/requirements.txt`, `benchlab/vu/requirements.txt`). The launcher installs a tool's requirements automatically the first time it's run — you generally don't need to install them by hand.
@@ -45,11 +55,17 @@ or equivalently:
 python -m benchlab
 ```
 
+If installed from PyPI, use the `benchlab` command instead:
+
+```bash
+benchlab
+```
+
 The interactive menu (prompt_toolkit-based, with a plain-input fallback if `prompt_toolkit` isn't installed) lets you pick a data source and one or more tools, then launches them — installing any missing per-tool dependencies along the way.
 
 ### Command-Line Flags
 
-Each tool can also be launched directly with a flag:
+Each tool can also be launched directly with a flag. If installed from PyPI, replace `python -m benchlab` with `benchlab` in the examples below (e.g. `benchlab -tui`).
 
 ```bash
 python -m benchlab -tui         # Interactive terminal dashboard

benchlab_pytools-3.0.2/benchlab/__init__.py

@@ -0,0 +1,5 @@
+"""
+BENCHLAB Telemetry Package
+"""
+
+__version__ = "3.0.2"

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2/benchlab}/bootstrap.py

@@ -149,7 +149,6 @@ def install_core_requirements():
     req_file = BASE_DIR / "requirements.txt"
 
     if not req_file.exists():
-        logger.warning("No global requirements.txt found")
         return
 
     install_requirements_file(str(req_file), "CORE")

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/config/config_client.py

@@ -177,8 +177,8 @@ class DirectConfigClient(ConfigClient):
 
         self.product_id = info.get('ProductId')
         logger.info(
-            f"Connected to device on {port}, Product ID: 0x{
-                self.product_id:02X}")
+            f"Connected to device on {port}, "
+            f"Product ID: 0x{self.product_id:02X}")
 
     def get_device_info(self) -> Optional[Dict[str, Any]]:
         """Get device information."""
@@ -465,8 +465,7 @@ class NamedPipeConfigClient(ConfigClient):
             win32pipe.WaitNamedPipe(path, 5000)
         except pywintypes.error as e:
             raise ConnectionError(
-                f"Pipe '{
-                    self.pipe_name}' not available: {e}") from e
+                f"Pipe '{self.pipe_name}' not available: {e}") from e
 
         self.handle = win32file.CreateFile(
             path,

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/config/config_manager.py

@@ -55,8 +55,7 @@ class ConfigManager:
             from benchlab_pycore.core import get_fleet_info
             devices = get_fleet_info()
             logger.info(
-                f"Discovered {
-                    len(devices)} device(s) via direct serial")
+                f"Discovered {len(devices)} device(s) via direct serial")
             return devices
         except Exception as e:
             logger.error(f"Failed to discover direct devices: {e}")
@@ -357,8 +356,8 @@ class ConfigManager:
                     device_config.selector.model_dump(), devices)
                 if not identifier:
                     logger.error(
-                        f"Device not found matching selector: {
-                            device_config.selector}")
+                        "Device not found matching selector: "
+                        f"{device_config.selector}")
                     continue
 
                 logger.info(f"Selected: {identifier}")
@@ -453,8 +452,8 @@ class ConfigManager:
                         if not client.write_fan_config(
                                 profile.profileId, fan_id, fan_dict):
                             logger.error(
-                                f"Failed to write fan config {
-                                    profile.profileId}/{fan_id}")
+                                "Failed to write fan config "
+                                f"{profile.profileId}/{fan_id}")
                             success = False
 
             # Apply RGB profiles

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

@@ -372,8 +372,7 @@ class FastAPIDataSource(DataSource):
                 return True
             else:
                 logger.error(
-                    f"FastAPI health check returned {
-                        response.status_code}")
+                    f"FastAPI health check returned {response.status_code}")
         except Exception as e:
             logger.error(f"Failed to connect to FastAPI server: {e}")
 
@@ -1025,9 +1024,8 @@ class ServiceHttpDataSource(DataSource):
 
         if resp.status_code != 200:
             logger.error(
-                f"BenchLab service health check failed (HTTP {
-                    resp.status_code}) " f"at {
-                    self.base_url}/health")
+                f"BenchLab service health check failed "
+                f"(HTTP {resp.status_code}) at {self.base_url}/health")
             return False
 
         # Fetch initial device list
@@ -1051,8 +1049,7 @@ class ServiceHttpDataSource(DataSource):
             target=self._worker_loop, daemon=True)
         self._worker_thread.start()
         logger.info(
-            f"Connected to BenchLab service HTTP API at {
-                self.base_url}")
+            f"Connected to BenchLab service HTTP API at {self.base_url}")
         return True
 
     def disconnect(self) -> None:

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/core/datasource_manager.py

@@ -109,14 +109,14 @@ class DataSourceManager:
             self._datasource = create_datasource(self.source_type, **kwargs)
 
             if not self._datasource.connect():
-                self._last_error = f"Failed to connect to {
-                    self.source_type} datasource"
+                self._last_error = (
+                    f"Failed to connect to {self.source_type} datasource")
                 return False
 
             devices = self._datasource.list_devices()
             if not devices:
-                self._last_error = f"No devices available via {
-                    self.source_type}"
+                self._last_error = (
+                    f"No devices available via {self.source_type}")
                 return False
 
             if uid and any(d.get('uid') == uid for d in devices):
@@ -153,9 +153,8 @@ class DataSourceManager:
             self._worker_thread.start()
 
             logger.info(
-                f"Connected to {
-                    self.source_type} datasource, selected device: {
-                    self._selected_uid}")
+                f"Connected to {self.source_type} datasource, "
+                f"selected device: {self._selected_uid}")
             return True
 
         except Exception as e:

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/core/infrastructure.py

@@ -80,9 +80,8 @@ class InfrastructureManager:
                 return True
 
             logger.info(
-                f"Starting FastAPI server on {
-                    self.fastapi_host}:{
-                    self.fastapi_port}")
+                f"Starting FastAPI server on "
+                f"{self.fastapi_host}:{self.fastapi_port}")
 
             try:
                 # Start FastAPI server as subprocess
@@ -107,8 +106,8 @@ class InfrastructureManager:
                     if self._wait_for_port(
                             self.fastapi_host, self.fastapi_port, timeout):
                         logger.info(
-                            f"FastAPI server started on port {
-                                self.fastapi_port}")
+                            "FastAPI server started on port "
+                            f"{self.fastapi_port}")
                         return True
                     else:
                         logger.error("FastAPI server failed to start")
@@ -171,9 +170,8 @@ class InfrastructureManager:
                 return True
 
             logger.info(
-                f"Starting MQTT publisher to {
-                    self.mqtt_broker}:{
-                    self.mqtt_port}")
+                f"Starting MQTT publisher to "
+                f"{self.mqtt_broker}:{self.mqtt_port}")
 
             try:
                 self._stop_event.clear()

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/core/process_manager.py

@@ -248,8 +248,7 @@ class ProcessManager:
                             os.path.abspath(__file__)),
                         "..",
                         "logs",
-                        f"svc_{
-                            mp.name}")
+                        f"svc_{mp.name}")
                     with open(f"{log_base}_stderr.log", "r",
                               encoding="utf-8") as f:
                         mp.stderr_log = f.read()

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/core/statistics.py

@@ -202,10 +202,9 @@ class StatsFormatter:
         if min_val is None or max_val is None or avg_val is None:
             return ""
 
-        return f"{
-            min_val:.{decimals}f}-{
-            max_val:.{decimals}f} ~{
-            avg_val:.{decimals}f}{unit}"
+        return (
+            f"{min_val:.{decimals}f}-{max_val:.{decimals}f} "
+            f"~{avg_val:.{decimals}f}{unit}")
 
 
 # Convenience function for creating a stats callback

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/csv_log/csv_logger_enhanced.py

@@ -141,10 +141,8 @@ class EnhancedCSVLogger:
         print("\n--- Available Devices ---")
         for i, dev in enumerate(devices, 1):
             print(
-                f"  {i}: Port: {
-                    dev.port:<12} UID: {
-                    dev.uid}  FW: {
-                    dev.firmware}")
+                f"  {i}: Port: {dev.port:<12} UID: {dev.uid}  "
+                f"FW: {dev.firmware}")
 
         selection = input(
             "\nEnter device numbers (comma-separated), 'all', "

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/csv_log/message_batcher.py

@@ -95,9 +95,7 @@ class MessageBatcher:
                     (self.metrics.avg_flush_time * (n - 1) + elapsed) / n
                 )
             self.logger.debug(
-                f"Flushed {
-                    len(messages_to_flush)} messages in {
-                    elapsed:.3f}s")
+                f"Flushed {len(messages_to_flush)} messages in {elapsed:.3f}s")
             return True
 
         except Exception as e:
@@ -222,8 +220,7 @@ class CSVBatchWriter:
                 elif self.format == "json":
                     self._write_json_batch(file_info, messages_to_write)
                 self.logger.debug(
-                    f"Wrote {
-                        len(messages_to_write)} rows for {uid}")
+                    f"Wrote {len(messages_to_write)} rows for {uid}")
             except Exception as e:
                 self.logger.error(f"Failed to write batch for {uid}: {e}")
                 buf.extend(messages_to_write)  # restore on failure

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/csv_log/smart_retry.py

@@ -104,8 +104,8 @@ class CircuitBreaker:
         if (self.config.circuit_breaker_enabled and
                 self.failure_count >= self.config.circuit_failure_threshold):
             self.logger.warning(
-                f"Circuit breaker: opening after {
-                    self.failure_count} failures")
+                "Circuit breaker: opening after "
+                f"{self.failure_count} failures")
             self.state = CircuitState.OPEN
 
 
@@ -144,9 +144,8 @@ class SmartRetryManager:
 
                 if attempt == self.config.max_retries:
                     self.logger.error(
-                        f"Max retries ({
-                            self.config.max_retries}) exceeded for {
-                            func.__name__}")
+                        f"Max retries ({self.config.max_retries}) "
+                        f"exceeded for {func.__name__}")
                     raise e
 
                 # Calculate delay
@@ -242,9 +241,8 @@ class AdaptiveRetryManager:
 
                 if attempt == self.config.max_retries:
                     self.logger.error(
-                        f"Max retries ({
-                            self.config.max_retries}) exceeded for {
-                            func.__name__}")
+                        f"Max retries ({self.config.max_retries}) "
+                        f"exceeded for {func.__name__}")
                     raise e
 
                 # Calculate adaptive delay

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/graph/app.py

@@ -263,12 +263,15 @@ class GraphApp:
                                             min_y - margin, max_y + margin)
 
                     s = self.session_stats
-                    min_text = f"Min: {
-                        s['min']:.2f}" if s["min"] is not None else "Min: --"
-                    max_text = f"Max: {
-                        s['max']:.2f}" if s["max"] is not None else "Max: --"
-                    avg_text = f"Avg: {
-                        s['avg']:.2f}" if s["avg"] is not None else "Avg: --"
+                    min_text = (
+                        f"Min: {s['min']:.2f}"
+                        if s["min"] is not None else "Min: --")
+                    max_text = (
+                        f"Max: {s['max']:.2f}"
+                        if s["max"] is not None else "Max: --")
+                    avg_text = (
+                        f"Avg: {s['avg']:.2f}"
+                        if s["avg"] is not None else "Avg: --")
                     for tag, text in (
                             ("graph_min", min_text),
                             ("graph_min_float", min_text),

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/hwinfo/hwinfo_export.py

@@ -71,8 +71,7 @@ def write_hwinfo_sensor(device_name, sensor_type, idx, name, value, unit=None):
             # Write Value
             if isinstance(value, float):
                 winreg.SetValueEx(
-                    key, "Value", 0, winreg.REG_SZ, f"{
-                        value:.3f}")
+                    key, "Value", 0, winreg.REG_SZ, f"{value:.3f}")
             else:
                 winreg.SetValueEx(key, "Value", 0, winreg.REG_SZ, str(value))
 
@@ -156,8 +155,7 @@ def _export_grouped(device_name: str, grouped_sensors: dict):
             write_hwinfo_sensor(device_name, group, idx, key, value, unit)
 
     summary = ", ".join(
-        f"{k}: {
-            len(v)}" for k,
+        f"{k}: {len(v)}" for k,
         v in grouped_sensors.items() if v)
     logger.debug("Device %s export summary: %s", device_name, summary)
 
@@ -308,8 +306,8 @@ def export_all_devices(update_interval=1, datasource=None):
             "HWiNFO export is only supported on Windows. "
             "Please run on a Windows system.")
         raise RuntimeError(
-            f"HWiNFO export requires Windows. Current platform: {
-                sys.platform}")
+            "HWiNFO export requires Windows. "
+            f"Current platform: {sys.platform}")
 
     # Remove only old BenchLab entries, not user-created sensors
     try:

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/link/link_main.py

@@ -217,8 +217,7 @@ class CloudMQTTClient:
                 time.sleep(0.1)
             if not self._connected:
                 logger.error(
-                    f"Timed out connecting to {host}:{
-                        self.cfg['port']}")
+                    f"Timed out connecting to {host}:{self.cfg['port']}")
                 return False
             logger.info(f"Connected to cloud broker {host}:{self.cfg['port']}")
             return True
@@ -229,9 +228,8 @@ class CloudMQTTClient:
     def reconnect(self) -> bool:
         """Attempt to reconnect using a fresh client."""
         logger.info(
-            f"Reconnecting to cloud broker {
-                self.cfg['host']}:{
-                self.cfg['port']}...")
+            f"Reconnecting to cloud broker "
+            f"{self.cfg['host']}:{self.cfg['port']}...")
         try:
             self._client.loop_stop()
         except Exception:

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/menu.py

@@ -23,7 +23,7 @@ import os
 import sys
 from typing import Dict, List, Optional, Tuple, Union
 
-from bootstrap import clear_screen
+from .bootstrap import clear_screen
 from .tools import CONSUMER_TOOLS
 from .sources import (
     check_and_setup_source,

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/menu_classic.py

@@ -11,7 +11,7 @@ import os
 import sys
 from typing import List, Optional
 
-from bootstrap import clear_screen
+from .bootstrap import clear_screen
 from .tools import CONSUMER_TOOLS
 from .sources import (
     check_and_setup_source,

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2/benchlab}/requirements.txt

@@ -22,4 +22,7 @@ paho-mqtt>=2.0,<3.0
 amqtt>=0.12.0,<0.13.0
 
 # Curses-based TUI
-windows-curses>=2.4.1; platform_system=="Windows"
+windows-curses>=2.4.1; platform_system=="Windows"
+
+# Named Pipe Data Source (BL_Service)
+pywin32>=306; platform_system=="Windows"

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/sources.py

@@ -145,12 +145,7 @@ import asyncio
 from amqtt.broker import Broker
 
 config = {{
-    "listeners": {{
-        "default": {{
-            "type": "tcp",
-            "bind": "0.0.0.0:{port}",
-        }},
-    }},
+    "listeners": {{"default": {{"type": "tcp", "bind": "0.0.0.0:{port}"}}}},
     "auth": {{"allow-anonymous": True}},
     "topic-check": {{"enabled": False}},
 }}

{benchlab_pytools-3.0.0 → benchlab_pytools-3.0.2}/benchlab/tools.py

@@ -9,7 +9,7 @@ import importlib.util
 import logging
 from pathlib import Path
 
-from bootstrap import install_requirements_file
+from .bootstrap import install_requirements_file
 
 logger = logging.getLogger("benchlab.launcher")