sima-cli 0.0.18__py3-none-any.whl → 0.0.20__py3-none-any.whl

sima_cli/update/updater.py

@@ -4,7 +4,9 @@ import re
 import time
 import tempfile
 import tarfile
+import gzip
 import subprocess
+import shutil
 from InquirerPy import inquirer
 from urllib.parse import urlparse
 from typing import List
@@ -12,8 +14,17 @@ from sima_cli.utils.env import get_environment_type
 from sima_cli.download import download_file_from_url
 from sima_cli.utils.config_loader import load_resource_config
 from sima_cli.update.remote import push_and_update_remote_board, get_remote_board_info, reboot_remote_board
-from sima_cli.update.local import get_local_board_info, push_and_update_local_board
 from sima_cli.update.query import list_available_firmware_versions
+from sima_cli.utils.env import is_sima_board
+
+if is_sima_board():
+    from sima_cli.update import local
+    get_local_board_info = local.get_local_board_info
+    push_and_update_local_board = local.push_and_update_local_board
+else:
+    get_local_board_info = None
+    push_and_update_local_board = None
+
 
 def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = False) -> str:
     """
@@ -56,31 +67,35 @@ def _pick_from_available_versions(board: str, version_or_url: str, internal: boo
 
     available_versions = list_available_firmware_versions(board, version_or_url, internal)
 
-    if len(available_versions) > 1:
-        click.echo("Multiple firmware versions found matching your input:")
+    try:
+        if len(available_versions) > 1:
+            click.echo("Multiple firmware versions found matching your input:")
 
-        selected_version = inquirer.fuzzy(
-            message="Select a version:",
-            choices=available_versions,
-            max_height="70%",  # scrollable
-            instruction="(Use ↑↓ to navigate, / to search, Enter to select)"
-        ).execute()
+            selected_version = inquirer.fuzzy(
+                message="Select a version:",
+                choices=available_versions,
+                max_height="70%",  # scrollable
+                instruction="(Use ↑↓ to navigate, / to search, Enter to select)"
+            ).execute()
 
-        if not selected_version:
-            click.echo("No selection made. Exiting.", err=True)
-            raise SystemExit(1)
+            if not selected_version:
+                click.echo("No selection made. Exiting.", err=True)
+                raise SystemExit(1)
 
-        return selected_version
+            return selected_version
 
-    elif len(available_versions) == 1:
-        return available_versions[0]
+        elif len(available_versions) == 1:
+            return available_versions[0]
 
-    else:
-        click.echo(
-            f"No firmware versions found matching keyword '{version_or_url}' for board '{board}'.",
-            err=True
-        )
-        raise SystemExit(1)
+        else:
+            click.echo(
+                f"No firmware versions found matching keyword '{version_or_url}' for board '{board}'.",
+                err=True
+            )
+            raise SystemExit(1)
+    except:
+        click.echo("Unable to determine available versions")
+        exit(0)
 
 def _sanitize_url_to_filename(url: str) -> str:
     """
@@ -98,22 +113,23 @@ def _sanitize_url_to_filename(url: str) -> str:
     return safe_name
 
 
-def _extract_required_files(tar_path: str, board: str) -> list:
+def _extract_required_files(tar_path: str, board: str, update_type: str = 'standard') -> list:
     """
     Extract required files from a .tar.gz or .tar archive into the same folder
     and return the full paths to the extracted files (with subfolder if present).
-    Skips files that already exist.
+    Skips files that already exist. If a .wic.gz file is extracted, it will be decompressed,
+    unless the decompressed .wic file already exists.
 
     Args:
         tar_path (str): Path to the downloaded or provided firmware archive.
         board (str): Board type ('davinci' or 'modalix').
+        update_type (str): Update type ('standard' or 'bootimg').
 
     Returns:
         list: List of full paths to extracted files.
     """
     extract_dir = os.path.dirname(tar_path)
 
-    # Define required filenames (not full paths)
     target_filenames = {
         "troot-upgrade-simaai-ev.swu",
         f"simaai-image-palette-upgrade-{board}.swu"
@@ -123,6 +139,23 @@ def _extract_required_files(tar_path: str, board: str) -> list:
     if env_type == "host" and _os == "linux":
         target_filenames.add("sima_pcie_host_pkg.sh")
 
+    if update_type == 'bootimg':
+        target_filenames = {
+            f"simaai-image-palette-{board}.wic.gz",
+            f"simaai-image-palette-{board}.wic.bmap"
+        }
+    elif update_type == 'netboot':
+        target_filenames = {
+            "Image",
+            "netboot.scr.uimg",
+            f"{board}-hhhl.dtb",
+            f"{board}-som.dtb",
+            f"{board}-dvt.dtb",
+            f"{board}-hhhl_x16.dtb",
+            f"simaai-image-palette-{board}.wic.gz",
+            f"simaai-image-palette-{board}.wic.bmap",
+            f"simaai-image-palette-{board}.cpio.gz"
+        }
     extracted_paths = []
 
     try:
@@ -140,14 +173,29 @@ def _extract_required_files(tar_path: str, board: str) -> list:
                     if os.path.exists(full_dest_path):
                         click.echo(f"⚠️  Skipping existing file: {full_dest_path}")
                         extracted_paths.append(full_dest_path)
-                        continue
+                    else:
+                        os.makedirs(os.path.dirname(full_dest_path), exist_ok=True)
+                        tar.extract(member, path=extract_dir)
+                        click.echo(f"✅ Extracted: {full_dest_path}")
+                        extracted_paths.append(full_dest_path)
 
-                    # Ensure directory structure exists
-                    os.makedirs(os.path.dirname(full_dest_path), exist_ok=True)
+                    # If it's a .wic.gz file, decompress it now
+                    if full_dest_path.endswith(".wic.gz"):
+                        uncompressed_path = full_dest_path[:-3]  # remove .gz
 
-                    tar.extract(member, path=extract_dir)
-                    extracted_paths.append(full_dest_path)
-                    click.echo(f"✅ Extracted: {full_dest_path}")
+                        if os.path.exists(uncompressed_path):
+                            click.echo(f"⚠️  Skipping decompression: {uncompressed_path} already exists")
+                            extracted_paths.append(uncompressed_path)
+                            continue
+
+                        try:
+                            with gzip.open(full_dest_path, 'rb') as f_in:
+                                with open(uncompressed_path, 'wb') as f_out:
+                                    shutil.copyfileobj(f_in, f_out)
+                            click.echo(f"📦 Decompressed: {uncompressed_path}")
+                            extracted_paths.append(uncompressed_path)
+                        except Exception as decomp_err:
+                            click.echo(f"❌ Failed to decompress {full_dest_path}: {decomp_err}")
 
         if not extracted_paths:
             click.echo("⚠️  No matching files were found or extracted.")
@@ -158,7 +206,8 @@ def _extract_required_files(tar_path: str, board: str) -> list:
         click.echo(f"❌ Failed to extract files from archive: {e}")
         return []
 
-def _download_image(version_or_url: str, board: str, internal: bool = False):
+    
+def _download_image(version_or_url: str, board: str, internal: bool = False, update_type: str = 'standard'):
     """
     Download or use a firmware image for the specified board and version or file path.
 
@@ -176,7 +225,7 @@ def _download_image(version_or_url: str, board: str, internal: bool = False):
         # Case 1: Local file provided
         if os.path.exists(version_or_url) and os.path.isfile(version_or_url):
             click.echo(f"📁 Using local firmware file: {version_or_url}")
-            return _extract_required_files(version_or_url, board)
+            return _extract_required_files(version_or_url, board, update_type)
 
         # Case 2: Treat as custom full URL
         if version_or_url.startswith("http://") or version_or_url.startswith("https://"):
@@ -198,7 +247,7 @@ def _download_image(version_or_url: str, board: str, internal: bool = False):
         firmware_path = download_file_from_url(image_url, dest_path, internal=internal)
 
         click.echo(f"📦 Firmware downloaded to: {firmware_path}")
-        return _extract_required_files(firmware_path, board)
+        return _extract_required_files(firmware_path, board, update_type)
 
     except Exception as e:
         click.echo(f"❌ Host update failed: {e}")
@@ -328,6 +377,27 @@ def _update_remote(extracted_paths: List[str], ip: str, board: str, passwd: str,
 
     return script_path
 
+def download_image(version_or_url: str, board: str, swtype: str, internal: bool = False, update_type: str = 'standard'):
+    """
+    Download and extract a firmware image for a specified board.
+
+    Args:
+        version_or_url (str): Either a version string (e.g., "1.6.0") or a direct URL or local file path to the image.
+        board (str): The board type (e.g., "mlsoc", "modalix").
+        swtype (str): The software type (default to 'davinci', possible values: `davinci`, `modalix`): not supported for now
+        internal (bool): Whether to use internal download paths (e.g., Artifactory).
+        update_type (str): Whether this is standard update or writing boot image.
+
+    Returns:
+        List[str]: Paths to the extracted image files.
+    """
+    
+    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)
+
+    extracted_paths = _download_image(version_or_url, board, internal, update_type) 
+    return extracted_paths
+
 def perform_update(version_or_url: str, ip: str = None, internal: bool = False, passwd: str = "edgeai", auto_confirm: bool = False):
     r"""
     Update the system based on environment and input.

sima_cli/utils/env.py

@@ -36,14 +36,13 @@ def is_pcie_host() -> bool:
     """
     Detect if running from a PCIe host (typically a Linux or macOS dev machine).
 
-    This assumes a PCIe host is not a SiMa board and is running on a standard
-    Unix-based OS like Linux or macOS (Darwin).
+    This assumes a PCIe host is not a SiMa board and is running on a standard Linux platform.
 
     Returns:
         bool: True if likely a PCIe host, False otherwise.
     """
     import platform
-    return not is_sima_board() and platform.system() in ["Linux", "Darwin"]
+    return not is_sima_board() and platform.system() in ["Linux"]
 
 def get_sima_board_type() -> str:
     """

sima_cli/utils/net.py

@@ -0,0 +1,29 @@
+import psutil
+import socket
+
+def get_local_ip_candidates():
+    """
+    Return a list of IPv4 addresses on physical interfaces,
+    excluding VPN, loopback, and link-local interfaces.
+    """
+    vpn_prefixes = ("tun", "tap", "utun", "tailscale", "wg", "docker")  # WireGuard, Tailscale, etc.
+    ip_list = []
+
+    for iface_name, iface_addrs in psutil.net_if_addrs().items():
+        # Exclude VPN or tunnel interfaces
+        if iface_name.startswith(vpn_prefixes):
+            continue
+
+        for addr in iface_addrs:
+            if addr.family == socket.AF_INET:
+                ip = addr.address
+
+                # Skip loopback and link-local
+                if ip.startswith("127.") or ip.startswith("169.254."):
+                    continue
+
+                ip_list.append((iface_name, ip))
+
+    # Prioritize physical interfaces: eth0, en0, wlan0, etc.
+    ip_list.sort(key=lambda x: (not x[0].startswith(("eth", "en", "wlan", "wl")), x[0]))
+    return ip_list

{sima_cli-0.0.18.dist-info → sima_cli-0.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 0.0.18
+Version: 0.0.20
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://developer.sima.ai/
 Author: SiMa.ai
@@ -24,6 +24,8 @@ Requires-Dist: paramiko
 Requires-Dist: plotext
 Requires-Dist: rich
 Requires-Dist: InquirerPy
+Requires-Dist: tftpy
+Requires-Dist: psutil
 Dynamic: author
 Dynamic: license-file
 Dynamic: requires-python

{sima_cli-0.0.18.dist-info → sima_cli-0.0.20.dist-info}/RECORD

@@ -1,33 +1,43 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=8-9gPM1y6DdoYBg3txOjyT5ldXc4k9e8BvBxlen4c6g,49
-sima_cli/cli.py,sha256=EZkY0FaGLc2krp5Rf0AuUT8t3qktoE5h9vIY8-wkHKk,8263
+sima_cli/__version__.py,sha256=U-M6HF-1PsXkez7yhqMRRsr6FObzLVRQ6Spmo4bkl30,49
+sima_cli/cli.py,sha256=b4ScjEa5Ltikry4ftZdJaNxBlSMYtmjYlodqzbRyWRk,12658
 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
 sima_cli/auth/basic_auth.py,sha256=pcocI6v496vC7v5MLYPZq3AEgD-2DdkzNFZiKsbx3eQ,4290
-sima_cli/auth/login.py,sha256=e9wBEeo_60qplODHBeK84R7zusT3K07kdFoZC1mkSrQ,3778
+sima_cli/auth/login.py,sha256=yCYXWgrfbP4jSTZ3hITfxlgHkdVQVzsd8hQKpqaqCKs,3780
 sima_cli/data/resources_internal.yaml,sha256=zlQD4cSnZK86bLtTWuvEudZTARKiuIKmB--Jv4ajL8o,200
 sima_cli/data/resources_public.yaml,sha256=U7hmUomGeQ2ULdo1BU2OQHr0PyKBamIdK9qrutDlX8o,201
 sima_cli/download/__init__.py,sha256=6y4O2FOCYFR2jdnQoVi3hRtEoZ0Gw6rydlTy1SGJ5FE,218
 sima_cli/download/downloader.py,sha256=pHfqcg_ujBQjds_EkcRV85M2mRYGrysoZaiR-FIrpf4,5161
+sima_cli/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sima_cli/install/hostdriver.py,sha256=kAWDLebs60mbWIyTbUxmNrChcKW1uD5r7FtWNSUVUE4,5852
+sima_cli/install/optiview.py,sha256=i5eWVor-9MScEfrQm3Ty9OP4VpSsCgWvNh7AvYdZu7s,3365
+sima_cli/install/palette.py,sha256=uRznoHa4Mv9ZXHp6AoqknfC3RxpYNKi9Ins756Cyifk,3930
 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/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/update/__init__.py,sha256=0P-z-rSaev40IhfJXytK3AFWv2_sdQU4Ry6ei2sEus0,66
+sima_cli/update/bmaptool.py,sha256=KrhUGShBwY4Wzz50QiuMYAxxPgEy1nz5C68G-0a4qF4,4988
+sima_cli/update/bootimg.py,sha256=AOZI9bXrY8x-1gwlbIINdOUNO_naw9qteNJqeQ9_o-Y,13407
 sima_cli/update/local.py,sha256=CyUFLs5Lz5w4VyM6ip4wndKBBLz3_KZ-3scEvSiOrcg,3299
+sima_cli/update/netboot.py,sha256=xTtRf8LMuqC_Ye-m6tlv5kbwkZwexc623kRymwiLTf4,18528
 sima_cli/update/query.py,sha256=cVkUMLZkONJ2XMEwqEC-JqLVB38hOqfWM2hB2ehBK6Y,3272
-sima_cli/update/remote.py,sha256=wMS39qhXV99fjkeh_0C5dDx1RdE8ooGniEHl_W6v3MA,8877
-sima_cli/update/updater.py,sha256=8CxRcIRnCYRx80Xy2zBJ_Ni5dYejASQvgSV6KWXCDTk,15613
+sima_cli/update/remote.py,sha256=RXQbNCDr7d8wLJ7pdGwA6G3gzgwrfZ9l_7YNYUfGHDU,10067
+sima_cli/update/updater.py,sha256=1K87YDj_isuMtL38ZI-hwBTIRmk3WqbkE6s-J0IVp-Q,18884
 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
 sima_cli/utils/config_loader.py,sha256=7I5we1yiCai18j9R9jvhfUzAmT3OjAqVK35XSLuUw8c,2005
-sima_cli/utils/env.py,sha256=INOAVfCFwh0BHeqSMmEHXfpIyepNha4-SMI1iOOplOo,5795
+sima_cli/utils/env.py,sha256=Jrb062EnpMBr1jGMotBlI2j9LEH6W1Z5Tgt6LHY7yYQ,5753
+sima_cli/utils/net.py,sha256=WVntA4CqipkNrrkA4tBVRadJft_pMcGYh4Re5xk3rqo,971
 sima_cli/utils/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
-sima_cli-0.0.18.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.20.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
@@ -36,8 +46,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.18.dist-info/METADATA,sha256=8o5Si6o1A3Nja7M4V3mTfY97TiEY12U7z-mCrQOpf-Q,3631
-sima_cli-0.0.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.18.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.18.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.18.dist-info/RECORD,,
+sima_cli-0.0.20.dist-info/METADATA,sha256=0KwVrHOfciP7OQWLcpOhnarYPVPkTcffT4QSKNXqzwo,3674
+sima_cli-0.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sima_cli-0.0.20.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
+sima_cli-0.0.20.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
+sima_cli-0.0.20.dist-info/RECORD,,