sima-cli 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

sima_cli/install/metadata_installer.py

@@ -8,11 +8,10 @@ import shutil
 import tarfile
 import zipfile
 import stat
-from urllib.parse import urlparse
-
+import shlex
+from urllib.parse import urlparse, quote, urljoin
 from typing import Dict
 from tqdm import tqdm
-from urllib.parse import urljoin
 from pathlib import Path
 import subprocess
 import requests
@@ -23,7 +22,7 @@ from rich.panel import Panel
 from huggingface_hub import snapshot_download
 
 from sima_cli.utils.disk import check_disk_space
-from sima_cli.utils.env import get_environment_type, get_exact_devkit_type
+from sima_cli.utils.env import get_environment_type, get_exact_devkit_type, get_sima_build_version
 from sima_cli.download.downloader import download_file_from_url
 from sima_cli.install.metadata_validator import validate_metadata, MetadataValidationError
 from sima_cli.install.metadata_info import print_metadata_summary, parse_size_string_to_bytes
@@ -33,22 +32,22 @@ console = Console()
 def _copy_dir(src: Path, dest: Path, label: str):
     """
     Copy files from src → dest, merging with existing files (no deletion).
+    Does NOT overwrite files if they already exist.
     Ensures that all parent directories for dest are created.
     """
     if not src.exists():
         raise FileNotFoundError(f"SDK {label} not found: {src}")
 
-    # Ensure full path exists
     dest.mkdir(parents=True, exist_ok=True)
 
-    # Copy tree correctly
     for item in src.iterdir():
         target = dest / item.name
         if item.is_dir():
-            shutil.copytree(item, target, dirs_exist_ok=True)
+            _copy_dir(item, target, label)
         else:
-            shutil.copy2(item, target)
-
+            if not target.exists():
+                shutil.copy2(item, target)
+    
     click.echo(f"✅ Copied {label} into {dest}")
 
 def _prepare_pipeline_project(repo_dir: Path):
@@ -98,6 +97,8 @@ def _prepare_pipeline_project(repo_dir: Path):
 
     # Step b/c: scan plugin paths and copy SDK plugins
     sdk_plugins_base = Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/gst")
+    sdk_alt_base = sdk_plugins_base / "PyGast-plugins"
+
     dest_plugins_dir = repo_dir / "plugins"
     dest_plugins_dir.mkdir(exist_ok=True)
 
@@ -111,27 +112,94 @@ def _prepare_pipeline_project(repo_dir: Path):
                 continue
 
             plugin_name = parts[1]
+
+            # Look first in gst/, then fallback to gst/PyGast-plugins/
             sdk_plugin_path = sdk_plugins_base / plugin_name
+            if not sdk_plugin_path.exists():
+                sdk_plugin_path = sdk_alt_base / plugin_name
+
             if not sdk_plugin_path.exists():
                 click.echo(
-                    f"⚠️  Missing plugin source: {plugin_name} in the SDK, skipping. "
-                    "It's possible that this is a custom plugin already exists in the repo"
+                    f"⚠️ Missing plugin source: {plugin_name} in the SDK, skipping. "
+                    "It is likely a custom plugin already in the repo so it's safe to ignore this warning."
                 )
                 continue
 
             dest_plugin_path = dest_plugins_dir / plugin_name
             dest_plugin_path.mkdir(parents=True, exist_ok=True)
 
-            # Merge instead of deleting
-            shutil.copytree(sdk_plugin_path, dest_plugin_path, dirs_exist_ok=True)
+            # Walk the SDK plugin dir and copy only missing files
+            for src_file in sdk_plugin_path.rglob("*"):
+                if src_file.is_file():
+                    rel_path = src_file.relative_to(sdk_plugin_path)
+                    dest_file = dest_plugin_path / rel_path
+                    if dest_file.exists():
+                        click.echo(f"↩️  Skipped existing file in the repo: {dest_file}")
+                        continue
+                    dest_file.parent.mkdir(parents=True, exist_ok=True)
+                    shutil.copy2(src_file, dest_file)
 
-            click.echo(f"✅ Copied plugin {plugin_name} into {dest_plugin_path}")
+            click.echo(f"✅ Copied plugin {plugin_name} into {dest_plugin_path} (safe copy)")
 
         except Exception as e:
             click.echo(f"❌ Error copying plugin {plugin}: {e}")
 
     click.echo("🎉 Pipeline project prepared.")
 
+def _download_requirements_wheels(repo_dir: Path):
+    """
+    Look for resources/dependencies/requirements.txt under the repo,
+    parse each line, and download wheels into the same folder.
+    Supports optional pip download flags in parentheses.
+
+    Example line formats:
+        jax==0.6.2
+        jaxlib==0.6.2 (--platform manylinux2014_aarch64 --python-version 310 --abi cp310)
+    """
+    deps_dir = repo_dir / "resources" / "dependencies"
+    req_file = deps_dir / "requirements.txt"
+
+    if not req_file.exists():
+        click.echo("⚠️  No requirements.txt found under resources/dependencies in the repo, skipping wheel download, safe to ignore this message")
+        return
+
+    deps_dir.mkdir(parents=True, exist_ok=True)
+
+    with req_file.open("r") as f:
+        lines = [line.strip() for line in f if line.strip() and not line.startswith("#")]
+
+    if not lines:
+        click.echo("⚠️ requirements.txt is empty, nothing to download.")
+        return
+
+    for line in lines:
+        # Split package and extra params if present
+        if "(" in line and ")" in line:
+            pkg_part, extra = line.split("(", 1)
+            package = pkg_part.strip()
+            extra_args = shlex.split(extra.strip(") "))
+        else:
+            package = line.strip()
+            extra_args = []
+
+        click.echo(f"⬇️  Downloading {package} {extra_args if extra_args else ''}")
+
+        try:
+            cmd = [
+                "pip3", "download", "--no-deps",
+                "--only-binary=:all:",
+                "-d", str(deps_dir),
+                package,
+            ] + extra_args
+
+            rc = os.system(" ".join(shlex.quote(c) for c in cmd))
+            if rc != 0:
+                click.echo(f"❌ pip download failed for {package}")
+            else:
+                click.echo(f"✅ Downloaded {package} into {deps_dir}")
+        except Exception as e:
+            click.echo(f"❌ Error downloading {package}: {e}")
+
 def _download_github_repo(owner: str, repo: str, ref: str, dest_folder: str, token: str = None) -> str:
     """
     Download and extract a GitHub repo tarball via the REST API (no git required).
@@ -146,7 +214,15 @@ def _download_github_repo(owner: str, repo: str, ref: str, dest_folder: str, tok
     Returns:
         str: Path to the extracted repo
     """
-    url = f"https://api.github.com/repos/{owner}/{repo}/tarball/{ref}" if ref else f"https://api.github.com/repos/{owner}/{repo}/tarball"
+    # Encode ref for API, but sanitize separately for filesystem usage
+    if ref:
+        ref_encoded = quote(ref, safe="")  # safe for URL
+        ref_safe = ref.replace("/", "_")   # safe for filesystem
+        url = f"https://api.github.com/repos/{owner}/{repo}/tarball/{ref_encoded}"
+    else:
+        ref_encoded = ref_safe = None
+        url = f"https://api.github.com/repos/{owner}/{repo}/tarball"
+
     headers = {}
     if token:
         headers["Authorization"] = f"Bearer {token}"
@@ -163,12 +239,16 @@ def _download_github_repo(owner: str, repo: str, ref: str, dest_folder: str, tok
                 tmp_file.write(chunk)
             tmp_path = Path(tmp_file.name)
 
-    repo_dir = Path(dest_folder) / repo
+    # Use sanitized ref in folder name (if provided)
+    repo_dir_name = f"{repo}-{ref_safe}" if ref_safe else repo
+    repo_dir = Path(dest_folder) / repo_dir_name
     repo_dir.mkdir(parents=True, exist_ok=True)
 
     _extract_tar_strip_top_level(tmp_path, repo_dir)
     tmp_path.unlink(missing_ok=True)
+
     click.echo(f"✅ Downloaded GitHub repo to folder: {repo_dir}")
+    _download_requirements_wheels(repo_dir=repo_dir)
 
     try:
         _prepare_pipeline_project(repo_dir)
@@ -177,7 +257,7 @@ def _download_github_repo(owner: str, repo: str, ref: str, dest_folder: str, tok
 
     return str(repo_dir)
 
-def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal: bool = False, skip_models: bool = False) -> list:
+def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal: bool = False, skip_models: bool = False, tag: str = None) -> list:
     """
     Downloads resources defined in metadata to a local destination folder.
 
@@ -187,6 +267,7 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
         dest_folder (str): Local path to download resources into
         internal (bool): Whether to use internal download routing (if applicable)
         skip_models (bool): If True, skips downloading any file path starting with 'models/'
+        tag (str): metadata.json tag from GitHub will be passed into the resources in the file
 
     Returns:
         list: Paths to the downloaded local files
@@ -228,9 +309,10 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
                 org, name = repo_id.split("/", 1)
                 target_dir = os.path.join(dest_folder, name)
 
-                click.echo(f"🤗 Downloading Hugging Face repo: {repo_id}" + (f"@{revision}" if revision else ""))
+                click.echo(f"🤗 Downloading Hugging Face repo: {org}/{repo_id}" + (f"@{revision}" if revision else ""))
                 model_path = snapshot_download(
                     repo_id=repo_id,
+                    revision=revision,
                     local_dir=target_dir,
                     local_dir_use_symlinks=False
                 )
@@ -239,10 +321,11 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
 
             if resource.startswith("gh:"):
                 resource_spec = resource[3:]
+
                 if "@" in resource_spec:
                     repo_id, ref = resource_spec.split("@", 1)
                 else:
-                    repo_id, ref = resource_spec, None
+                    repo_id, ref = resource_spec, tag
 
                 if "/" not in repo_id:
                     raise click.ClickException(f"❌ Invalid GitHub repo spec: {resource}")
@@ -668,13 +751,19 @@ def _run_installation_script(metadata: Dict, extract_path: str = "."):
 
     print("✅ Installation completed successfully.")
 
-def _resolve_github_metadata_url(gh_ref: str) -> str:
+def _resolve_github_metadata_url(gh_ref: str) -> tuple[str, str]:
     """
-    Resolve a GitHub shorthand like gh:org/repo@tag into a raw URL for metadata.json.
+    Resolve a GitHub shorthand like gh:org/repo@tag into a local metadata.json file path.
     If tag is omitted, defaults to 'main'.
+
+    Args:
+        gh_ref (str): Reference in the form 'gh:org/repo@tag'
+    
+    Returns:
+        tuple[str, str]: (local_path_to_metadata_json, tag_used)
     """
     try:
-        _, repo_ref = gh_ref.split(":", 1)  # remove 'gh:'
+        _, repo_ref = gh_ref.split(":", 1)  # strip 'gh:'
         if "@" in repo_ref:
             org_repo, tag = repo_ref.split("@", 1)
         else:
@@ -683,28 +772,38 @@ def _resolve_github_metadata_url(gh_ref: str) -> str:
         owner, repo = org_repo.split("/", 1)
         token = os.getenv("GITHUB_TOKEN")
 
-        # Use GitHub API to fetch the metadata.json file
-        api_url = f"https://api.github.com/repos/{owner}/{repo}/contents/metadata.json?ref={tag}"
+        # Encode the ref safely for GitHub API
+        tag_encoded = quote(tag, safe="")
+
+        # GitHub API URL for raw file contents
+        api_url = (
+            f"https://api.github.com/repos/{owner}/{repo}/contents/metadata.json?ref={tag_encoded}"
+        )
         headers = {"Accept": "application/vnd.github.v3.raw"}
         if token:
-            headers["Authorization"] = f"token {token}"
+            headers["Authorization"] = f"Bearer {token}"
 
         r = requests.get(api_url, headers=headers)
         r.raise_for_status()
-        
-        # Write metadata.json locally so downstream logic can use a file/URL
-        local_path = os.path.join("/tmp", f"{repo}-{tag}-metadata.json")
+
+        # --- Sanitize tag for filesystem use ---
+        tag_safe = tag.replace("/", "_")
+
+        # Write metadata.json locally
+        local_path = os.path.join("/tmp", f"{repo}-{tag_safe}-metadata.json")
         with open(local_path, "wb") as f:
             f.write(r.content)
 
-        return local_path
+        return local_path, tag
     except Exception as e:
         raise RuntimeError(f"Failed to resolve GitHub metadata URL {gh_ref}: {e}")
 
 def install_from_metadata(metadata_url: str, internal: bool, install_dir: str = '.'):
     try:
+        tag = None
+
         if metadata_url.startswith("gh:"):
-            metadata_url = _resolve_github_metadata_url(metadata_url)
+            metadata_url, tag = _resolve_github_metadata_url(metadata_url)
             internal = False
 
         metadata, _ = _download_and_validate_metadata(metadata_url, internal)
@@ -712,7 +811,7 @@ def install_from_metadata(metadata_url: str, internal: bool, install_dir: str =
 
         if _check_whether_disk_is_big_enough(metadata):
             if _is_platform_compatible(metadata):
-                local_paths = _download_assets(metadata, metadata_url, install_dir, internal)
+                local_paths = _download_assets(metadata, metadata_url, install_dir, internal, tag=tag)
                 if len(local_paths) > 0:
                     _combine_multipart_files(install_dir)
                     _extract_archives_in_folder(install_dir, local_paths)
@@ -730,22 +829,32 @@ def metadata_resolver(component: str, version: str = None, tag: str = None) -> s
 
     Args:
         component (str): Component name (e.g., "examples.llima" or "assets/ragfps")
-        version (str): Required unless component starts with "assets/"
+        version (str): Optional. If not provided, auto-detect from /etc/build.
         tag (str): Optional tag to use (e.g., "dev")
 
     Returns:
         str: Fully qualified metadata URL
     """
+
     if tag:
         metadata_name = f"metadata-{tag}.json"
     else:
         metadata_name = "metadata.json"
 
+    # --- Asset case, assets are SDK version agnostic ---
     if component.startswith("assets/"):
         return f"https://docs.sima.ai/{component}/{metadata_name}"
 
+    # --- Auto-detect SDK version if missing ---
     if not version:
-        raise ValueError("Version (-v) is required for non-asset components.")
+        core_version, _ = get_sima_build_version()
+        if core_version:
+            version = core_version
+        else:
+            raise ValueError(
+                "Version (-v) is required and could not be auto-detected "
+                "from /etc/build or /etc/buildinfo."
+            )
 
     sdk_path = f"SDK{version}"
     return f"https://docs.sima.ai/pkg_downloads/{sdk_path}/{component}/{metadata_name}"

sima_cli/install/metadata_validator.py

@@ -8,6 +8,7 @@ class MetadataValidationError(Exception):
 
 VALID_TYPES = {"board", "palette", "host"}
 VALID_OS = {"linux", "windows", "mac"}
+VALID_DEVKIT_SW = {"yocto", "elxr"}
 
 def validate_metadata(data: dict):
     # Top-level required fields
@@ -34,6 +35,15 @@ def validate_metadata(data: dict):
             if not isinstance(platform["compatible_with"], list):
                 raise MetadataValidationError(f"'compatible_with' must be a list in entry {i}")
 
+            # ✅ Check optional devkit_sw
+            if "devkit_sw" in platform:
+                devkit_sw_value = platform["devkit_sw"].lower()
+                if devkit_sw_value not in VALID_DEVKIT_SW:
+                    raise MetadataValidationError(
+                        f"Invalid 'devkit_sw' value '{platform['devkit_sw']}' in platform entry {i}. "
+                        f"Must be one of {VALID_DEVKIT_SW}"
+                    )
+
         if "os" in platform:
             if not isinstance(platform["os"], list):
                 raise MetadataValidationError(f"'os' must be a list in entry {i}")
@@ -81,7 +91,6 @@ def validate_metadata(data: dict):
                 )
 
             try:
-                # Extract number (e.g., "30GB" → 30.0)
                 float(size_str[:-2].strip())
             except ValueError:
                 raise MetadataValidationError(
@@ -135,4 +144,4 @@ def main():
         sys.exit(1)
 
 if __name__ == "__main__":
-    main()
+    main()

sima_cli/model_zoo/model.py

@@ -4,6 +4,7 @@ import requests
 import click
 import os
 import yaml
+from InquirerPy import inquirer
 from urllib.parse import urlparse
 from rich import print
 from rich.table import Table
@@ -186,35 +187,38 @@ def _download_model_internal(ver: str, model_name: str):
             else:
                 click.echo("⚠️ model_path.txt exists but does not contain a valid URL.")
 
-def _list_available_models_internal(version: str):
+def _list_available_models_internal(version: str, boardtype: str):
+    """
+    Query Artifactory for available models for the given SDK version.
+    Display them in an interactive menu with an 'Exit' option.
+    Apply boardtype filtering:
+      - gen1_target* → only shown for mlsoc
+      - gen2_target* → only shown for modalix
+      - others → always shown
+    """
     repo_path = f"SiMaCLI-SDK-Releases/{version}-Release/modelzoo_edgematic"
     aql_query = f"""
-                items.find({{
-                "repo": "sima-qa-releases",
-                "path": {{
-                    "$match": "{repo_path}/*"
-                }},
-                "type": "folder"
-                }}).include("repo", "path", "name")
-                """.strip()
+        items.find({{
+            "repo": "sima-qa-releases",
+            "path": {{"$match": "{repo_path}/*"}},
+            "type": "folder"
+        }}).include("repo","path","name")
+    """.strip()
 
     aql_url = f"{ARTIFACTORY_BASE_URL}/api/search/aql"
-    print(aql_url)
     headers = {
         "Content-Type": "text/plain",
         "Authorization": f"Bearer {get_auth_token(internal=True)}"
     }
 
     response = requests.post(aql_url, data=aql_query, headers=headers)
-
     if response.status_code != 200:
-        click.echo(f"Failed to retrieve model list. Status: {response.status_code}")
+        click.echo(f"❌ Failed to retrieve model list (status {response.status_code})")
         click.echo(response.text)
-        return
+        return None
 
     results = response.json().get("results", [])
-    
-    base_prefix = f"SiMaCLI-SDK-Releases/{version}-Release/modelzoo_edgematic/"
+    base_prefix = f"{repo_path}/"
     model_paths = sorted({
         item["path"].replace(base_prefix, "").rstrip("/") + "/" + item["name"]
         for item in results
@@ -222,20 +226,63 @@ def _list_available_models_internal(version: str):
 
     if not model_paths:
         click.echo("No models found.")
-        return
-
-    # Pretty print table
-    max_len = max(len(name) for name in model_paths)
-    click.echo(f"{'-' * max_len}")
-    for path in model_paths:
-        click.echo(path.ljust(max_len))
-
-    return model_paths
-
-def list_models(internal, ver):
+        return None
+
+    # Apply boardtype filtering
+    filtered_models = []
+    for model in model_paths:
+        if model.startswith("gen1_target") and boardtype != "mlsoc":
+            continue
+        if model.startswith("gen2_target") and boardtype != "modalix":
+            continue
+        filtered_models.append(model)
+
+    if not filtered_models:
+        click.echo(f"No models found for board type '{boardtype}'.")
+        return None
+
+    while True:
+        # Add Exit option
+        choices = filtered_models + ["Exit"]
+
+        # Interactive selection with InquirerPy
+        selected_model = inquirer.fuzzy(
+            message=f"Select a model from version {version}:",
+            choices=choices,
+            max_height="70%",
+            instruction="(Use ↑↓ to navigate, / to search, Enter to select)"
+        ).execute()
+
+        if selected_model == "Exit":
+            click.echo("👋 Exiting without selecting a model.")
+            return None
+
+        click.echo(f"✅ Selected model: {selected_model}")
+
+        # Auto-describe
+        _describe_model_internal(version, selected_model)
+
+        # Action menu loop
+        while True:
+            action = inquirer.select(
+                message=f"What do you want to do with {selected_model}?",
+                choices=["Download model", "Back", "Exit"],
+                default="Download model",
+                qmark="👉",
+            ).execute()
+
+            if action == "Download model":
+                _download_model_internal(version, selected_model)
+            elif action == "Back":
+                break  # back to model list
+            else:  # Exit
+                click.echo("👋 Exiting.")
+                return None
+
+def list_models(internal, ver, boardtype):
     if internal:
         click.echo("Model Zoo Source : SiMa Artifactory...")
-        return _list_available_models_internal(ver)
+        return _list_available_models_internal(ver, boardtype)
     else:
         print('External model zoo not supported yet')
 
@@ -260,4 +307,5 @@ if __name__ == "__main__":
         print("Usage: python models.py <version>")
     else:
         version_arg = sys.argv[1]
-        _list_available_models_internal(version_arg)
+        boardtype = sys.argv[2]
+        _list_available_models_internal(version_arg, boardtype)

sima_cli/update/netboot.py

@@ -52,7 +52,9 @@ def flash_emmc(client_manager, emmc_image_paths):
 
     for path in emmc_image_paths:
         click.echo(f"📤 Copying {path} to {selected_ip}:{remote_dir}")
-        success = copy_file_to_remote_board(selected_ip, path, remote_dir, passwd=DEFAULT_PASSWORD)
+        success = copy_file_to_remote_board(
+            selected_ip, path, remote_dir, passwd=DEFAULT_PASSWORD
+        )
         if not success:
             click.echo(f"❌ Failed to copy {path} to {selected_ip}. Aborting.")
             return
@@ -61,36 +63,44 @@ def flash_emmc(client_manager, emmc_image_paths):
         ssh = init_ssh_session(selected_ip, password=DEFAULT_PASSWORD)
 
         # Step a: Check if eMMC exists
-        check_cmd = "[ -e /dev/mmcblk0p1 ] || (echo '❌ /dev/mmcblk0p1 not found'; exit 1)"
+        check_cmd = "[ -e /dev/mmcblk0 ] || (echo '❌ /dev/mmcblk0 not found'; exit 1)"
         run_remote_command(ssh, check_cmd)
 
-        # Step b: Flash with bmaptool
-        wic_path = next((p for p in emmc_image_paths if p.endswith(".wic.gz")), None)
-        if not wic_path:
-            click.echo("❌ No .wic.gz image found in emmc_image_paths.")
-            return
-
-        # Step c: umount the emmc
+        # Step b: umount eMMC
         pre_unmount_cmd = (
             "sudo mount | grep mmcblk0 | awk '{print $3}' | while read mnt; do "
             "sudo umount \"$mnt\"; done"
         )
         run_remote_command(ssh, pre_unmount_cmd)
 
-        # Step d: bmaptool copy the image
-        filename = os.path.basename(wic_path)
-        remote_path = f"/tmp/{filename}"        
-        flash_cmd = f"sudo bmaptool copy {remote_path} /dev/mmcblk0"
-        run_remote_command(ssh, flash_cmd)
-
-        # Step d: Fix GPT
-        fix_cmd = 'sudo printf "fix\n" | sudo parted ---pretend-input-tty /dev/mmcblk0 print'
-        run_remote_command(ssh, fix_cmd)
+        # Step c: Decide flashing method
+        wic_path = next((p for p in emmc_image_paths if p.endswith(".wic.gz")), None)
+        img_path = next((p for p in emmc_image_paths if p.endswith(".img")), None)
+
+        if wic_path:
+            filename = os.path.basename(wic_path)
+            remote_path = f"/tmp/{filename}"
+            flash_cmd = f"sudo bmaptool copy {remote_path} /dev/mmcblk0"
+            run_remote_command(ssh, flash_cmd)
+
+            # Step d: Fix GPT for Yocto
+            fix_cmd = 'sudo printf "fix\n" | sudo parted ---pretend-input-tty /dev/mmcblk0 print'
+            run_remote_command(ssh, fix_cmd)
+
+        elif img_path:
+            filename = os.path.basename(img_path)
+            remote_path = f"/tmp/{filename}"
+            flash_cmd = f"sudo dd if={remote_path} of=/dev/mmcblk0 bs=4M conv=fsync status=progress"
+            run_remote_command(ssh, flash_cmd)
+        else:
+            click.echo("❌ No .wic.gz or .img image found in emmc_image_paths.")
+            return
 
         click.echo("✅ Flash completed. Please reboot the board to boot from eMMC.")
     except Exception as e:
         click.echo(f"❌ Flashing failed: {e}")
 
+
 class ClientManager:
     """Manages TFTP client state and monitoring."""
     def __init__(self):
@@ -337,7 +347,7 @@ def run_cli(client_manager):
                 else:
                     click.echo("📭 No TFTP client requests received yet.")
             elif user_input == "f":
-                click.echo("🔧 Initiating eMMC flash (implementation pending).")
+                click.echo(f"🔧 Initiating eMMC flash {emmc_image_paths}.")
                 flash_emmc(client_manager, emmc_image_paths)
             elif user_input == "":
                 continue
@@ -347,7 +357,7 @@ def run_cli(client_manager):
             click.echo("\n🛑 Exiting netboot session.")
             return True
 
-def setup_netboot(version: str, board: str, internal: bool = False, autoflash: bool = False, flavor: str = 'headless', rootfs: str = ''):
+def setup_netboot(version: str, board: str, internal: bool = False, autoflash: bool = False, flavor: str = 'headless', rootfs: str = '', swtype: str = 'yocto'):
     """
     Download and serve a bootable image for network boot over TFTP with client monitoring.
 
@@ -358,6 +368,7 @@ def setup_netboot(version: str, board: str, internal: bool = False, autoflash: b
         autoflash (bool): Whether to automatically flash the devkit when networked booted. Defaults to False.
         flavor (str): The software flavor, can be either headless or full.
         rootfs (str): The root fs folder, which contains the .wic.gz file and the .bmap file, for custom image writing.
+        swtype (str): The software type, either yocto or elxr.
 
     Raises:
         RuntimeError: If the download or TFTP setup fails.
@@ -370,8 +381,8 @@ def setup_netboot(version: str, board: str, internal: bool = False, autoflash: b
         exit(1)
 
     try:
-        click.echo(f"⬇️ Downloading netboot image for version: {version}, board: {board}")
-        file_list = download_image(version, board, swtype="yocto", internal=internal, update_type='netboot', flavor=flavor)
+        click.echo(f"⬇️ Downloading netboot image for version: {version}, board: {board}, swtype: {swtype}")
+        file_list = download_image(version, board, swtype=swtype, internal=internal, update_type='netboot', flavor=flavor)
         if not isinstance(file_list, list):
             raise ValueError("Expected list of extracted files, got something else.")
         extract_dir = os.path.dirname(file_list[0])
@@ -380,7 +391,8 @@ def setup_netboot(version: str, board: str, internal: bool = False, autoflash: b
         # Extract specific image paths
         wic_gz_file = next((f for f in file_list if f.endswith(".wic.gz")), None)
         bmap_file = next((f for f in file_list if f.endswith(".wic.bmap")), None)
-        emmc_image_paths = [p for p in [wic_gz_file, bmap_file] if p]
+        elxr_img_file = next((f for f in file_list if f.endswith(".img")), None)
+        emmc_image_paths = [p for p in [wic_gz_file, bmap_file, elxr_img_file] if p]
 
         # Check global custom_rootfs before doing anything else
         custom_rootfs = rootfs
@@ -391,13 +403,14 @@ def setup_netboot(version: str, board: str, internal: bool = False, autoflash: b
             import glob
             wic_gz_file = next(iter(glob.glob(os.path.join(custom_rootfs, "*.wic.gz"))), None)
             bmap_file   = next(iter(glob.glob(os.path.join(custom_rootfs, "*.wic.bmap"))), None)
+            exlr_file   = next(iter(glob.glob(os.path.join(custom_rootfs, "*.img"))), None)
 
             if not (wic_gz_file and bmap_file):
                 raise RuntimeError(
                     f"❌ custom_rootfs '{custom_rootfs}' must contain both .wic.gz and .wic.bmap files."
                 )
 
-            emmc_image_paths = [wic_gz_file, bmap_file]
+            emmc_image_paths = [wic_gz_file, bmap_file, exlr_file]
             click.echo(f"📁 Using custom_rootfs: {custom_rootfs}")
 
         click.echo(f"📁 eMMC image paths are: {emmc_image_paths}")