From 81782243ab4f0e44576926076d838c6bc1714ad1 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Tue, 7 Apr 2026 16:13:44 +0800 Subject: [PATCH] fix(ble_log_console): reorder imports to satisfy pre-commit hook --- tools/bt/ble_log_console/conftest.py | 1 - tools/bt/ble_log_console/src/__init__.py | 1 - .../bt/ble_log_console/src/backend/checksum.py | 2 -- .../src/backend/stats/__init__.py | 6 ++---- .../src/backend/stats/buf_util.py | 1 - .../src/backend/stats/firmware_loss.py | 2 -- .../src/backend/stats/firmware_written.py | 1 - .../src/backend/stats/peak_burst.py | 2 -- .../src/backend/stats/transport.py | 2 -- .../bt/ble_log_console/src/frontend/log_view.py | 2 -- .../src/frontend/shortcut_screen.py | 2 -- .../src/frontend/stats_screen.py | 17 +++++++---------- tools/bt/ble_log_console/tests/helpers.py | 1 - tools/bt/ble_log_console/tests/test_buf_util.py | 1 - tools/bt/ble_log_console/tests/test_checksum.py | 1 - .../ble_log_console/tests/test_firmware_loss.py | 1 - .../tests/test_firmware_written.py | 1 - .../tests/test_internal_decoder.py | 1 - .../ble_log_console/tests/test_launch_screen.py | 1 - .../bt/ble_log_console/tests/test_peak_burst.py | 5 ++--- .../bt/ble_log_console/tests/test_transport.py | 1 - .../tests/test_uart_transport.py | 1 - 22 files changed, 11 insertions(+), 42 deletions(-) diff --git a/tools/bt/ble_log_console/conftest.py b/tools/bt/ble_log_console/conftest.py index 0ad3a62cc77..272a2fee7b7 100644 --- a/tools/bt/ble_log_console/conftest.py +++ b/tools/bt/ble_log_console/conftest.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - import sys from pathlib import Path diff --git a/tools/bt/ble_log_console/src/__init__.py b/tools/bt/ble_log_console/src/__init__.py index 3609c82fad9..01d90b52da3 100644 --- a/tools/bt/ble_log_console/src/__init__.py +++ b/tools/bt/ble_log_console/src/__init__.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - import sys if sys.version_info < (3, 10): # noqa: UP036 — runtime guard for users on old Python diff --git a/tools/bt/ble_log_console/src/backend/checksum.py b/tools/bt/ble_log_console/src/backend/checksum.py index 227193cef71..634076634c2 100644 --- a/tools/bt/ble_log_console/src/backend/checksum.py +++ b/tools/bt/ble_log_console/src/backend/checksum.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Checksum implementations matching BLE Log firmware (ble_log_util.c). Two algorithms: @@ -11,7 +10,6 @@ The firmware's ror32 alignment compensation makes the XOR checksum alignment-independent — simple word-by-word XOR produces the same result regardless of the original buffer alignment. """ - import struct diff --git a/tools/bt/ble_log_console/src/backend/stats/__init__.py b/tools/bt/ble_log_console/src/backend/stats/__init__.py index e162df47761..ded0f8cffbb 100644 --- a/tools/bt/ble_log_console/src/backend/stats/__init__.py +++ b/tools/bt/ble_log_console/src/backend/stats/__init__.py @@ -1,13 +1,11 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Stats package -- re-exports for backward-compatible imports.""" - from src.backend.stats.accumulator import StatsAccumulator from src.backend.stats.firmware_loss import FirmwareLossTracker from src.backend.stats.firmware_written import FirmwareWrittenTracker -from src.backend.stats.peak_burst import WRITE_RATE_WINDOW_MS from src.backend.stats.peak_burst import PeakBurstTracker +from src.backend.stats.peak_burst import WRITE_RATE_WINDOW_MS from src.backend.stats.sn_gap import REORDER_WINDOW from src.backend.stats.sn_gap import SN_MAX from src.backend.stats.sn_gap import SNGapTracker @@ -16,8 +14,8 @@ from src.backend.stats.traffic_spike import TRAFFIC_THRESHOLD_PCT from src.backend.stats.traffic_spike import TRAFFIC_WINDOW_SEC from src.backend.stats.traffic_spike import TrafficSpikeDetector from src.backend.stats.traffic_spike import TrafficSpikeResult -from src.backend.stats.transport import UART_BITS_PER_BYTE from src.backend.stats.transport import TransportMetrics +from src.backend.stats.transport import UART_BITS_PER_BYTE __all__ = [ 'FirmwareLossTracker', diff --git a/tools/bt/ble_log_console/src/backend/stats/buf_util.py b/tools/bt/ble_log_console/src/backend/stats/buf_util.py index 7b2d952b140..9449b077736 100644 --- a/tools/bt/ble_log_console/src/backend/stats/buf_util.py +++ b/tools/bt/ble_log_console/src/backend/stats/buf_util.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from __future__ import annotations from src.backend.models import BufUtilEntry diff --git a/tools/bt/ble_log_console/src/backend/stats/firmware_loss.py b/tools/bt/ble_log_console/src/backend/stats/firmware_loss.py index c6f4ca898e8..2b8b36fe3c6 100644 --- a/tools/bt/ble_log_console/src/backend/stats/firmware_loss.py +++ b/tools/bt/ble_log_console/src/backend/stats/firmware_loss.py @@ -1,11 +1,9 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Firmware ENH_STAT loss tracking with incremental delta accumulation. Resilient to firmware counter resets from ``ble_log_bench_reset_stat``. """ - from src.backend.models import LossSnapshot from src.backend.models import SourceCode diff --git a/tools/bt/ble_log_console/src/backend/stats/firmware_written.py b/tools/bt/ble_log_console/src/backend/stats/firmware_written.py index 08a23b45dfa..88fe73a421a 100644 --- a/tools/bt/ble_log_console/src/backend/stats/firmware_written.py +++ b/tools/bt/ble_log_console/src/backend/stats/firmware_written.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from src.backend.models import SourceCode diff --git a/tools/bt/ble_log_console/src/backend/stats/peak_burst.py b/tools/bt/ble_log_console/src/backend/stats/peak_burst.py index 142253e5bf7..e019de14021 100644 --- a/tools/bt/ble_log_console/src/backend/stats/peak_burst.py +++ b/tools/bt/ble_log_console/src/backend/stats/peak_burst.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Sliding-window peak write burst tracker. Tracks the densest burst of log writes within a configurable time window @@ -12,7 +11,6 @@ happen at microsecond frequency, many frames share the same ms timestamp. Instead of computing an inaccurate fps, we count frames and bytes within the densest window. """ - from collections import deque from src.backend.models import PeakBurstSnapshot diff --git a/tools/bt/ble_log_console/src/backend/stats/transport.py b/tools/bt/ble_log_console/src/backend/stats/transport.py index 45507db7827..47e0e437d38 100644 --- a/tools/bt/ble_log_console/src/backend/stats/transport.py +++ b/tools/bt/ble_log_console/src/backend/stats/transport.py @@ -1,8 +1,6 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Transport-layer metrics: RX bytes, throughput (bps), frame rate (fps).""" - from src.backend.models import TransportSnapshot UART_BITS_PER_BYTE = 10 # 8 data + 1 start + 1 stop diff --git a/tools/bt/ble_log_console/src/frontend/log_view.py b/tools/bt/ble_log_console/src/frontend/log_view.py index 9bd7309f1cc..c0322be221b 100644 --- a/tools/bt/ble_log_console/src/frontend/log_view.py +++ b/tools/bt/ble_log_console/src/frontend/log_view.py @@ -1,11 +1,9 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Scrollable log view widget. See Spec Section 11. """ - from rich.text import Text from textual.widgets import RichLog diff --git a/tools/bt/ble_log_console/src/frontend/shortcut_screen.py b/tools/bt/ble_log_console/src/frontend/shortcut_screen.py index db7dda2c5c9..615ebd95b82 100644 --- a/tools/bt/ble_log_console/src/frontend/shortcut_screen.py +++ b/tools/bt/ble_log_console/src/frontend/shortcut_screen.py @@ -1,11 +1,9 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Modal screen showing available keyboard shortcuts. Pushed by the 'h' keybinding; dismissed by Escape or 'h' again. """ - from rich.table import Table from textual.app import ComposeResult from textual.binding import Binding diff --git a/tools/bt/ble_log_console/src/frontend/stats_screen.py b/tools/bt/ble_log_console/src/frontend/stats_screen.py index 8bfbdd1947e..2d42e4d259d 100644 --- a/tools/bt/ble_log_console/src/frontend/stats_screen.py +++ b/tools/bt/ble_log_console/src/frontend/stats_screen.py @@ -1,32 +1,29 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - """Modal screen for per-source frame statistics display. Pushed by the 'd' keybinding; dismissed by Escape or 'd' again. Refreshes every second to show live throughput data. """ - from __future__ import annotations from typing import TYPE_CHECKING from rich.table import Table from rich.text import Text +from src.backend.models import BufUtilEntry +from src.backend.models import format_bytes +from src.backend.models import format_throughput +from src.backend.models import FunnelSnapshot +from src.backend.models import resolve_lbm_name +from src.backend.models import resolve_pool_name +from src.backend.models import resolve_source_name from textual.app import ComposeResult from textual.binding import Binding from textual.containers import Vertical from textual.screen import ModalScreen from textual.widgets import Static -from src.backend.models import BufUtilEntry -from src.backend.models import FunnelSnapshot -from src.backend.models import format_bytes -from src.backend.models import format_throughput -from src.backend.models import resolve_lbm_name -from src.backend.models import resolve_pool_name -from src.backend.models import resolve_source_name - if TYPE_CHECKING: from src.app import BLELogApp diff --git a/tools/bt/ble_log_console/tests/helpers.py b/tools/bt/ble_log_console/tests/helpers.py index 8c8ea283c6a..6059720dc8b 100644 --- a/tools/bt/ble_log_console/tests/helpers.py +++ b/tools/bt/ble_log_console/tests/helpers.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - import struct from collections.abc import Callable diff --git a/tools/bt/ble_log_console/tests/test_buf_util.py b/tools/bt/ble_log_console/tests/test_buf_util.py index c6e211a4f3b..d6f9ba5660a 100644 --- a/tools/bt/ble_log_console/tests/test_buf_util.py +++ b/tools/bt/ble_log_console/tests/test_buf_util.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from src.backend.stats.buf_util import BufUtilTracker diff --git a/tools/bt/ble_log_console/tests/test_checksum.py b/tools/bt/ble_log_console/tests/test_checksum.py index b67f229da40..c0a01e17d99 100644 --- a/tools/bt/ble_log_console/tests/test_checksum.py +++ b/tools/bt/ble_log_console/tests/test_checksum.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from src.backend.checksum import sum_checksum from src.backend.checksum import xor_checksum diff --git a/tools/bt/ble_log_console/tests/test_firmware_loss.py b/tools/bt/ble_log_console/tests/test_firmware_loss.py index e346d22dfe9..7117e3cda1e 100644 --- a/tools/bt/ble_log_console/tests/test_firmware_loss.py +++ b/tools/bt/ble_log_console/tests/test_firmware_loss.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from src.backend.stats.firmware_loss import FirmwareLossTracker diff --git a/tools/bt/ble_log_console/tests/test_firmware_written.py b/tools/bt/ble_log_console/tests/test_firmware_written.py index 2112b0a4815..fe6431e13be 100644 --- a/tools/bt/ble_log_console/tests/test_firmware_written.py +++ b/tools/bt/ble_log_console/tests/test_firmware_written.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from src.backend.stats.firmware_written import FirmwareWrittenTracker diff --git a/tools/bt/ble_log_console/tests/test_internal_decoder.py b/tools/bt/ble_log_console/tests/test_internal_decoder.py index e48892ef177..07b31ab1ac4 100644 --- a/tools/bt/ble_log_console/tests/test_internal_decoder.py +++ b/tools/bt/ble_log_console/tests/test_internal_decoder.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - import struct from src.backend.internal_decoder import decode_internal_frame diff --git a/tools/bt/ble_log_console/tests/test_launch_screen.py b/tools/bt/ble_log_console/tests/test_launch_screen.py index cffd4442aa9..b3e91cc7234 100644 --- a/tools/bt/ble_log_console/tests/test_launch_screen.py +++ b/tools/bt/ble_log_console/tests/test_launch_screen.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from pathlib import Path from unittest.mock import MagicMock from unittest.mock import patch diff --git a/tools/bt/ble_log_console/tests/test_peak_burst.py b/tools/bt/ble_log_console/tests/test_peak_burst.py index bc650b69299..fa1907dd2df 100644 --- a/tools/bt/ble_log_console/tests/test_peak_burst.py +++ b/tools/bt/ble_log_console/tests/test_peak_burst.py @@ -1,9 +1,8 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - -from src.backend.stats.peak_burst import WRITE_RATE_WINDOW_MS -from src.backend.stats.peak_burst import PeakBurstTracker from src.backend.stats.peak_burst import _ts_delta_ms +from src.backend.stats.peak_burst import PeakBurstTracker +from src.backend.stats.peak_burst import WRITE_RATE_WINDOW_MS _SRC = 1 _SRC_B = 2 diff --git a/tools/bt/ble_log_console/tests/test_transport.py b/tools/bt/ble_log_console/tests/test_transport.py index 22a354abafe..bae8ec4887a 100644 --- a/tools/bt/ble_log_console/tests/test_transport.py +++ b/tools/bt/ble_log_console/tests/test_transport.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from src.backend.stats.transport import TransportMetrics diff --git a/tools/bt/ble_log_console/tests/test_uart_transport.py b/tools/bt/ble_log_console/tests/test_uart_transport.py index c395e97150e..80b148d1682 100644 --- a/tools/bt/ble_log_console/tests/test_uart_transport.py +++ b/tools/bt/ble_log_console/tests/test_uart_transport.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - from unittest.mock import patch from src.backend.uart_transport import validate_uart_port