mpflash 0.8.4__py3-none-any.whl → 0.8.6__py3-none-any.whl

mpflash/ask_input.py

@@ -11,7 +11,8 @@ from loguru import logger as log
 
 from .common import DownloadParams, FlashParams, ParamType
 from .config import config
-from .mpboard_id import get_known_boards_for_port, get_known_ports, known_stored_boards
+from .mpboard_id import (get_known_boards_for_port, get_known_ports,
+                         known_stored_boards)
 from .mpremoteboard import MPRemoteBoard
 from .vendor.versions import micropython_versions
 
@@ -28,6 +29,11 @@ def ask_missing_params(
     Returns:
         ParamType: The updated parameters.
     """
+    if not config.interactive:
+        # no interactivity allowed
+        log.info("Interactive mode disabled. Skipping ask for user input.")
+        return params
+
     import inquirer
 
     log.trace(f"ask_missing_params: {params}")
@@ -36,9 +42,6 @@ def ask_missing_params(
     # if action download, multiple input
     multi_select = isinstance(params, DownloadParams)
     action = "download" if isinstance(params, DownloadParams) else "flash"
-    if not config.interactive:
-        # no interactivity allowed
-        return params
 
     questions = []
     answers: dict[str, Union[str, List]] = {"action": action}
@@ -67,8 +70,14 @@ def ask_missing_params(
             answers["serial"] = [answers["serial"]]
         params.serial = [s.split()[0] for s in answers["serial"]]  # split to remove the description
     if "port" in answers:
-        params.ports = [p for p in params.ports if p != "?"]  # remove the "?" if present
-        params.ports.extend(answers["port"])
+        #  params.ports = [p for p in params.ports if p != "?"]  # remove the "?" if present
+        if isinstance(answers["port"], str):
+            params.ports.append(answers["port"])
+        elif isinstance(answers["port"], list): # type: ignore
+            params.ports.extend(answers["port"])
+        else:
+            raise ValueError(f"Unexpected type for answers['port']: {type(answers['port'])}")
+        
     if "boards" in answers:
         params.boards = [b for b in params.boards if b != "?"]  # remove the "?" if present
         params.boards.extend(answers["boards"] if isinstance(answers["boards"], list) else [answers["boards"]])
@@ -152,10 +161,18 @@ def ask_port_board(*, multi_select: bool, action: str):
                 "Which {port} board firmware do you want to {action} " + "to {serial} ?" if action == "flash" else "?"
             ),
             choices=filter_matching_boards,
-            validate=lambda _, x: True if x else "Please select at least one board",  # type: ignore
+            validate=at_least_one_validation,  # type: ignore
+            # validate=lambda _, x: True if x else "Please select at least one board",  # type: ignore
         ),
     ]
 
+def at_least_one_validation(answers, current) -> bool:
+    import inquirer.errors
+    if not current:
+        raise inquirer.errors.ValidationError("", reason="Please select at least one item.")
+    if isinstance(current, list) and not any(current):
+        raise inquirer.errors.ValidationError("", reason="Please select at least one item.")
+    return True
 
 def ask_mp_version(multi_select: bool, action: str):
     """
@@ -181,13 +198,6 @@ def ask_mp_version(multi_select: bool, action: str):
     # todo: this may be a little slow
     mp_versions = [v for v in mp_versions if "preview" in v or get_known_boards_for_port("stm32", [v])]
 
-    def at_least_one_validation(answers, current) -> bool:
-        if not current:
-            raise inquirer.errors.ValidationError("", reason="Please select at least one version")
-        if isinstance(current, list) and not any(current):
-            raise inquirer.errors.ValidationError("", reason="Please select at least one version")
-        return True
-
     message = "Which version(s) do you want to {action} " + ("to {serial} ?" if action == "flash" else "?")
     q = input_ux(
         # inquirer.List(

mpflash/bootloader/__init__.py

@@ -32,5 +32,6 @@ def enter_bootloader(
         raise MPFlashError(f"Unknown bootloader method {method}")
     if result:
         time.sleep(wait_after)
-    log.error(f"Failed to enter bootloader on {mcu.serialport}")
+    else:
+        log.error(f"Failed to enter bootloader on {mcu.serialport}")
     return result

mpflash/cli_flash.py

@@ -17,7 +17,8 @@ from .cli_list import show_mcus
 from .common import FlashParams
 from .config import config
 from .flash import flash_list
-from .worklist import WorkList, full_auto_worklist, manual_worklist, single_auto_worklist
+from .worklist import (WorkList, full_auto_worklist, manual_worklist,
+                       single_auto_worklist)
 
 # #########################################################################################################
 # CLI
@@ -120,7 +121,8 @@ def cli_flash_board(**kwargs) -> int:
 
     params = FlashParams(**kwargs)
     params.versions = list(params.versions)
-    params.boards = list(params.boards)
+    params.ports = list(params.ports)
+    params.boards = list(params.boards) 
     params.serial = list(params.serial)
     params.ignore = list(params.ignore)
     params.bootloader = BootloaderMethod(params.bootloader)

mpflash/cli_group.py

@@ -14,6 +14,7 @@ from .logger import log, make_quiet, set_loglevel
 def cb_verbose(ctx, param, value):
     """Callback to set the log level to DEBUG if verbose is set"""
     if value and not config.quiet:
+        # log.debug(f"Setting verbose mode to {value}")
         config.verbose = True
         if value > 1:
             set_loglevel("TRACE")
@@ -26,19 +27,21 @@ def cb_verbose(ctx, param, value):
     return value
 
 
-def cb_interactive(ctx, param, value):
-    if value:
-        config.interactive = value
+def cb_interactive(ctx, param, value:bool):
+    log.trace(f"Setting interactive mode to {value}")
+    config.interactive = value
     return value
 
 
 def cb_test(ctx, param, value):
     if value:
+        log.trace(f"Setting tests to {value}")
         config.tests = value
     return value
 
 
 def cb_quiet(ctx, param, value):
+    log.trace(f"Setting quiet mode to {value}")
     if value:
         make_quiet()
     return value

mpflash/config.py

@@ -1,11 +1,14 @@
 """centralized configuration for mpflash"""
 
+import os
 from pathlib import Path
 from typing import List
 
 import pkg_resources
 import platformdirs
 
+from mpflash.logger import log
+
 
 def get_version():
     name = __package__ or "mpflash"
@@ -21,10 +24,23 @@ class MPtoolConfig:
     quiet: bool = False
     verbose: bool = False
     ignore_ports: List[str] = []
-    interactive: bool = True
     firmware_folder: Path = platformdirs.user_downloads_path() / "firmware"
     # test options specified on the commandline
     tests: List[str] = []
+    _interactive: bool = True
+
+    @property
+    def interactive(self):
+        # No interactions in CI
+        if os.getenv('GITHUB_ACTIONS') == 'true':
+            log.warning("Disabling interactive mode in CI")
+            return False
+        return self._interactive
+    
+    @interactive.setter
+    def interactive(self, value:bool):
+        self._interactive = value
+
 
 
 config = MPtoolConfig()

{mpflash-0.8.4.dist-info → mpflash-0.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 0.8.4
+Version: 0.8.6
 Summary: Flash and download tool for MicroPython firmwares
 Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT

{mpflash-0.8.4.dist-info → mpflash-0.8.6.dist-info}/RECORD

@@ -1,17 +1,17 @@
 mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/add_firmware.py,sha256=u_g9mID557fptLEJ1Nld9n27V1R1og8uEkadm0O3YTw,3435
-mpflash/ask_input.py,sha256=e54WfgktG7Ff8dBUknXioROq3lPNZ-eacUjfmUvFfS0,8496
-mpflash/bootloader/__init__.py,sha256=NRi_zWLNhstoUeisXlknrNyrCcEaHrzEkTxnrmUg1m0,1304
+mpflash/ask_input.py,sha256=ipkRIMb_kl4j9o8f_LtpX8jL8dZnTeGiTvE87fA8LBw,8953
+mpflash/bootloader/__init__.py,sha256=ikSmoovdenmOqBsmI99pjsYLRi-DghbQ3-DlbiCy4Rg,1319
 mpflash/bootloader/manual.py,sha256=4FNQg0JpyRmfISrDDfZ5j9iQBK-Jyrnz8nLqKf1ZEuc,3104
 mpflash/bootloader/micropython.py,sha256=QQJlXUnyVA4cRS2O4GbrQhpKhFFvxtQC5G6WQcSCbp8,409
 mpflash/bootloader/touch1200.py,sha256=AJ4GPLtvCR5LDDe5Uu_5Rg8OI2JHxEB-blzCcO5x9Tc,1511
 mpflash/cli_download.py,sha256=zufBC0xNPZCq28mG_fepupziizbm86wTpfNEszkei9Q,3656
-mpflash/cli_flash.py,sha256=ITd9eJzvdtr6SeeB3PO5Ja2jG4TFxsW7JfL3pCNJBn0,7288
-mpflash/cli_group.py,sha256=gvUaQM-4wk6fV50YxkMJeYEt3D0ZsQJM7t86T8xOpWE,2139
+mpflash/cli_flash.py,sha256=KOn1T9lThFs5pkhWZY_QCEdyB66xk6eJjS3n995hwPk,7354
+mpflash/cli_group.py,sha256=MsySUNipL8xkQAu4yuQPkFLoZNtQ5RPWtX3diHHrPdE,2334
 mpflash/cli_list.py,sha256=_3XzR8RyjlojbOqGKm_TLwcQojCb4OgCYi7mcjjoflI,2046
 mpflash/cli_main.py,sha256=MHhU1cAYEhwOpHG2p3OEfwpSrn9-J2foGVZqby_HO8k,1134
 mpflash/common.py,sha256=gkj71hGibMEcmThJ5LSrAV5vp6SpJAJNLHWO4GjB040,5929
-mpflash/config.py,sha256=R7PomStIFHSTnLhpWhw9P2DL_b-8a8Wrja3aY-dPm6A,762
+mpflash/config.py,sha256=VqaS6dT1UFigVmYRtVVBTi7cNQ6UKReaN4VUj3D5Ip4,1166
 mpflash/connected.py,sha256=CBG_DJ33OPWAPbX-ICQpL1LcFOhNYpLUSB0Q5v7gi9s,3029
 mpflash/download.py,sha256=VFV0XP8mTnBXOeo_JbyHBjIQJ0PUUiXu8hoO0lAxid8,14235
 mpflash/downloaded.py,sha256=cHq_fWUuZ0sXOCs5d3NIf3etUDsAXtnwnO7tkRqJE9A,4870
@@ -45,8 +45,8 @@ mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
 mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
 mpflash/vendor/versions.py,sha256=thk1a5wEEhXIQoL0zZ7oooeFyQeSoI00CIUbZF0b3rI,3783
 mpflash/worklist.py,sha256=MKHDynttVP3lsHSfb7DEqeQ2mRV0da96lD4lIcS_zQY,5962
-mpflash-0.8.4.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-0.8.4.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-0.8.4.dist-info/METADATA,sha256=wjudSFDz_BU3eYbqjjnxd68dCHfzaZpnR37MD2UCh9s,15275
-mpflash-0.8.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mpflash-0.8.4.dist-info/RECORD,,
+mpflash-0.8.6.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-0.8.6.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-0.8.6.dist-info/METADATA,sha256=uahnuzKIjIEmZush0O6RZDbW_qzbLlUBHq_ZRU3WT7A,15275
+mpflash-0.8.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mpflash-0.8.6.dist-info/RECORD,,