mposcli 0.4.1__tar.gz → 0.5.0__tar.gz

{mposcli-0.4.1 → mposcli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mposcli
-Version: 0.4.1
+Version: 0.5.0
 Summary: CLI helper for MicroPythonOS: https://github.com/MicroPythonOS/MicroPythonOS
 Project-URL: Documentation, https://github.com/jedie/mposcli
 Project-URL: Source, https://github.com/jedie/mposcli
@@ -61,8 +61,8 @@ usage: mposcli [-h] {build,cp,cp-app,flash,run-desktop,update,update-submodules,
 │   • cp                 Copy/update internal_filesystem/lib/mpos files to the device    │
 │                        via "mpremote fs cp". Display a file chooser to select which    │
 │                        files to copy/update. But can also be used to copy/update all   │
-│                        files. see: https://docs.micropythonos.com/os-development/insta │
-│                        lling-on-esp32/                                                 │
+│                        files. see:                                                     │
+│                        https://docs.micropythonos.com/architecture/filesystem/         │
 │   • cp-app             Copy/update internal_filesystem/apps to the device via          │
 │                        "mpremote fs cp". Display a file chooser to select which app to │
 │                        copy/update. But can also be used to copy/update all files.     │
@@ -93,13 +93,13 @@ usage: mposcli [-h] {build,cp,cp-app,flash,run-desktop,update,update-submodules,
 
 [comment]: <> (✂✂✂ auto generated build start ✂✂✂)
 ```
-usage: mposcli build [-h] [{esp32,esp32s3,unix,macOS}] [-v]
+usage: mposcli build [-h] [{esp32,esp32s3,unphone,unix,macOS}] [-v]
 
 Build MicroPythonOS by calling: ./scripts/build_mpos.sh <target> see:
 https://docs.micropythonos.com/os-development/
 
 ╭─ positional arguments ───────────────────────────────────────────────────╮
-│ [{esp32,esp32s3,unix,macOS}]                                             │
+│ [{esp32,esp32s3,unphone,unix,macOS}]                                     │
 │                  Target platform to build for. (default: unix)           │
 ╰──────────────────────────────────────────────────────────────────────────╯
 ╭─ options ────────────────────────────────────────────────────────────────╮
@@ -119,7 +119,7 @@ usage: mposcli cp [-h] [CP OPTIONS]
 
 Copy/update internal_filesystem/lib/mpos files to the device via "mpremote fs cp". Display
 a file chooser to select which files to copy/update. But can also be used to copy/update
-all files. see: https://docs.micropythonos.com/os-development/installing-on-esp32/
+all files. see: https://docs.micropythonos.com/architecture/filesystem/
 
 ╭─ positional arguments ─────────────────────────────────────────────────────────────────╮
 │ [{None}|PATH]         Optional file or directory path. (default: None)                 │
@@ -173,7 +173,9 @@ https://docs.micropythonos.com/os-development/installing-on-esp32/
 
 ╭─ options ──────────────────────────────────────────────────────────────────────────────╮
 │ -h, --help             show this help message and exit                                 │
-│ --port STR             Port used for esptool and mpremote (default: /dev/ttyUSB0)      │
+│ --port {None}|STR      Port used for esptool and mpremote, e.g.: "/dev/ttyUSB0" or     │
+│                        "/dev/ttyACM0" etc. Leave empty for autodetection (default:     │
+│                        None)                                                           │
 │ --address STR          Address (default: 0x0)                                          │
 │ --flash-size STR       Flash Size (default: detect)                                    │
 │ --verify, --no-verify  Verify after flashing? (default: True)                          │
@@ -317,6 +319,11 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.5.0](https://github.com/jedie/mposcli/compare/v0.4.1...v0.5.0)
+  * 2026-03-08 - update README
+  * 2026-03-05 - Enhance "cp" command and auto restart "mpremote repl"
+  * 2026-03-03 - Refactor "cp" command
+  * 2026-03-03 - flash command: use port auto detection as default
 * [v0.4.1](https://github.com/jedie/mposcli/compare/v0.4.0...v0.4.1)
   * 2026-02-27 - Use "--force" for pulling submodules to overwrite local changes
 * [v0.4.0](https://github.com/jedie/mposcli/compare/v0.3.0...v0.4.0)
@@ -329,13 +336,13 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
   * 2026-02-18 - Add "update" beside "update-submodules"
   * 2026-02-17 - Update requirements
   * 2026-02-16 - update README
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.2.0](https://github.com/jedie/mposcli/compare/v0.1.0...v0.2.0)
   * 2026-02-16 - New CLI command: "cp" with convenience features.
   * 2026-02-16 - New command: "flash" with file selector
   * 2026-02-16 - Update README.md
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.1.0](https://github.com/jedie/mposcli/compare/1695026...v0.1.0)
   * 2026-02-16 - Add "update-submodules" command
   * 2026-02-16 - Add "build" command

{mposcli-0.4.1 → mposcli-0.5.0}/README.md

@@ -46,8 +46,8 @@ usage: mposcli [-h] {build,cp,cp-app,flash,run-desktop,update,update-submodules,
 │   • cp                 Copy/update internal_filesystem/lib/mpos files to the device    │
 │                        via "mpremote fs cp". Display a file chooser to select which    │
 │                        files to copy/update. But can also be used to copy/update all   │
-│                        files. see: https://docs.micropythonos.com/os-development/insta │
-│                        lling-on-esp32/                                                 │
+│                        files. see:                                                     │
+│                        https://docs.micropythonos.com/architecture/filesystem/         │
 │   • cp-app             Copy/update internal_filesystem/apps to the device via          │
 │                        "mpremote fs cp". Display a file chooser to select which app to │
 │                        copy/update. But can also be used to copy/update all files.     │
@@ -78,13 +78,13 @@ usage: mposcli [-h] {build,cp,cp-app,flash,run-desktop,update,update-submodules,
 
 [comment]: <> (✂✂✂ auto generated build start ✂✂✂)
 ```
-usage: mposcli build [-h] [{esp32,esp32s3,unix,macOS}] [-v]
+usage: mposcli build [-h] [{esp32,esp32s3,unphone,unix,macOS}] [-v]
 
 Build MicroPythonOS by calling: ./scripts/build_mpos.sh <target> see:
 https://docs.micropythonos.com/os-development/
 
 ╭─ positional arguments ───────────────────────────────────────────────────╮
-│ [{esp32,esp32s3,unix,macOS}]                                             │
+│ [{esp32,esp32s3,unphone,unix,macOS}]                                     │
 │                  Target platform to build for. (default: unix)           │
 ╰──────────────────────────────────────────────────────────────────────────╯
 ╭─ options ────────────────────────────────────────────────────────────────╮
@@ -104,7 +104,7 @@ usage: mposcli cp [-h] [CP OPTIONS]
 
 Copy/update internal_filesystem/lib/mpos files to the device via "mpremote fs cp". Display
 a file chooser to select which files to copy/update. But can also be used to copy/update
-all files. see: https://docs.micropythonos.com/os-development/installing-on-esp32/
+all files. see: https://docs.micropythonos.com/architecture/filesystem/
 
 ╭─ positional arguments ─────────────────────────────────────────────────────────────────╮
 │ [{None}|PATH]         Optional file or directory path. (default: None)                 │
@@ -158,7 +158,9 @@ https://docs.micropythonos.com/os-development/installing-on-esp32/
 
 ╭─ options ──────────────────────────────────────────────────────────────────────────────╮
 │ -h, --help             show this help message and exit                                 │
-│ --port STR             Port used for esptool and mpremote (default: /dev/ttyUSB0)      │
+│ --port {None}|STR      Port used for esptool and mpremote, e.g.: "/dev/ttyUSB0" or     │
+│                        "/dev/ttyACM0" etc. Leave empty for autodetection (default:     │
+│                        None)                                                           │
 │ --address STR          Address (default: 0x0)                                          │
 │ --flash-size STR       Flash Size (default: detect)                                    │
 │ --verify, --no-verify  Verify after flashing? (default: True)                          │
@@ -302,6 +304,11 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.5.0](https://github.com/jedie/mposcli/compare/v0.4.1...v0.5.0)
+  * 2026-03-08 - update README
+  * 2026-03-05 - Enhance "cp" command and auto restart "mpremote repl"
+  * 2026-03-03 - Refactor "cp" command
+  * 2026-03-03 - flash command: use port auto detection as default
 * [v0.4.1](https://github.com/jedie/mposcli/compare/v0.4.0...v0.4.1)
   * 2026-02-27 - Use "--force" for pulling submodules to overwrite local changes
 * [v0.4.0](https://github.com/jedie/mposcli/compare/v0.3.0...v0.4.0)
@@ -314,13 +321,13 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
   * 2026-02-18 - Add "update" beside "update-submodules"
   * 2026-02-17 - Update requirements
   * 2026-02-16 - update README
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.2.0](https://github.com/jedie/mposcli/compare/v0.1.0...v0.2.0)
   * 2026-02-16 - New CLI command: "cp" with convenience features.
   * 2026-02-16 - New command: "flash" with file selector
   * 2026-02-16 - Update README.md
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.1.0](https://github.com/jedie/mposcli/compare/1695026...v0.1.0)
   * 2026-02-16 - Add "update-submodules" command
   * 2026-02-16 - Add "build" command

{mposcli-0.4.1 → mposcli-0.5.0}/mposcli/__init__.py

@@ -4,5 +4,5 @@
 """
 
 # See https://packaging.python.org/en/latest/specifications/version-specifiers/
-__version__ = '0.4.1'
+__version__ = '0.5.0'
 __author__ = 'Jens Diemer <cookiecutter_templates@jensdiemer.de>'

{mposcli-0.4.1 → mposcli-0.5.0}/mposcli/cli_app/build.py

@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 @app.command
 def build(
     target: Annotated[
-        Literal['esp32', 'esp32s3', 'unix', 'macOS'],
+        Literal['esp32', 'esp32s3', 'unphone', 'unix', 'macOS'],
         tyro.conf.arg(
             help='Target platform to build for.',
         ),

{mposcli-0.4.1 → mposcli-0.5.0}/mposcli/cli_app/copy_mpos.py

@@ -14,6 +14,7 @@ from mposcli.cli_app import app
 from mposcli.mpos_utils import get_mpos_path
 from mposcli.tools import get_mpremote_bin
 from mposcli.user_input import choose_newest_modified_directory, get_newest_files
+from mposcli.utilities.mpremote import MpOsPathResolver, start_mpremote_repl
 
 
 logger = logging.getLogger(__name__)
@@ -44,58 +45,45 @@ def cp(
     Copy/update internal_filesystem/lib/mpos files to the device via "mpremote fs cp".
     Display a file chooser to select which files to copy/update.
     But can also be used to copy/update all files.
-    see: https://docs.micropythonos.com/os-development/installing-on-esp32/
+    see: https://docs.micropythonos.com/architecture/filesystem/
     """
     setup_logging(verbosity=verbosity)
 
     mpos_path = get_mpos_path()
-
-    internal_fs = mpos_path / 'internal_filesystem'
-    lib_mpos = internal_fs / 'lib' / 'mpos'
-    assert_is_dir(lib_mpos)
-    apps_path = internal_fs / 'apps'
-    assert_is_dir(apps_path)
+    resolver = MpOsPathResolver(mpos=mpos_path)
 
     mpremote_bin = get_mpremote_bin()
 
     print('\n')
 
-    popenargs = (mpremote_bin, 'fs', 'cp')
-
-    if local_path:
-        if not local_path.is_absolute():
-            local_path = mpos_path / local_path
+    if not local_path:
+        # Let's the user select from the list of the newest modified files in internal_filesystem/lib/mpos:
+        local_path = get_newest_files(resolver.lib_mpos, limit=new_file_limit)
+        if not local_path:
+            print('Copy/update all files in lib/mpos to the device')
+            local_path = resolver.lib_mpos
 
-        print(f'Copy/update app: "{local_path}" ...')
+    print(f'Copy/update app: "{local_path}" ...')
 
-        if not local_path.exists():
-            print(f'[red]Error: The specified source path "{local_path}" does not exist.[/red]')
-            return
+    if not local_path.exists():
+        print(f'[red]Error: The specified source path "{local_path}" does not exist.[/red]')
+        return
 
-        # Is source a sub path of "apps_path" ?
-        if local_path.is_relative_to(apps_path):
-            local_rel_path = local_path.relative_to(mpos_path)
-            remote_path = f':/{local_path.relative_to(internal_fs)}'
-        else:
-            raise NotImplementedError
-    else:
-        local_path = get_newest_files(lib_mpos, limit=new_file_limit)
-        if not local_path:
-            print('Copy/update all files in lib/mpos to the device')
-            local_path = lib_mpos
+    local_path_str, remote_str = resolver.resolve(local_path)
 
-        local_rel_path = local_path.relative_to(mpos_path)
-        remote_path = f':/{local_path.relative_to(lib_mpos.parent)}'
+    popenargs = (mpremote_bin, 'fs')
 
     if local_path.is_dir():
         popenargs += ('-r',)
-        print(f'Copying directory "[bold]{local_rel_path}[/bold]" to device at "[bold]{remote_path}[/bold]" ...')
+        print(f'Copying directory "[bold]{local_path_str}[/bold]" to device at "[bold]{remote_str}[/bold]" ...')
     else:
-        print(f'Copying file "[bold]{local_rel_path}[/bold]" to device at "[bold]{remote_path}[/bold]" ...')
+        print(f'Copying file "[bold]{local_path_str}[/bold]" to device at "[bold]{remote_str}[/bold]" ...')
 
-    popenargs += (local_rel_path, remote_path)
     verbose_check_call(
         *popenargs,
+        'cp',
+        local_path_str,
+        remote_str,
         verbose=True,
         cwd=mpos_path,
         text=None,
@@ -112,15 +100,7 @@ def cp(
         )
 
     if repl:
-        time.sleep(1)
-        verbose_check_call(
-            mpremote_bin,
-            'repl',
-            verbose=True,
-            cwd=mpos_path,
-            timeout=None,
-            text=None,
-        )
+        start_mpremote_repl()
 
 
 @app.command
@@ -158,14 +138,14 @@ def cp_app(
 
     if not app:
         print('Copy/update all apps in "internal_filesystem/apps" to the device')
-        local_rel_path = 'internal_filesystem/apps'
+        local_path = 'internal_filesystem/apps'
         remote_path = ':/apps'
     else:
         print(f'Copy/update {app=} ...')
-        local_rel_path = f'internal_filesystem/apps/{app.name}'
+        local_path = f'internal_filesystem/apps/{app.name}'
         remote_path = f':/apps/{app.name}'
 
-    popenargs += (local_rel_path, remote_path)
+    popenargs += (local_path, remote_path)
     verbose_check_call(
         *popenargs,
         verbose=True,

{mposcli-0.4.1 → mposcli-0.5.0}/mposcli/cli_app/flash.py

@@ -18,7 +18,15 @@ logger = logging.getLogger(__name__)
 
 @app.command
 def flash(
-    port: Annotated[str, tyro.conf.arg(help='Port used for esptool and mpremote')] = '/dev/ttyUSB0',
+    port: Annotated[
+        str | None,
+        tyro.conf.arg(
+            help=(
+                'Port used for esptool and mpremote, e.g.: "/dev/ttyUSB0" or "/dev/ttyACM0" etc.'
+                ' Leave empty for autodetection'
+            )
+        ),
+    ] = None,
     address: Annotated[str, tyro.conf.arg(help='Address')] = '0x0',
     flash_size: Annotated[str, tyro.conf.arg(help='Flash Size')] = 'detect',
     verify: Annotated[bool, tyro.conf.arg(help='Verify after flashing?')] = True,
@@ -46,10 +54,12 @@ def flash(
     image_files = lvgl_micropython_build_path.glob('*.bin')
     image_file = file_chooser(image_files)
 
+    popenargs = (esptool_bin,)
+    if port:
+        popenargs += ('--port', port)
+
     verbose_check_call(
-        esptool_bin,
-        '--port',
-        port,
+        *popenargs,
         'write-flash',
         '--flash-size',
         flash_size,
@@ -63,9 +73,7 @@ def flash(
 
     if verify:
         verbose_check_call(
-            esptool_bin,
-            '--port',
-            port,
+            *popenargs,
             'verify-flash',
             address,
             image_file,

mposcli-0.5.0/mposcli/tests/test_mpremote_cp_utils.py

@@ -0,0 +1,74 @@
+import tempfile
+from pathlib import Path
+from unittest import TestCase
+
+from mposcli.utilities.mpremote import MpOsPathResolver
+
+
+class ProjectSetupTestCase(TestCase):
+    def test_mpos_path_resolver(self):
+        with tempfile.TemporaryDirectory() as temp_dir:
+            mpos_path = Path(temp_dir).resolve()
+
+            camera_assets = mpos_path / 'internal_filesystem/apps/com.micropythonos.camera/assets/'
+            camera_assets.mkdir(parents=True)
+            (camera_assets / 'camera_app.py').touch()
+
+            board_path = mpos_path / 'internal_filesystem/lib/mpos/board/'
+            board_path.mkdir(parents=True)
+            (board_path / 'unphone.py').touch()
+
+            (mpos_path / 'internal_filesystem/lib/drivers/display/hx8357d/').mkdir(parents=True)
+
+            resolver = MpOsPathResolver(mpos=mpos_path)
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/apps/com.micropythonos.camera'),
+                (
+                    'internal_filesystem/apps/com.micropythonos.camera/',
+                    ':apps/',
+                ),
+            )
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/apps/com.micropythonos.camera/assets/'),
+                (
+                    'internal_filesystem/apps/com.micropythonos.camera/assets/',
+                    ':apps/com.micropythonos.camera/',
+                ),
+            )
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/apps/com.micropythonos.camera/assets/camera_app.py'),
+                (
+                    'internal_filesystem/apps/com.micropythonos.camera/assets/camera_app.py',
+                    ':apps/com.micropythonos.camera/assets/camera_app.py',
+                ),
+            )
+
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/lib/mpos/board/'),
+                (
+                    'internal_filesystem/lib/mpos/board/',
+                    ':mpos/',
+                ),
+            )
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/lib/mpos/board/unphone.py'),
+                (
+                    'internal_filesystem/lib/mpos/board/unphone.py',
+                    ':mpos/board/unphone.py',
+                ),
+            )
+
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/lib/drivers/display/hx8357d'),
+                (
+                    'internal_filesystem/lib/drivers/display/hx8357d/',
+                    ':lib/drivers/display/',
+                ),
+            )
+            self.assertEqual(
+                resolver.resolve(mpos_path / 'internal_filesystem/lib/drivers/display'),
+                (
+                    'internal_filesystem/lib/drivers/display/',
+                    ':lib/drivers/',
+                ),
+            )

{mposcli-0.4.1 → mposcli-0.5.0}/mposcli/tools.py

@@ -1,3 +1,4 @@
+import functools
 import shutil
 import sys
 from pathlib import Path
@@ -15,12 +16,14 @@ def get_bin(name: str) -> Path:
     return Path(bin_path)
 
 
+@functools.cache
 def get_esptool_bin() -> Path:
     esptool_bin = get_bin('esptool')
     verbose_check_call(esptool_bin, 'version')
     return esptool_bin
 
 
+@functools.cache
 def get_mpremote_bin():
     mpremote_bin = get_bin('mpremote')
     verbose_check_call(mpremote_bin, '--version')

{mposcli-0.4.1 → mposcli-0.5.0}/mposcli/user_input.py

@@ -46,7 +46,7 @@ def file_chooser(paths) -> Path | None:
     return selection
 
 
-def get_newest_files(directory, limit=10) -> Path | None:
+def get_newest_files(directory: Path, limit=10) -> Path | None:
     files = []
 
     def scan(dir_path):
@@ -60,7 +60,7 @@ def get_newest_files(directory, limit=10) -> Path | None:
     scan(directory)
     files.sort(key=lambda x: x[1], reverse=True)
 
-    print(f'[bold]Choose a file[/bold] (only from the newest {limit}):\n')
+    print(f'[bold]Choose a file[/bold] (only from the newest {limit} from {directory}):\n')
     for idx, (entry, mtime) in enumerate(files[:limit]):
         dt = datetime.datetime.fromtimestamp(mtime).astimezone().strftime('%Y-%m-%d %H:%M:%S')
         rel_path = Path(entry.path).relative_to(directory)
@@ -85,8 +85,9 @@ def get_newest_files(directory, limit=10) -> Path | None:
         print(f'[red]Invalid selection: {number}[/red]')
         sys.exit(1)
 
-    print(f'Selected file: {selection}')
-    return Path(selection)
+    absolute_path = directory / selection
+    print(f'Selected file: {absolute_path}')
+    return absolute_path
 
 
 def choose_newest_modified_directory(base_dir: Path) -> Path:

mposcli-0.5.0/mposcli/utilities/mpremote.py

@@ -0,0 +1,64 @@
+import shlex
+import subprocess
+import time
+from pathlib import Path
+
+from bx_py_utils.path import assert_is_dir
+from rich import print
+
+from mposcli.tools import get_mpremote_bin
+
+
+class MpOsPathResolver:
+    def __init__(self, mpos: Path):
+        self.mpos = mpos  # e.g.: ~/repos/MicroPythonOS
+        self.internal_fs = mpos / 'internal_filesystem'
+        self.lib_mpos = self.internal_fs / 'lib' / 'mpos'
+        assert_is_dir(self.lib_mpos)
+        self.apps_path = self.internal_fs / 'apps'
+        assert_is_dir(self.apps_path)
+
+    def resolve(self, source: Path):
+        source = source.resolve()
+        assert source.exists(), f'Not existing path: {source=}'
+        assert source.is_relative_to(self.mpos), f'{source=} is not inside {self.mpos=}'
+
+        if source.is_relative_to(self.apps_path):
+            device_base_path = self.apps_path.parent
+        elif source.is_relative_to(self.lib_mpos):
+            device_base_path = self.lib_mpos.parent
+        elif source.is_relative_to(self.internal_fs):
+            device_base_path = self.internal_fs
+        else:
+            raise ValueError(f'Path {source} is not in a recognized location')
+
+        remote_path = source.relative_to(device_base_path)
+        source_path = source.relative_to(self.mpos)
+        if source.is_dir():
+            remote_path = remote_path.parent
+            local_path_str = f'{source_path}/'
+            remote_str = f':{remote_path}/'
+        else:
+            local_path_str = f'{source_path}'
+            remote_str = f':{remote_path}'
+
+        return local_path_str, remote_str
+
+
+def start_mpremote_repl(max_try=10, wait_time=1):
+    print('Starting mpremote REPL...')
+    time.sleep(wait_time)
+    mpremote_bin = get_mpremote_bin()
+
+    popen_args = (mpremote_bin, 'repl')
+
+    for try_count in range(max_try):
+        print(f'\n+ {shlex.join(str(arg) for arg in popen_args)}')
+        try:
+            return subprocess.check_call(popen_args)
+        except subprocess.CalledProcessError as err:
+            print(
+                f'[yellow]mpremote finished with [red]exit code {err.returncode!r}[/red]'
+                f' Retrying in {wait_time} seconds... (try {try_count + 1}/{max_try})'
+            )
+            time.sleep(wait_time)