sima-cli 0.0.22__py3-none-any.whl → 0.0.23__py3-none-any.whl

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.22"
+__version__ = "0.0.23"

sima_cli/cli.py

@@ -11,7 +11,8 @@ from sima_cli.install.optiview import install_optiview
 from sima_cli.install.hostdriver import install_hostdriver
 from sima_cli.install.metadata_installer import install_from_metadata, metadata_resolver
 from sima_cli.serial.serial import connect_serial
-from sima_cli.nvme.nvme import nvme_format, nvme_remount
+from sima_cli.storage.nvme import nvme_format, nvme_remount
+from sima_cli.storage.sdcard import sdcard_format
 from sima_cli.network.network import network_menu
 
 # Entry point for the CLI tool using Click's command group decorator
@@ -232,10 +233,11 @@ def show_mla_memory_usage(ctx):
 @main.command(name="bootimg")
 @click.option("-v", "--version", required=True, help="Firmware version to download and write (e.g., 1.6.0)")
 @click.option("-b", "--boardtype", type=click.Choice(["modalix",  "mlsoc"], case_sensitive=False), default="mlsoc", show_default=True, help="Target board type.")
+@click.option("-t", "--fwtype", type=click.Choice(["yocto",  "elxr"], case_sensitive=False), default="yocto", show_default=True, help="Target firmware type.")
 @click.option("-n", "--netboot", is_flag=True, default=False, show_default=True, help="Prepare image for network boot and launch TFTP server.")
 @click.option("-a", "--autoflash", is_flag=True, default=False, show_default=True, help="Net boot the DevKit and automatically flash the internal storage - TBD")
 @click.pass_context
-def bootimg_cmd(ctx, version, boardtype, netboot, autoflash):
+def bootimg_cmd(ctx, version, boardtype, netboot, autoflash, fwtype):
     """
     Download and burn a removable media or setup TFTP boot.
 
@@ -257,6 +259,7 @@ def bootimg_cmd(ctx, version, boardtype, netboot, autoflash):
     click.echo(f"📦 Preparing boot image:")
     click.echo(f"   🔹 Version   : {version}")
     click.echo(f"   🔹 Board Type: {boardtype}")
+    click.echo(f"   🔹 F/W Type  : {fwtype}")
     click.echo(f"   🔹 F/W Flavor: headless")
     
     try:
@@ -265,7 +268,7 @@ def bootimg_cmd(ctx, version, boardtype, netboot, autoflash):
             setup_netboot(version, boardtype, internal, autoflash, flavor='headless')
             click.echo("✅ Netboot image prepared and TFTP server is running.")
         else:
-            write_image(version, boardtype, 'yocto', internal, flavor='headless')
+            write_image(version, boardtype, fwtype, internal, flavor='headless')
             click.echo("✅ Boot image successfully written.")
         click.echo("✅ Boot image successfully written.")
     except Exception as e:
@@ -420,6 +423,31 @@ def nvme_cmd(ctx, operation):
         click.echo(f"❌ Unsupported NVMe operation: {operation}")
         ctx.exit(1)
 
+# ----------------------
+# NVME Subcommands
+# ----------------------
+NVME_OPERATIONS = {"format"}
+@main.command(name="sdcard")
+@click.argument("operation", type=click.Choice(NVME_OPERATIONS, case_sensitive=False))
+@click.pass_context
+def sdcard_cmd(ctx, operation):
+    """
+    Prepare the SD Card as a data storage device for MLSoc DevKit or Modalix Early Access Unit
+
+    Available operations:
+
+      format   - Format the SD Card
+
+    Example:
+      sima-cli sdcard format
+    """
+    operation = operation.lower()
+
+    if operation == "format":
+        sdcard_format()
+
+
+
 # ----------------------
 # App Zoo Subcommands
 # ----------------------

sima_cli/install/metadata_installer.py

@@ -425,23 +425,23 @@ def metadata_resolver(component: str, version: str = None, tag: str = None) -> s
     Resolve the metadata.json URL for a given component and version/tag.
 
     Args:
-        component (str): Component name (e.g., "examples.llima")
-        version (str): Optional SDK version string (e.g., "1.7.0")
+        component (str): Component name (e.g., "examples.llima" or "assets/ragfps")
+        version (str): Required unless component starts with "assets/"
         tag (str): Optional tag to use (e.g., "dev")
 
     Returns:
         str: Fully qualified metadata URL
     """
-    if not version:
-        raise ValueError("Version (-v) is required for non-hardcoded components.")
-
-    # Normalize version for URL path
-    sdk_path = f"SDK{version}"
-    base = f"https://docs.sima.ai/pkg_downloads/{sdk_path}/{component}"
-
     if tag:
         metadata_name = f"metadata-{tag}.json"
     else:
         metadata_name = "metadata.json"
 
-    return f"{base}/{metadata_name}"
+    if component.startswith("assets/"):
+        return f"https://docs.sima.ai/{component}/{metadata_name}"
+
+    if not version:
+        raise ValueError("Version (-v) is required for non-asset components.")
+
+    sdk_path = f"SDK{version}"
+    return f"https://docs.sima.ai/pkg_downloads/{sdk_path}/{component}/{metadata_name}"

sima_cli/{nvme → storage}/nvme.py

@@ -1,5 +1,7 @@
 import subprocess
 import click
+import re
+
 from sima_cli.utils.env import is_modalix_devkit
 
 def scan_nvme():
@@ -33,27 +35,45 @@ def format_nvme(lbaf_index):
 
 def add_nvme_to_fstab():
     """
-    Add /dev/nvme0n1p1 to /etc/fstab for persistent mounting at /mnt/nvme.
+    Add UUID-based entry for /dev/nvme0n1p1 to /etc/fstab for persistent mounting at /mnt/nvme.
     Only appends if the entry does not already exist.
-    Requires root permission to modify /etc/fstab.
+    Requires root permission to run blkid and modify /etc/fstab.
     """
+    device = "/dev/nvme0n1p1"
     fstab_path = "/etc/fstab"
-    nvme_entry = "/dev/nvme0n1p1  /mnt/nvme  ext4  defaults  0  2"
 
     try:
-        # Check if the entry already exists
+        # Get UUID and filesystem type using blkid
+        blkid_output = subprocess.check_output(["sudo", "blkid", device], text=True)
+        uuid_match = re.search(r'UUID="([^"]+)"', blkid_output)
+        type_match = re.search(r'TYPE="([^"]+)"', blkid_output)
+
+        if not uuid_match or not type_match:
+            click.echo("❌ Could not extract UUID or TYPE from blkid output.")
+            return
+
+        uuid = uuid_match.group(1)
+        fs_type = type_match.group(1)
+
+        # Construct the fstab line
+        fstab_entry = f"UUID={uuid}  /mnt/nvme  {fs_type}  defaults,noatime,noauto  0 0"
+
+        # Check if entry already exists
         with open(fstab_path, "r") as f:
             for line in f:
-                if "/dev/nvme0n1p1" in line or "/mnt/nvme" in line:
-                    click.echo("ℹ️  NVMe mount entry already exists in /etc/fstab.")
+                if uuid in line or "/mnt/nvme" in line:
+                    click.echo("ℹ️  NVMe UUID or mount point already exists in /etc/fstab.")
                     return
 
-        # Append the entry as sudo
-        append_cmd = f"echo '{nvme_entry}' | sudo tee -a {fstab_path} > /dev/null"
+        # Append the entry to fstab
+        append_cmd = f"echo '{fstab_entry}' | sudo tee -a {fstab_path} > /dev/null"
         subprocess.run(append_cmd, shell=True, check=True)
-        click.echo("✅ /etc/fstab updated to include NVMe auto-mount.")
+        click.echo(f"✅ Added NVMe UUID entry to /etc/fstab:\n{fstab_entry}")
+
+    except subprocess.CalledProcessError as e:
+        click.echo(f"❌ Failed to run blkid or append to fstab: {e}")
     except Exception as e:
-        click.echo(f"❌ Failed to update /etc/fstab: {e}")
+        click.echo(f"❌ Unexpected error: {e}")
 
 def mount_nvme():
     try:

sima_cli/storage/sdcard.py

@@ -0,0 +1,136 @@
+import click
+import subprocess
+import platform
+import shutil
+import sys
+import os
+import time
+
+from sima_cli.update.bootimg import list_removable_devices, unmount_device, _require_sudo
+from sima_cli.utils.env import is_sima_board
+
+def get_partition_path(device: str) -> str:
+    """For Linux: partition is device + '1'"""
+    return device + "1"
+
+
+def find_mkfs_ext4() -> str:
+    """Find mkfs.ext4 on Linux"""
+    mkfs_path = shutil.which("mkfs.ext4")
+    if mkfs_path and os.path.exists(mkfs_path):
+        return mkfs_path
+    return None
+
+
+def kill_partition_users(device_path: str):
+    """Kill processes using the partitions on the device"""
+    try:
+        output = subprocess.check_output(["lsblk", "-n", "-o", "NAME", device_path]).decode().strip().splitlines()
+        partitions = [f"/dev/{line.strip()}" for line in output if line.strip() and f"/dev/{line.strip()}" != device_path]
+        
+        for p in partitions:
+            try:
+                users = subprocess.check_output(["sudo", "lsof", p], stderr=subprocess.DEVNULL).decode().splitlines()
+                pids = {line.split()[1] for line in users[1:] if line.strip()}
+                for pid in pids:
+                    subprocess.run(["sudo", "kill", "-9", pid], check=False)
+            except subprocess.CalledProcessError:
+                # lsof exits 1 if no process is using the file
+                continue
+
+        # Let the system settle
+        time.sleep(1)
+
+    except Exception as e:
+        click.echo(f"⚠️ Could not resolve partition users: {e}")
+
+def create_partition_table(device_path: str):
+    """Linux: create a GPT partition table with one ext4 partition"""
+    click.echo(f"🧹 Wiping and partitioning {device_path} using parted (Linux)")
+    subprocess.run(["sudo", "parted", "-s", device_path, "mklabel", "gpt"], check=True)
+    subprocess.run(["sudo", "parted", "-s", device_path, "mkpart", "primary", "ext4", "0%", "100%"], check=True)
+    subprocess.run(["sudo", "partprobe", device_path], check=True)
+
+
+def force_release_device(device_path: str):
+    """
+    Try to forcefully release a device by killing users and removing mappings.
+    """
+    # Ensure partitions like /dev/sdc1 don't block parted
+    subprocess.run(["sudo", "umount", device_path + "1"], stderr=subprocess.DEVNULL)
+    subprocess.run(["sudo", "dmsetup", "remove", device_path], stderr=subprocess.DEVNULL)
+
+    # Try lsof to find open handles
+    try:
+        out = subprocess.check_output(["sudo", "lsof", device_path], stderr=subprocess.DEVNULL).decode()
+        for line in out.splitlines()[1:]:
+            pid = line.split()[1]
+            subprocess.run(["sudo", "kill", "-9", pid], check=False)
+    except subprocess.CalledProcessError:
+        # Likely no users
+        pass
+
+    # Final probe reset
+    subprocess.run(["sudo", "partprobe"], stderr=subprocess.DEVNULL)
+    subprocess.run(["sudo", "udevadm", "settle"], stderr=subprocess.DEVNULL)
+
+
+def sdcard_format():
+    """Linux-only SD card formatter for ext4."""
+
+    if platform.system() != "Linux":
+        click.echo("❌ This command only supports Desktop Linux.")
+        sys.exit(1)
+
+    if is_sima_board():
+        click.echo("❌ This command does not run on the DevKit due to lack of mkfs.ext4 support.")
+
+    mkfs_path = find_mkfs_ext4()
+    if not mkfs_path:
+        click.echo("❌ mkfs.ext4 not found on this platform.")
+        sys.exit(1)
+
+    devices = list_removable_devices()
+    if not devices:
+        click.echo("⚠️  No removable SD card found.")
+        return
+
+    click.echo("\n🔍 Detected removable devices:")
+    for i, d in enumerate(devices):
+        click.echo(f"[{i}] {d['path']} - {d['size']} - {d['name']}")
+
+    selected_path = None
+    if len(devices) == 1:
+        if click.confirm(f"\n✅ Use device {devices[0]['path']}?"):
+            selected_path = devices[0]['path']
+    else:
+        choice = click.prompt("Enter the number of the device to format", type=int)
+        if 0 <= choice < len(devices):
+            selected_path = devices[choice]['path']
+
+    if not selected_path:
+        click.echo("❌ No device selected. Operation cancelled.")
+        return
+
+    click.echo(f"\n🚨 WARNING: This will ERASE ALL DATA on {selected_path}")
+    if not click.confirm("Are you sure you want to continue?"):
+        click.echo("❌ Aborted by user.")
+        return
+
+    _require_sudo()
+    unmount_device(selected_path)
+    force_release_device(selected_path)
+    kill_partition_users(selected_path)
+
+    try:
+        create_partition_table(selected_path)
+        partition_path = get_partition_path(selected_path)
+
+        click.echo(f"🧱 Formatting partition {partition_path} as ext4 using {mkfs_path}")
+        subprocess.run(["sudo", mkfs_path, "-F", partition_path], check=True)
+
+        click.echo(f"✅ Successfully formatted {partition_path} as ext4, insert this SD card into MLSoC or Modalix Early Access Kit")
+
+    except subprocess.CalledProcessError as e:
+        click.echo(f"❌ Formatting failed: {e}")
+        sys.exit(1)

sima_cli/update/bootimg.py

@@ -306,7 +306,7 @@ def write_image(version: str, board: str, swtype: str, internal: bool = False, f
     Parameters:
         version (str): Firmware version to download (e.g., "1.6.0").
         board (str): Target board type, e.g., "modalix" or "mlsoc".
-        swtype (str): Software image type, e.g., "yocto" or "exlr".
+        swtype (str): Software image type, e.g., "yocto" or "elxr".
         internal (bool): Whether to use internal download sources. Defaults to False.
         flavor (str): Flavor of the software package - can be either headless or full.
 
@@ -318,17 +318,22 @@ def write_image(version: str, board: str, swtype: str, internal: bool = False, f
         file_list = download_image(version, board, swtype, internal, update_type='bootimg', flavor=flavor)
         if not isinstance(file_list, list):
             raise ValueError("Expected list of extracted files, got something else.")
+        
+        image_file = next(
+            (f for f in file_list if f.endswith(".wic") or f.endswith(".img")),
+            None
+        )
 
-        wic_file = next((f for f in file_list if f.endswith(".wic")), None)
-        if not wic_file:
-            raise FileNotFoundError("No .wic image file found after extraction.")
+        if not image_file:
+            raise FileNotFoundError("No .wic or .img image file found after extraction.")
 
     except Exception as e:
         raise RuntimeError(f"❌ Failed to download image: {e}")
 
     try:
-        click.echo(f"📝 Writing image to removable media: {wic_file}")
-        write_bootimg(wic_file)
+        click.echo(f"📝 Writing image to removable media: {image_file}")
+        write_bootimg(image_file)
+        
     except Exception as e:
         raise RuntimeError(f"❌ Failed to write image: {e}")
 

sima_cli/update/query.py

@@ -5,17 +5,32 @@ from sima_cli.utils.config import get_auth_token
 
 ARTIFACTORY_BASE_URL = artifactory_url() + '/artifactory'
 
-def _list_available_firmware_versions_internal(board: str, match_keyword: str = None, flavor: str = 'headless'):
-    fw_path = f"{board}" 
-    aql_query = f"""
-                items.find({{
-                    "repo": "soc-images",
-                    "path": {{
-                        "$match": "{fw_path}/*"
-                    }},
-                    "type": "folder"
-                }}).include("repo", "path", "name")
-                """.strip()
+def _list_available_firmware_versions_internal(board: str, match_keyword: str = None, flavor: str = 'headless', swtype: str = 'yocto'):
+    if swtype == 'yocto':
+        fw_path = f"{board}"
+        aql_query = f"""
+                    items.find({{
+                        "repo": "soc-images",
+                        "path": {{
+                            "$match": "{fw_path}/*"
+                        }},
+                        "type": "folder"
+                    }}).include("repo", "path", "name")
+                    """.strip()
+    elif swtype == 'elxr':
+        fw_path = f"elxr/{board}"
+        aql_query = f"""
+                    items.find({{
+                        "repo": "soc-images",
+                        "path": {{
+                            "$match": "{fw_path}/*/artifacts/palette"
+                        }},
+                        "name": "modalix-tftp-boot.tar.gz",
+                        "type": "file"
+                    }}).include("repo", "path", "name")
+                    """.strip()
+    else:
+        raise ValueError(f"Unsupported swtype: {swtype}")
 
     aql_url = f"{ARTIFACTORY_BASE_URL}/api/search/aql"
     headers = {
@@ -29,14 +44,18 @@ def _list_available_firmware_versions_internal(board: str, match_keyword: str =
 
     results = response.json().get("results", [])
 
-    # Reconstruct full paths and remove board prefix
-    full_paths = {
-        f"{item['path']}/{item['name']}".replace(fw_path + "/", "")
-        for item in results
-    }
-
-    # Extract top-level folders
-    top_level_folders = sorted({path.split("/")[0] for path in full_paths})
+    if swtype == 'yocto':
+        # Reconstruct full paths and remove board prefix
+        full_paths = {
+            f"{item['path']}/{item['name']}".replace(fw_path + "/", "")
+            for item in results
+        }
+        top_level_folders = sorted({path.split("/")[0] for path in full_paths})
+    else:  # elxr
+        # Extract version from path like: elxr/{board}/<version>/artifacts/palette
+        top_level_folders = sorted({
+            item['path'].split('/')[2] for item in results
+        })
 
     if match_keyword:
         match_keyword = match_keyword.lower()
@@ -46,7 +65,8 @@ def _list_available_firmware_versions_internal(board: str, match_keyword: str =
 
     return top_level_folders
 
-def _list_available_firmware_versions_external(board: str, match_keyword: str = None, flavor: str = 'headless'):
+
+def _list_available_firmware_versions_external(board: str, match_keyword: str = None, flavor: str = 'headless', swtype: str = 'yocto'):
     """
     Construct and return a list containing a single firmware download URL for a given board.
     
@@ -57,11 +77,11 @@ def _list_available_firmware_versions_external(board: str, match_keyword: str =
         board (str): The name of the hardware board.
         match_keyword (str, optional): A version string to match (e.g., '1.6' or '1.6.0').
         flavor (str, optional): A string indicating firmware flavor - headless or full.
+        swtype (str, optional): A string indicating firmware type - yocto or elxr.
 
     Returns:
         list[str]: A list containing one formatted firmware download URL.
     """
-    fwtype = 'yocto'
     cfg = load_resource_config()
     download_url_base = cfg.get('public').get('download').get('download_url')
 
@@ -69,14 +89,17 @@ def _list_available_firmware_versions_external(board: str, match_keyword: str =
         if re.fullmatch(r'\d+\.\d+', match_keyword):
             match_keyword += '.0'
 
+    # If it's headless then don't append flavor str to the URL, otherwise add it.
+    flavor_str = 'full-' if flavor == 'full' else ''
+
     firmware_download_url = (
-        f'{download_url_base}SDK{match_keyword}/devkit/{board}/{fwtype}/'
-        f'simaai-devkit-fw-{board}-{fwtype}-{match_keyword}.tar.gz'
+        f'{download_url_base}SDK{match_keyword}/devkit/{board}/{swtype}/'
+        f'simaai-devkit-fw-{board}-{swtype}-{flavor_str}{match_keyword}.tar.gz'
     )
     return [firmware_download_url]
 
 
-def list_available_firmware_versions(board: str, match_keyword: str = None, internal: bool = False, flavor: str = 'headless'):
+def list_available_firmware_versions(board: str, match_keyword: str = None, internal: bool = False, flavor: str = 'headless', swtype: str = 'yocto'):
     """
     Public interface to list available firmware versions.
 
@@ -90,6 +113,6 @@ def list_available_firmware_versions(board: str, match_keyword: str = None, inte
     - List[str] of firmware version folder names, or None if access is not allowed
     """
     if not internal:
-        return _list_available_firmware_versions_external(board, match_keyword, flavor)
+        return _list_available_firmware_versions_external(board, match_keyword, flavor, swtype)
 
-    return _list_available_firmware_versions_internal(board, match_keyword, flavor)
+    return _list_available_firmware_versions_internal(board, match_keyword, flavor, swtype)

sima_cli/update/remote.py

@@ -237,13 +237,8 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
 
         # Run Palette update
         _flavor = 'palette' if flavor == 'headless' else 'graphics'
-        run_remote_command(
-            ssh,
-            f"sudo swupdate -H simaai-image-{_flavor}:1.0 -i /tmp/{palette_name}",
-            password=passwd
-        )
-        click.echo("✅ Board image update complete.")
 
+        # Set necessary env first to make sure it can access NVMe device
         if _flavor == 'graphics':
             click.echo(f"⚠️  With full image, setting U-Boot environment variable to support NVMe and GPU.")
             run_remote_command(
@@ -252,6 +247,13 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
                 password=passwd
             )
 
+        run_remote_command(
+            ssh,
+            f"sudo swupdate -H simaai-image-{_flavor}:1.0 -i /tmp/{palette_name}",
+            password=passwd
+        )
+        click.echo("✅ Board image update complete.")
+
         # In the case of PCIe system, we don't need to reboot the card, instead, we will let it finish then update the PCIe driver in the host
         # After that we can reboot the whole system.
         if reboot_and_wait:

sima_cli/update/updater.py

@@ -29,7 +29,7 @@ else:
 def convert_flavor(flavor: str = 'headless'):
     return 'palette' if flavor == 'headless' else 'graphics'
 
-def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = False, flavor: str = 'headless') -> str:
+def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = False, flavor: str = 'headless', swtype: str = 'yocto') -> str:
     """
     Resolve the final firmware download URL based on board, version, and environment.
 
@@ -38,6 +38,7 @@ def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = Fals
         board (str): Board type ('davinci' or 'modalix').
         internal (bool): Whether to use internal config for URL construction.
         flavor (str): firmware image flavor, can be headless or full.
+        swtype (str): firmware image type, can be yocto or elxr
 
     Returns:
         str: Full download URL.
@@ -61,11 +62,16 @@ def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = Fals
     if board == 'davinci':
         flavor = 'headless'
 
-    image_file = 'release.tar.gz' if flavor == 'headless' else 'graphics.tar.gz'
-    download_url = url.rstrip("/") + f"/soc-images/{board}/{version_or_url}/artifacts/{image_file}"
+    if swtype == 'yocto':
+        image_file = 'release.tar.gz' if flavor == 'headless' else 'graphics.tar.gz'
+        download_url = url.rstrip("/") + f"/soc-images/{board}/{version_or_url}/artifacts/{image_file}"
+    elif swtype == 'elxr':
+        image_file = 'elxr-palette-modalix-1.7.0-arm64.img.gz' # temporary, this should change. 
+        download_url = url.rstrip("/") + f"/soc-images/elxr/{board}/{version_or_url}/artifacts/palette/{image_file}"
+
     return download_url
 
-def _pick_from_available_versions(board: str, version_or_url: str, internal: bool, flavor: str) -> str:
+def _pick_from_available_versions(board: str, version_or_url: str, internal: bool, flavor: str, swtype: str) -> str:
     """
     Presents an interactive menu (with search) for selecting a firmware version.
     """
@@ -73,7 +79,7 @@ def _pick_from_available_versions(board: str, version_or_url: str, internal: boo
     if "http" in version_or_url:
         return version_or_url
 
-    available_versions = list_available_firmware_versions(board, version_or_url, internal, flavor)
+    available_versions = list_available_firmware_versions(board, version_or_url, internal, flavor, swtype)
 
     try:
         if len(available_versions) > 1:
@@ -136,7 +142,7 @@ def _extract_required_files(tar_path: str, board: str, update_type: str = 'stand
 
     Returns:
         list: List of full paths to extracted files.
-    """
+    """    
     extract_dir = os.path.dirname(tar_path)
     _flavor = convert_flavor(flavor)
 
@@ -166,8 +172,28 @@ def _extract_required_files(tar_path: str, board: str, update_type: str = 'stand
             f"simaai-image-{_flavor}-{board}.wic.bmap",
             f"simaai-image-{_flavor}-{board}.cpio.gz"
         }
+
     extracted_paths = []
 
+    # Handle .img.gz downloaded directly (e.g., ELXR palette image)
+    if tar_path.endswith(".img.gz"):
+        extract_dir = os.path.dirname(tar_path)
+        uncompressed_path = tar_path[:-3]  # Remove .gz → .img
+
+        if os.path.exists(uncompressed_path):
+            click.echo(f"⚠️  Skipping decompression: {uncompressed_path} already exists")
+            return [tar_path, uncompressed_path]
+
+        try:
+            with gzip.open(tar_path, 'rb') as f_in:
+                with open(uncompressed_path, 'wb') as f_out:
+                    shutil.copyfileobj(f_in, f_out)
+            click.echo(f"📦 Decompressed .img: {uncompressed_path}")
+            return [tar_path, uncompressed_path]
+        except Exception as e:
+            click.echo(f"❌ Failed to decompress {tar_path}: {e}")
+            return []
+
     try:
         try:
             tar = tarfile.open(tar_path, mode="r:gz")
@@ -177,7 +203,8 @@ def _extract_required_files(tar_path: str, board: str, update_type: str = 'stand
         with tar:
             for member in tar.getmembers():
                 base_name = os.path.basename(member.name)
-                if base_name in target_filenames:
+
+                if base_name in target_filenames or base_name.endswith(".img.gz"):
                     full_dest_path = os.path.join(extract_dir, member.name)
 
                     if os.path.exists(full_dest_path):
@@ -189,9 +216,9 @@ def _extract_required_files(tar_path: str, board: str, update_type: str = 'stand
                         click.echo(f"✅ Extracted: {full_dest_path}")
                         extracted_paths.append(full_dest_path)
 
-                    # If it's a .wic.gz file, decompress it now
+                    # Handle .wic.gz decompression
                     if full_dest_path.endswith(".wic.gz"):
-                        uncompressed_path = full_dest_path[:-3]  # remove .gz
+                        uncompressed_path = full_dest_path[:-3]
 
                         if os.path.exists(uncompressed_path):
                             click.echo(f"⚠️  Skipping decompression: {uncompressed_path} already exists")
@@ -216,8 +243,9 @@ def _extract_required_files(tar_path: str, board: str, update_type: str = 'stand
         click.echo(f"❌ Failed to extract files from archive: {e}")
         return []
 
+
     
-def _download_image(version_or_url: str, board: str, internal: bool = False, update_type: str = 'standard', flavor: str = 'headless'):
+def _download_image(version_or_url: str, board: str, internal: bool = False, update_type: str = 'standard', flavor: str = 'headless', swtype: str = 'yocto'):
     """
     Download or use a firmware image for the specified board and version or file path.
 
@@ -226,6 +254,7 @@ def _download_image(version_or_url: str, board: str, internal: bool = False, upd
         board (str): Target board type ('davinci' or 'modalix').
         internal (bool): Whether to use internal Artifactory resources.
         flavor (str): Flavor of the image, can be headless or full, supported for Modalix only.
+        swtype (str): Type of the image, can be yocto or elxr, supported for all H/W platforms. 
 
     Notes:
         - If a local file is provided, it skips downloading.
@@ -243,7 +272,7 @@ def _download_image(version_or_url: str, board: str, internal: bool = False, upd
             image_url = version_or_url
         else:
             # Case 3: Resolve standard version string (Artifactory/AWS)
-            image_url = _resolve_firmware_url(version_or_url, board, internal, flavor=flavor)
+            image_url = _resolve_firmware_url(version_or_url, board, internal, flavor=flavor, swtype=swtype)
 
         # Determine platform-safe temp directory
         temp_dir = tempfile.gettempdir()
@@ -414,9 +443,9 @@ def download_image(version_or_url: str, board: str, swtype: str, internal: bool
     """
     
     if 'http' not in version_or_url and not os.path.exists(version_or_url): 
-        version_or_url = _pick_from_available_versions(board, version_or_url, internal, flavor)
+        version_or_url = _pick_from_available_versions(board, version_or_url, internal, flavor, swtype)
 
-    extracted_paths = _download_image(version_or_url, board, internal, update_type, flavor=flavor) 
+    extracted_paths = _download_image(version_or_url, board, internal, update_type, flavor=flavor, swtype=swtype) 
     return extracted_paths
 
 def perform_update(version_or_url: str, ip: str = None, internal: bool = False, passwd: str = "edgeai", auto_confirm: bool = False, flavor: str = 'headless'):

{sima_cli-0.0.22.dist-info → sima_cli-0.0.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 0.0.22
+Version: 0.0.23
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://developer.sima.ai/
 Author: SiMa.ai

{sima_cli-0.0.22.dist-info → sima_cli-0.0.23.dist-info}/RECORD

@@ -1,7 +1,7 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=lZAZ5KAyL1sCs70SHAhw90CQC4944919Ga30NNcR4_g,49
-sima_cli/cli.py,sha256=dO6MG8sBX7LKJ-FhPQf7bw8oqSlosDXKcBaVbCIDZWQ,16056
+sima_cli/__version__.py,sha256=uP54joL5aVt8APefW7CPeBCn_PlfOZtxwbefmF7sYaI,49
+sima_cli/cli.py,sha256=crfrcrBW-SsxtVJFGCDTU42Z342Yk_Isp0gynjKmc3c,16899
 sima_cli/app_zoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/app_zoo/app.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,7 +14,7 @@ sima_cli/download/downloader.py,sha256=nCBrr_0WdnKTIyecwKpg1sCdfm_4PSQTRPwEbiezy
 sima_cli/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/install/hostdriver.py,sha256=kAWDLebs60mbWIyTbUxmNrChcKW1uD5r7FtWNSUVUE4,5852
 sima_cli/install/metadata_info.py,sha256=wmMqwzGfXbuilkqaxRVrFOzOtTOiONkmPCyA2oDAQpA,2168
-sima_cli/install/metadata_installer.py,sha256=mtwtBEMmLh6-Hqtv6CTTAQa76sRJXZCqE9ORPQutfcc,16547
+sima_cli/install/metadata_installer.py,sha256=vC7FamvGnE-WbI2AC3PAjJmMkP33IUW8D8ZzKrePPzs,16615
 sima_cli/install/metadata_validator.py,sha256=7954rp9vFRNnqmIMvCVTjq40kUIEbGXzfc8HmQmChe0,5221
 sima_cli/install/optiview.py,sha256=i5eWVor-9MScEfrQm3Ty9OP4VpSsCgWvNh7AvYdZu7s,3365
 sima_cli/install/palette.py,sha256=uRznoHa4Mv9ZXHp6AoqknfC3RxpYNKi9Ins756Cyifk,3930
@@ -22,19 +22,20 @@ sima_cli/mla/meminfo.py,sha256=ndc8kQJmWGEIdvNh6iIhATGdrkqM2pbddr_eHxaPNfg,1466
 sima_cli/model_zoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/model_zoo/model.py,sha256=q91Nrg62j1TqwPO8HiX4nlEFCCmzNEFcyFTBVMbJm8w,9836
 sima_cli/network/network.py,sha256=ToDCQBfX0bUFEWWtfS8srImK5T11MX6R4MBQFM80faY,7617
-sima_cli/nvme/nvme.py,sha256=ECdd25fvFbs5T5_PlIwnxm3NiPNmqnFGXrgLZhLENRY,4129
 sima_cli/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/sdk/syscheck.py,sha256=h9zCULW67y4i2hqiGc-hc1ucBDShA5FAe9NxwBGq-fM,4575
 sima_cli/serial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/serial/serial.py,sha256=6xRta_PzE_DmmooYq35lbK76TYpAny5SEJAdYC_3fH0,4141
+sima_cli/storage/nvme.py,sha256=WHeNoz0r8vQwtcrcLSf8IQsj4rc_eVt8KlxhX0wwk3M,4855
+sima_cli/storage/sdcard.py,sha256=7X0r80U87YmJorV5CHLVzvXFtZcj6Agjv4y5M2UOKiQ,5031
 sima_cli/update/__init__.py,sha256=0P-z-rSaev40IhfJXytK3AFWv2_sdQU4Ry6ei2sEus0,66
 sima_cli/update/bmaptool.py,sha256=KrhUGShBwY4Wzz50QiuMYAxxPgEy1nz5C68G-0a4qF4,4988
-sima_cli/update/bootimg.py,sha256=jsxMv7OlrDP_fjzfTMn5UoiSOv7afB2LSM0pR50b4uE,13541
+sima_cli/update/bootimg.py,sha256=Eg8ZSp8LMZXbOMxX4ZPCjFOg3YEufmsVfojKrRc3fug,13631
 sima_cli/update/local.py,sha256=Blje7O2pcBopBLXwuVI826lnjPMTJ3lPU85dTUWUV48,3445
 sima_cli/update/netboot.py,sha256=RqFgBhixcjPEwdVGvKhR0TeztoFnmGigmXlA71WVksA,18647
-sima_cli/update/query.py,sha256=9yCW1ZQl42DAWV_7sbNsqEKeS9FzHdvgXpY5eS2GpDs,3540
-sima_cli/update/remote.py,sha256=uv0cezLeG4tsJvalgm_VDOo3EUCU7LB3nXl8mNFFtds,10934
-sima_cli/update/updater.py,sha256=vBdT0Im0a0iKwB-LzVDZasnXk2Rq-kNlBGr7bTG0-14,20879
+sima_cli/update/query.py,sha256=b6Su7OlBGooIDcpb3_xH55tqkzznWcd_Fg1MkaNR874,4680
+sima_cli/update/remote.py,sha256=-AACggSRpReMI1Pw37wLJK5qm_Gfin-5jGiw5ggQWrU,11008
+sima_cli/update/updater.py,sha256=YXPfMdV29H3pu5bmLe-B3hpn3nQWlL5bwNytsN52Ces,22263
 sima_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/utils/artifactory.py,sha256=6YyVpzVm8ATy7NEwT9nkWx-wptkXrvG7Wl_zDT6jmLs,2390
 sima_cli/utils/config.py,sha256=wE-cPQqY_gOqaP8t01xsRHD9tBUGk9MgBUm2GYYxI3E,1616
@@ -43,7 +44,7 @@ sima_cli/utils/disk.py,sha256=66Kr631yhc_ny19up2aijfycWfD35AeLQOJgUsuH2hY,446
 sima_cli/utils/env.py,sha256=bNushG2BD243fNlqCpuUJxLF76inRxTFeSDkl_KCHy0,7130
 sima_cli/utils/net.py,sha256=WVntA4CqipkNrrkA4tBVRadJft_pMcGYh4Re5xk3rqo,971
 sima_cli/utils/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
-sima_cli-0.0.22.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.23.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_app_zoo.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_auth.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -52,8 +53,8 @@ tests/test_download.py,sha256=t87DwxlHs26_ws9rpcHGwr_OrcRPd3hz6Zmm0vRee2U,4465
 tests/test_firmware.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_model_zoo.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sima_cli-0.0.22.dist-info/METADATA,sha256=3LetoBbyq_AopItmkPCqz3BBWL2_osKmaPHd_Vh8038,3705
-sima_cli-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.22.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.22.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.22.dist-info/RECORD,,
+sima_cli-0.0.23.dist-info/METADATA,sha256=jE_xgF2mw2x2Gxqt_K7lnukeFEtSTE-Z_6dvJBrixlk,3705
+sima_cli-0.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sima_cli-0.0.23.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
+sima_cli-0.0.23.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
+sima_cli-0.0.23.dist-info/RECORD,,