mpflash 1.26.1__py3-none-any.whl → 1.26.3__py3-none-any.whl

mpflash/__init__.py

@@ -0,0 +1,5 @@
+"""MPFlash - MicroPython firmware flashing tool."""
+
+from .logger import configure_safe_logging, setup_external_logger_safety
+
+__all__ = ["configure_safe_logging", "setup_external_logger_safety"]

mpflash/db/core.py

@@ -14,7 +14,8 @@ from .models import Base
 
 TRACE = False
 connect_str = f"sqlite:///{config.db_path.as_posix()}"
-log.debug(f"Connecting to database at {connect_str}")
+if TRACE:
+    log.debug(f"Connecting to database at {connect_str}")
 engine = create_engine(connect_str, echo=TRACE)
 Session = sessionmaker(bind=engine)
 

mpflash/flash/uf2/__init__.py

@@ -4,18 +4,17 @@ Flash SAMD and RP2 via UF2
 
 import shutil
 import sys
-from pathlib import Path
 import time
+from pathlib import Path
 from typing import Optional
 
 import tenacity
 from loguru import logger as log
-
 from tenacity import stop_after_attempt, wait_fixed
 
+from mpflash.common import PORT_FWTYPES
 from mpflash.mpremoteboard import MPRemoteBoard
 
-from mpflash.common import PORT_FWTYPES
 from .boardid import get_board_id
 from .linux import dismount_uf2_linux, wait_for_UF2_linux
 from .macos import wait_for_UF2_macos
@@ -38,6 +37,10 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
     if ".uf2" not in PORT_FWTYPES[mcu.port]:
         log.error(f"UF2 not supported on {mcu.board} on {mcu.serialport}")
         return None
+    
+    # For non-rp2 ports, remember if we need to erase filesystem after flashing
+    erase_filesystem_after_flash = erase and mcu.port != "rp2"
+    
     if erase:
         if mcu.port == "rp2":
             rp2_erase =Path(__file__).parent.joinpath("../../vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2").resolve()
@@ -52,8 +55,6 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
                 dismount_uf2_linux()
             # allow for MCU restart after erase
             time.sleep(0.5)
-        else:
-            log.warning(f"Erase not (yet) supported on .UF2, for port {mcu.port}, skipping erase.")
 
     destination = waitfor_uf2(board_id=mcu.port.upper())
 
@@ -75,6 +76,16 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         dismount_uf2_linux()
 
     mcu.wait_for_restart()
+    
+    # For non-rp2 UF2 ports (like SAMD), erase filesystem after flash and restart
+    if erase_filesystem_after_flash:
+        # allow for MCU restart after erase
+        time.sleep(0.5)        
+        log.info(f"Erasing {mcu.port} filesystem using mpremote rm -r :/")
+        try:
+            rc, result = mcu.run_command(["rm", "-r", ":/"], timeout=30, resume=True)
+        except Exception as e:
+            log.warning(f"Failed to erase filesystem on {mcu.port}: {e}")
     return mcu
 
 

mpflash/logger.py

@@ -3,6 +3,14 @@ Logger setup for CLI tools with Unicode-safe output.
 
 Ensures log messages are compatible with the current console encoding.
 Removes or replaces Unicode icons if the encoding is not UTF-8.
+Prevents Loguru colorization errors with angle bracket notation.
+
+Usage for external packages:
+    from mpflash.logger import setup_external_logger_safety
+    setup_external_logger_safety()
+
+This is particularly important when using packages like micropython-stubber
+that may log messages containing angle bracket notation like <board_default>.
 """
 
 import functools
@@ -28,12 +36,23 @@ def _is_utf8_encoding() -> bool:
         return False
 
 
-def _log_formatter(record: dict) -> str:
+def _sanitize_message(message: str) -> str:
+    """
+    Sanitize log messages to prevent Loguru colorization issues.
+
+    Escapes angle brackets that could be interpreted as color tags.
+    This prevents errors when logging documentation with placeholders like <board_default>.
+    """
+    # Escape angle brackets to prevent them from being interpreted as color tags
+    return message.replace("<", "\\<").replace(">", "\\>")
+
+
+def _log_formatter(record) -> str:
     """
     Log message formatter for loguru and rich.
 
     Removes Unicode icons if console encoding is not UTF-8.
-    Handles messages containing curly braces safely.
+    Handles messages containing curly braces and angle brackets safely.
     """
     color_map = {
         "TRACE": "cyan",
@@ -50,8 +69,12 @@ def _log_formatter(record: dict) -> str:
         icon = record["level"].icon
     else:
         icon = record["level"].name  # fallback to text
-    # Escape curly braces in the message to prevent format conflicts
-    safe_message = record["message"].replace("{", "{{").replace("}", "}}")
+
+    # Sanitize the message to prevent format conflicts and colorization errors
+    safe_message = _sanitize_message(record["message"])
+    # Escape curly braces to prevent format conflicts
+    safe_message = safe_message.replace("{", "{{").replace("}", "}}")
+
     # Use string concatenation to avoid f-string format conflicts
     time_part = "[not bold green]{time:HH:mm:ss}[/not bold green]"
     message_part = f"[{lvl_color}]{safe_message}[/{lvl_color}]"
@@ -63,6 +86,7 @@ def set_loglevel(loglevel: str) -> None:
     Set the log level for the logger.
 
     Ensures Unicode safety for log output and handles format errors.
+    Disables colorization to prevent angle bracket interpretation issues.
     """
     try:
         log.remove()
@@ -77,7 +101,57 @@ def set_loglevel(loglevel: str) -> None:
             # Fallback to simple text output if formatting fails
             console.print(f"[LOG FORMAT ERROR] {message} (Error: {e})")
 
-    log.add(safe_format_wrapper, level=loglevel.upper(), colorize=False, format=_log_formatter)  # type: ignore
+    # Disable colorization completely to prevent angle bracket interpretation as color tags
+    log.add(
+        safe_format_wrapper,
+        level=loglevel.upper(),
+        colorize=False,  # This prevents Loguru from parsing angle brackets as color tags
+        format=_log_formatter,
+    )  # type: ignore
+
+
+def configure_safe_logging() -> None:
+    """
+    Configure logging to be safe from colorization errors.
+
+    This function helps prevent issues when external packages
+    (like micropython-stubber) log messages with angle brackets
+    that could be misinterpreted as color tags.
+    """
+    # Remove all existing handlers to start fresh
+    try:
+        log.remove()
+    except ValueError:
+        pass
+
+    # Add a completely safe handler with no colorization
+    log.add(
+        sys.stderr,
+        level="TRACE",
+        colorize=False,  # Completely disable colorization
+        format="{time:YYYY-MM-DD HH:mm:ss} | {level} | {name}:{function}:{line} - {message}",
+    )
+
+
+def setup_external_logger_safety() -> None:
+    """
+    Setup safe logging configuration for external packages.
+
+    Call this function before running tools that might log messages
+    with angle bracket notation (like micropython-stubber) to prevent
+    Loguru colorization errors.
+    """
+    import logging
+
+    # Configure the root logger to be safe
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format="%(asctime)s | %(levelname)s | %(name)s:%(funcName)s:%(lineno)d - %(message)s",
+        handlers=[logging.StreamHandler(sys.stderr)],
+    )
+
+    # Also configure loguru for safety
+    configure_safe_logging()
 
 
 def make_quiet() -> None:

mpflash/mpremoteboard/runner.py

@@ -6,6 +6,7 @@ import subprocess
 from dataclasses import dataclass
 from threading import Timer
 from typing import List, Optional, Tuple
+from unittest.mock import DEFAULT
 
 from loguru import logger as log
 
@@ -31,6 +32,13 @@ DEFAULT_RESET_TAGS = [
     "rst:0x10 (RTCWDT_RTC_RESET)",
 ]
 
+DEFAULT_ERROR_TAGS = ["Traceback ", "Error: ", "Exception: ", "ERROR :", "CRIT  :"]
+DEFAULT_WARNING_TAGS = ["WARN  :", "TRACE :"]
+DEFAULT_SUCCESS_TAGS = ["Done", "File saved", "File removed", "File renamed"]
+DEFAULT_IGNORE_TAGS = [
+    '  File "<stdin>",',
+    "mpremote: rm -r: cannot remove :/ Operation not permitted",
+]
 
 def run(
     cmd: List[str],
@@ -70,13 +78,13 @@ def run(
     if not reset_tags:
         reset_tags = DEFAULT_RESET_TAGS
     if not error_tags:
-        error_tags = ["Traceback ", "Error: ", "Exception: ", "ERROR :", "CRIT  :"]
+        error_tags = DEFAULT_ERROR_TAGS
     if not warning_tags:
-        warning_tags = ["WARN  :", "TRACE :"]
+        warning_tags = DEFAULT_WARNING_TAGS
     if not success_tags:
-        success_tags = []
+        success_tags = DEFAULT_SUCCESS_TAGS
     if not ignore_tags:
-        ignore_tags = ['  File "<stdin>",']
+        ignore_tags = DEFAULT_IGNORE_TAGS
 
     replace_tags = ["\x1b[1A"]
 
@@ -132,6 +140,8 @@ def run(
                         log.info(line)
         if proc.stderr and log_errors:
             for line in proc.stderr:
+                if any(tag in line for tag in ignore_tags):
+                    continue
                 log.warning(line)
     except UnicodeDecodeError as e:
         log.error(f"Failed to decode output: {e}")

{mpflash-1.26.1.dist-info → mpflash-1.26.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpflash
-Version: 1.26.1
+Version: 1.26.3
 Summary: Flash and download tool for MicroPython firmwares
 Project-URL: Homepage, https://github.com/Josverl/mpflash
 Project-URL: Documentation, https://github.com/Josverl/mpflash/blob/main/README.md
@@ -29,7 +29,7 @@ Requires-Dist: bincopy>=20.0.0
 Requires-Dist: blkinfo>=0.2.0
 Requires-Dist: cache-to-disk>=2.0.0
 Requires-Dist: cachetools>=5.3.0
-Requires-Dist: esptool>=4.7.0
+Requires-Dist: esptool<5.0.0,>=4.7.0
 Requires-Dist: inquirer>=3.2.4
 Requires-Dist: jsonlines>=4.0.0
 Requires-Dist: jsons>=1.6.3
@@ -52,8 +52,6 @@ Provides-Extra: dev
 Requires-Dist: ipykernel>=6.29.5; extra == 'dev'
 Requires-Dist: pandas>=2.2.3; extra == 'dev'
 Requires-Dist: tornado>=6.5; extra == 'dev'
-Provides-Extra: perf
-Requires-Dist: scalene>=1.5.51; extra == 'perf'
 Provides-Extra: test
 Requires-Dist: coverage<8.0.0,>=6.4.3; extra == 'test'
 Requires-Dist: distro>=1.8.0; extra == 'test'

{mpflash-1.26.1.dist-info → mpflash-1.26.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mpflash/__init__.py,sha256=1CcA1kUb3uUfa9N5O4T4ZQh-Ph0JMFAtBG5IiDIaNVg,201
 mpflash/ask_input.py,sha256=YUx65Xwj6dNPwWcbQiWG7U4wDW69zEdno2HcT1KwPBg,8886
 mpflash/basicgit.py,sha256=lpGQxL10Mq8D8S56h87aMrBH0vo18ji_hE9v0KJ9P-o,10245
 mpflash/cli_add.py,sha256=hI-o-9hAGD3U8cbpXvy9Nuv1KHNTZ6mS57LC4BTBtj8,3495
@@ -13,7 +13,7 @@ mpflash/connected.py,sha256=SZvqbnLztJH-DBByjGrWT24S5DGTSevWSwYncH6dFqk,3707
 mpflash/downloaded.py,sha256=xaeMYrTIGj_v4scUBojeJPL-U1kWJG-bdvkvJMbPh4Q,4218
 mpflash/errors.py,sha256=IAidY3qkZsXy6Pm1rdmVFmGyg81ywHhse3itaPctA2w,247
 mpflash/list.py,sha256=IrJa3UBjhHHfStbb9fPVYA8JJzoFTyXtbcKGNRSH8sE,4132
-mpflash/logger.py,sha256=XLu4VzMhMPlCdOo2HeS4GfyatE1swwwonV8c6a-GoD4,2651
+mpflash/logger.py,sha256=h1Ra-uYCVqC2evuDoIoD7GGhTHK-ymkAuqNUsPdZHcI,5212
 mpflash/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/versions.py,sha256=HuujLNdMKY_mQXyEqwXVHcU8nbuXeBiWP2TMA5JQhr4,4884
 mpflash/bootloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,7 @@ mpflash/bootloader/touch1200.py,sha256=VND7_YniS9Vx6WEaAxjI72RZZ6WBOwmBTsKJkbuaA
 mpflash/custom/__init__.py,sha256=l9RU9hRm9j7IuRgacw-gHYjA2Op-5prvRO5yyODhFMQ,5269
 mpflash/custom/naming.py,sha256=uHQzFIDzuWQUNajeGSUcf_A-o7cxX37kfgXhzpFHNtk,3304
 mpflash/db/__init__.py,sha256=wnIlO4nOXsPGXMbn2OCqHRsR-hUmtJsko8VdqjH3ZUE,45
-mpflash/db/core.py,sha256=6Ftp-Br3fmVO5prsvR7oc-XfF3qLJrTOy2YKosQeQQk,5271
+mpflash/db/core.py,sha256=PiHpk64pBP-myfacxfVgHo4BvSSvFrtx6LrLgIPMyYY,5286
 mpflash/db/gather_boards.py,sha256=fzCT1IGZ53FwkFrTY72ZeXH5klSlm5JFETsDU7lGYf4,4134
 mpflash/db/loader.py,sha256=CDlTj2T6w9Ch9s3RHi00E1TbUhjFsgXAsYSQr5kliB0,4889
 mpflash/db/meta.py,sha256=2pFTpFH-1zejGIDp2vs0hbX5rqUONt7B1WIvf8qBx5s,2248
@@ -41,7 +41,7 @@ mpflash/flash/esp.py,sha256=4977E1hDqJ4-EIkLzwrUtgZuc0ZTD7NvP1PQZgZ2DoU,3227
 mpflash/flash/stm32.py,sha256=jNgMpJaxUwtJ-v6VU1luD1t41AQprCUeNVCVEovxQe0,595
 mpflash/flash/stm32_dfu.py,sha256=W-3JsRQyf3DduoIRXDmGZ35RogqtjQgcJnk-GOtQoLE,3090
 mpflash/flash/worklist.py,sha256=wf-R9yPsmcE54dnoPA29pEEzNPZI3JwY85V_DB0hXNI,6584
-mpflash/flash/uf2/__init__.py,sha256=haL84hP2p1ZjKF6dXJJHAB_NTf7jT91MuZvmvg9SpIA,3617
+mpflash/flash/uf2/__init__.py,sha256=fCTQLwI8jigzGY0zVWB1XmqyieNFDRHOWky2slZjZEM,4145
 mpflash/flash/uf2/boardid.py,sha256=U5wGM8VA3wEpUxQCMtuXpMZZomdVH8J_Zd5_GekUMuU,423
 mpflash/flash/uf2/linux.py,sha256=uTgqyS7C7xfQ25RrTcSUkt-m2u2Ks_o7bPLzIecPoC8,4355
 mpflash/flash/uf2/macos.py,sha256=JTaIpqnR_0k4oSEvzs9amhmK-PMxUJyZLnZ_wZwxa-0,1228
@@ -56,7 +56,7 @@ mpflash/mpboard_id/known.py,sha256=t-oREfW5P5Zue5zbte7WB9e7-mpZBF-NfHGTEUsOVLM,3
 mpflash/mpboard_id/resolve.py,sha256=5KCZ0Tcg3FYZ3HK_zux5EguwoSC2E03kCpW2fh4rN2A,779
 mpflash/mpremoteboard/__init__.py,sha256=4OIKAry-GeYUSgnEcs5TRb0xea0bstVQCOb28MjLDyk,14210
 mpflash/mpremoteboard/mpy_fw_info.py,sha256=ZDEPJN9XJnoG_oeWcLNiLJAD5bkVX2yI_j4K7msUxWM,5196
-mpflash/mpremoteboard/runner.py,sha256=H5f5JBcRnpF06Ui3xDY7IoDdO2Hex9lsI_eGMq5c2A4,4945
+mpflash/mpremoteboard/runner.py,sha256=4YpL0OA3GRcCvXI47wrj6hJKJZ9uunkdDKDFic2ZM-8,5372
 mpflash/vendor/board_database.py,sha256=Cb8fEhJaZ2siMkLPW5rPwV9yzBsTtKGOqWUd9TxNgFM,8763
 mpflash/vendor/click_aliases.py,sha256=adLhqLxNpJEPjSCIRSTkR-QzSgavGFKT0cwRbjxpzRU,5395
 mpflash/vendor/dfu.py,sha256=6rqGCBS8mTxxaLtkdzJ8O6nc74kFk8jrkmKvxw-x-u8,5693
@@ -64,8 +64,8 @@ mpflash/vendor/pydfu.py,sha256=KD1RHHuhvhWi-l1UB6GyggkxouDKtZgkG4ivRbIfwC4,21264
 mpflash/vendor/readme.md,sha256=BQ7Uxf8joeYMjTUuSLLBG49ob6a9MgFPIEwuc72-Mfw,415
 mpflash/vendor/pico-universal-flash-nuke/LICENSE.txt,sha256=Zkc2iTNbib2NCMwtLjMEz0vFCPglgvaw6Mj7QiWldpQ,1484
 mpflash/vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2,sha256=QuPMppqHMVOt3vDVU0bikHRLsTiDRQYNUcGQ_OLRFGI,28160
-mpflash-1.26.1.dist-info/METADATA,sha256=mB9GYaFlwmoK2qp0FNqxsjW4WHc14k2F8RRj848AisU,28095
-mpflash-1.26.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mpflash-1.26.1.dist-info/entry_points.txt,sha256=DZ24tsMKlCyTkjWet9vCoq5dcFeY43RKtTsLreQI_R8,53
-mpflash-1.26.1.dist-info/licenses/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.26.1.dist-info/RECORD,,
+mpflash-1.26.3.dist-info/METADATA,sha256=T_PJNISbbh6QLopvV6CosjyXnO94zDJqjibo46havDM,28033
+mpflash-1.26.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mpflash-1.26.3.dist-info/entry_points.txt,sha256=DZ24tsMKlCyTkjWet9vCoq5dcFeY43RKtTsLreQI_R8,53
+mpflash-1.26.3.dist-info/licenses/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.26.3.dist-info/RECORD,,