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

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.17"
+__version__ = "0.0.18"

sima_cli/cli.py

@@ -150,9 +150,6 @@ def update(ctx, version_or_url, ip, yes, passwd):
     version_or_url: The version string (e.g. '1.5.0') or a direct URL to the firmware package.
     """
     internal = ctx.obj.get("internal", False)
-    if not internal:
-        click.echo("External environment is not supported yet.")
-        exit(0)
     perform_update(version_or_url, ip, internal, passwd=passwd, auto_confirm=yes)
 
 # ----------------------

sima_cli/data/resources_public.yaml

@@ -6,4 +6,4 @@ auth:
   validate_url: "artifactory/api/security/encryptedPassword"
 
 download:
-  download_url: "artifactory/"
+  download_url: "https://docs.sima.ai/pkg_downloads/"

sima_cli/download/downloader.py

@@ -127,6 +127,7 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
 
     except Exception as e:
         raise RuntimeError(f"Download failed: {e}")
+    
 
     return dest_path
 

sima_cli/update/local.py

@@ -46,26 +46,31 @@ def _run_local_cmd(command: str, passwd: str) -> bool:
 
 def get_local_board_info() -> Tuple[str, str]:
     """
-    Retrieve the local board type and build version by reading /etc/build.
+    Retrieve the local board type and build version by reading /etc/build or /etc/buildinfo.
 
     Returns:
         (board_type, build_version): Tuple of strings, or ('', '') on failure.
     """
     board_type = ""
     build_version = ""
-    build_file_path = "/etc/build"
-
-    try:
-        with open(build_file_path, "r") as f:
-            for line in f:
-                line = line.strip()
-                if line.startswith("MACHINE"):
-                    board_type = line.split("=")[-1].strip()
-                elif line.startswith("SIMA_BUILD_VERSION"):
-                    build_version = line.split("=")[-1].strip()
-        return board_type, build_version
-    except Exception:
-        return "", ""
+    build_file_paths = ["/etc/build", "/etc/buildinfo"]
+
+    for path in build_file_paths:
+        try:
+            if os.path.isfile(path):
+                with open(path, "r") as f:
+                    for line in f:
+                        line = line.strip()
+                        if line.startswith("MACHINE"):
+                            board_type = line.split("=", 1)[-1].strip()
+                        elif line.startswith("SIMA_BUILD_VERSION"):
+                            build_version = line.split("=", 1)[-1].strip()
+                if board_type or build_version:
+                    break  # Exit early if data found
+        except Exception:
+            continue
+
+    return board_type, build_version
 
 
 def push_and_update_local_board(troot_path: str, palette_path: str, passwd: str):

sima_cli/update/query.py

@@ -1,3 +1,4 @@
+import re
 import requests
 from sima_cli.utils.config_loader import load_resource_config, artifactory_url
 from sima_cli.utils.config import get_auth_token
@@ -45,6 +46,34 @@ 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):
+    """
+    Construct and return a list containing a single firmware download URL for a given board.
+    
+    If match_keyword is provided and matches a 'major.minor' version pattern (e.g., '1.6'),
+    it is normalized to 'major.minor.patch' format (e.g., '1.6.0') to ensure consistent URL construction.
+
+    Args:
+        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').
+
+    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')
+
+    if match_keyword:
+        if re.fullmatch(r'\d+\.\d+', match_keyword):
+            match_keyword += '.0'
+
+    firmware_download_url = (
+        f'{download_url_base}SDK{match_keyword}/devkit/{board}/{fwtype}/'
+        f'simaai-devkit-fw-{board}-{fwtype}-{match_keyword}.tar.gz'
+    )
+    return [firmware_download_url]
+
 
 def list_available_firmware_versions(board: str, match_keyword: str = None, internal: bool = False):
     """
@@ -59,6 +88,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:
-        raise PermissionError("Internal access required to list firmware versions.")
+        return _list_available_firmware_versions_external(board, match_keyword)
 
     return _list_available_firmware_versions_internal(board, match_keyword)

sima_cli/update/remote.py

@@ -57,7 +57,6 @@ def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str,
 
     Args:
         ip (str): IP address of the board.
-        timeout (int): SSH timeout in seconds.
 
     Returns:
         (board_type, build_version): Tuple of strings, or ('', '') on failure.
@@ -70,16 +69,17 @@ def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str,
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         ssh.connect(ip, username=DEFAULT_USER, password=passwd, timeout=10)
 
-        stdin, stdout, stderr = ssh.exec_command("cat /etc/build")
+        # Try /etc/build first then /etc/buildinfo
+        stdin, stdout, stderr = ssh.exec_command("cat /etc/build 2>/dev/null || cat /etc/buildinfo 2>/dev/null")
         output = stdout.read().decode()
         ssh.close()
 
         for line in output.splitlines():
             line = line.strip()
             if line.startswith("MACHINE"):
-                board_type = line.split("=")[-1].strip()
+                board_type = line.split("=", 1)[-1].strip()
             elif line.startswith("SIMA_BUILD_VERSION"):
-                build_version = line.split("=")[-1].strip()
+                build_version = line.split("=", 1)[-1].strip()
 
         return board_type, build_version
 
@@ -124,7 +124,7 @@ def _run_remote_command(ssh, command: str, password: str = DEFAULT_PASSWORD):
             if stdout.channel.recv_ready():
                 output = stdout.channel.recv(4096).decode("utf-8", errors="replace")
                 for line in output.splitlines():
-                    click.echo(f"📄 {line}")
+                    click.echo(f"↦ {line}")
             if stdout.channel.recv_stderr_ready():
                 err_output = stdout.channel.recv_stderr(4096).decode("utf-8", errors="replace")
                 for line in err_output.splitlines():
@@ -133,7 +133,7 @@ def _run_remote_command(ssh, command: str, password: str = DEFAULT_PASSWORD):
     # Final remaining output
     remaining = stdout.read().decode("utf-8", errors="replace")
     for line in remaining.splitlines():
-        click.echo(f"📄 {line}")
+        click.echo(f"↦ {line}")
 
     remaining_err = stderr.read().decode("utf-8", errors="replace")
     for line in remaining_err.splitlines():
@@ -180,9 +180,13 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
             ssh,
             f"sudo swupdate -H simaai-image-troot:1.0 -i /tmp/{troot_name}", password=passwd
         )
-        click.echo("✅ tRoot update complete.")
+        click.echo("✅ tRoot update complete, the board needs to be rebooted to proceed to the next phase of update.")
+        click.confirm("⚠️  Have you rebooted the board?", default=True, abort=True)
+        _wait_for_ssh(ip, timeout=120)
 
         # Upload Palette image
+        ssh.connect(ip, username=DEFAULT_USER, password=passwd, timeout=10)
+        sftp = ssh.open_sftp()        
         _scp_file(sftp, palette_path, os.path.join(remote_dir, palette_name))
         click.echo("🚀 Uploaded system image.")
 
@@ -205,7 +209,7 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
                 _run_remote_command(ssh, "sudo bash -c 'echo b > /proc/sysrq-trigger'", password=passwd)
 
             except Exception as reboot_err:
-                click.echo(f"⚠️  SSH connection lost due to reboot (expected): {reboot_err}, please powercycle the device...")
+                click.echo(f"⚠️  SSH connection lost due to reboot (expected): {reboot_err}, please powercycle the board...")
 
             try:
                 ssh.close()
@@ -219,11 +223,12 @@ def push_and_update_remote_board(ip: str, troot_path: str, palette_path: str, pa
             # Reconnect and verify version
             try:
                 click.echo("🔍 Reconnecting to verify build version...")
+                time.sleep(10)
                 ssh = paramiko.SSHClient()
                 ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
                 ssh.connect(ip, username=DEFAULT_USER, password=passwd, timeout=10)
 
-                _run_remote_command(ssh, "cat /etc/build | grep SIMA_BUILD_VERSION", password=passwd)
+                _run_remote_command(ssh, "grep SIMA_BUILD_VERSION /etc/build 2>/dev/null || grep SIMA_BUILD_VERSION /etc/buildinfo 2>/dev/null", password=passwd)
                 ssh.close()
             except Exception as e:
                 click.echo(f"❌ Unable to validate the version: {e}")

sima_cli/update/updater.py

@@ -54,7 +54,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=True)
+    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:")
@@ -202,6 +202,7 @@ def _download_image(version_or_url: str, board: str, internal: bool = False):
 
     except Exception as e:
         click.echo(f"❌ Host update failed: {e}")
+        exit(0)
 
 def _update_host(script_path: str, board: str, boardip: str, passwd: str):
     """
@@ -252,6 +253,7 @@ def _update_host(script_path: str, board: str, boardip: str, passwd: str):
 
     except Exception as e:
         click.echo(f"❌ Host update failed: {e}")
+        exit(0)
 
 
 def _update_sdk(version_or_url: str, board: str):
@@ -356,7 +358,7 @@ def perform_update(version_or_url: str, ip: str = None, internal: bool = False,
         if board in ['davinci', 'modalix']:
             click.echo(f"🔧 Target board: {board}, board currently running: {version}")
                         
-            if 'http' not in version_or_url:
+            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)

sima_cli/utils/env.py

@@ -11,23 +11,26 @@ def is_sima_board() -> bool:
     """
     Detect if running on a SiMa board.
 
-    This is done by checking for the existence of a known build info file
-    located at /etc/build and looking for specific identifiers like 
+    This is done by checking for the existence of known build info files
+    (/etc/build or /etc/buildinfo) and looking for specific identifiers like 
     SIMA_BUILD_VERSION and MACHINE.
 
     Returns:
         bool: True if running on a SiMa board, False otherwise.
     """
-    build_file_path = "/etc/build"
-    if not os.path.exists(build_file_path):
-        return False
+    build_file_paths = ["/etc/build", "/etc/buildinfo"]
 
-    try:
-        with open(build_file_path, "r") as f:
-            content = f.read()
-            return "SIMA_BUILD_VERSION" in content and "MACHINE" in content
-    except Exception:
-        return False
+    for path in build_file_paths:
+        if os.path.exists(path):
+            try:
+                with open(path, "r") as f:
+                    content = f.read()
+                    if "SIMA_BUILD_VERSION" in content and "MACHINE" in content:
+                        return True
+            except Exception:
+                continue
+
+    return False
 
 def is_pcie_host() -> bool:
     """
@@ -44,25 +47,27 @@ def is_pcie_host() -> bool:
 
 def get_sima_board_type() -> str:
     """
-    If running on a SiMa board, extract the board type from the MACHINE field in /etc/build.
+    If running on a SiMa board, extract the board type from the MACHINE field
+    in /etc/build or /etc/buildinfo.
 
     Returns:
         str: The board type (e.g., "modalix", "davinci"), or an empty string if not found or not a SiMa board.
     """
-    build_file_path = "/etc/build"
-    if not os.path.exists(build_file_path):
-        return ""
-
-    try:
-        with open(build_file_path, "r") as f:
-            for line in f:
-                if line.startswith("MACHINE"):
-                    # Format: MACHINE = modalix
-                    parts = line.split("=")
-                    if len(parts) == 2:
-                        return parts[1].strip()
-    except Exception:
-        pass
+    build_file_paths = ["/etc/build", "/etc/buildinfo"]
+
+    for path in build_file_paths:
+        if os.path.exists(path):
+            try:
+                with open(path, "r") as f:
+                    for line in f:
+                        line = line.strip()
+                        if line.startswith("MACHINE"):
+                            # Format: MACHINE = modalix
+                            parts = line.split("=", 1)
+                            if len(parts) == 2:
+                                return parts[1].strip()
+            except Exception:
+                continue
 
     return ""
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 0.0.17
+Version: 0.0.18
 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.17.dist-info → sima_cli-0.0.18.dist-info}/RECORD

@@ -1,33 +1,33 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=G3g_P43Qcy0TawgeYyi8kSrDK1EYHEk1Yis6srHT0Kg,49
-sima_cli/cli.py,sha256=Kk8mjLGntxEBz8uTwy-Uocwzt_8JaNPKB1np6_rk5iU,8365
+sima_cli/__version__.py,sha256=8-9gPM1y6DdoYBg3txOjyT5ldXc4k9e8BvBxlen4c6g,49
+sima_cli/cli.py,sha256=EZkY0FaGLc2krp5Rf0AuUT8t3qktoE5h9vIY8-wkHKk,8263
 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/data/resources_internal.yaml,sha256=zlQD4cSnZK86bLtTWuvEudZTARKiuIKmB--Jv4ajL8o,200
-sima_cli/data/resources_public.yaml,sha256=ZT1CzPrGMfSLVWiRJfW2-jb-ilmh7yNlkqyO5Fvqk58,178
+sima_cli/data/resources_public.yaml,sha256=U7hmUomGeQ2ULdo1BU2OQHr0PyKBamIdK9qrutDlX8o,201
 sima_cli/download/__init__.py,sha256=6y4O2FOCYFR2jdnQoVi3hRtEoZ0Gw6rydlTy1SGJ5FE,218
-sima_cli/download/downloader.py,sha256=5-Dhr4wFpK6CudinCQeQVBShToUxijsVN2pv6NoL9sM,5156
+sima_cli/download/downloader.py,sha256=pHfqcg_ujBQjds_EkcRV85M2mRYGrysoZaiR-FIrpf4,5161
 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/update/__init__.py,sha256=0P-z-rSaev40IhfJXytK3AFWv2_sdQU4Ry6ei2sEus0,66
-sima_cli/update/local.py,sha256=jiGrwuU2Z1HV_RT1_dYuI_Ish-f818AvCEk7sAM3l94,3032
-sima_cli/update/query.py,sha256=eOTC2ZAWbFFf_0h8D-MO1HrIsQYRc7fu5OyeFNEAv48,2168
-sima_cli/update/remote.py,sha256=ePlnvlGHrASMMjYGM9w-6hMeDMgGiJu_BlHLamU1YtI,8420
-sima_cli/update/updater.py,sha256=8NcXl_bWcjOo3ucl7WgShSLTbTga8cWpxJeUR5tnj2E,15546
+sima_cli/update/local.py,sha256=CyUFLs5Lz5w4VyM6ip4wndKBBLz3_KZ-3scEvSiOrcg,3299
+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/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=LJy2eO8cfEYsLuC7p3BT_FAoaZc9emtq6NYhHRBpiBE,5512
+sima_cli/utils/env.py,sha256=INOAVfCFwh0BHeqSMmEHXfpIyepNha4-SMI1iOOplOo,5795
 sima_cli/utils/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
-sima_cli-0.0.17.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.18.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 +36,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.17.dist-info/METADATA,sha256=6GVfk37R0BxeQCaWxfPK_VUfElAJfLWeAtbtPkakV1I,3631
-sima_cli-0.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.17.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.17.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.17.dist-info/RECORD,,
+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,,