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

sima_cli/update/updater.py

@@ -65,7 +65,7 @@ def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = Fals
         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. 
+        image_file = f'{board}-tftp-boot.tar.gz' 
         download_url = url.rstrip("/") + f"/soc-images/elxr/{board}/{version_or_url}/artifacts/palette/{image_file}"
 
     return download_url
@@ -203,6 +203,8 @@ def _extract_required_files(tar_path: str, board: str, update_type: str = 'stand
             f"{board}-som.dtb",
             f"{board}-dvt.dtb",
             f"{board}-hhhl_x16.dtb",
+            f"pcie-4rc-2rc-2rc.dtbo",
+            f"elxr-palette-{board}-arm64.cpio.gz",
             f"simaai-image-{_flavor}-{board}.wic.gz",
             f"simaai-image-{_flavor}-{board}.wic.bmap",
             f"simaai-image-{_flavor}-{board}.cpio.gz"
@@ -321,9 +323,26 @@ def _download_image(version_or_url: str, board: str, internal: bool = False, upd
         # Download the file
         click.echo(f"📦 Downloading from {image_url}")
         firmware_path = download_file_from_url(image_url, dest_path, internal=internal)
+        extracted_files = _extract_required_files(firmware_path, board, update_type, flavor)
+
+        # If internal, netboot and elxr, we need to download some additional files to prepare for eMMC flash.
+        if internal and update_type == "netboot" and swtype == "elxr":
+            base_url = os.path.dirname(image_url)
+            base_version = version_or_url.split('_')[0]
+            extra_files = [f"elxr-palette-{board}-{base_version}-arm64.img.gz"]
+
+            for fname in extra_files:
+                extra_url = f"{base_url}/{fname}"
+                try:
+                    click.echo(f"📥 Downloading extra file: {fname} from {extra_url} saving into {dest_path}")
+                    netboot_file_path = download_file_from_url(extra_url, dest_path, internal=internal)
+                    extracted_files.extend(_extract_required_files(netboot_file_path, board, update_type, flavor))
+                    click.echo(f"✅ Saved {fname} to {dest_path}")
+                except Exception as e:
+                    click.echo(f"⚠️ Failed to download {fname}: {e}")
 
         click.echo(f"📦 Firmware downloaded to: {firmware_path}")
-        return _extract_required_files(firmware_path, board, update_type, flavor)
+        return extracted_files
 
     except Exception as e:
         click.echo(f"❌ Host update failed: {e}")
@@ -471,7 +490,7 @@ def download_image(version_or_url: str, board: str, swtype: str, internal: bool
     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
+        swtype (str): The software type (default to 'yocto', possible values: `yocto`, `elxr`): 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.
         flavor (str): Flavor of the image, can be headless or full.

sima_cli/utils/env.py

@@ -2,7 +2,8 @@ import os
 import subprocess
 import platform
 import shutil
-from typing import Tuple
+import re
+from typing import Tuple, Optional
 
 # Utility functions to determine the environment:
 # - Whether we are running on a SiMa board
@@ -33,6 +34,38 @@ def is_sima_board() -> bool:
 
     return False
 
+def get_sima_build_version() -> Tuple[Optional[str], Optional[str]]:
+    """
+    Retrieve the current SiMa build version from /etc/build or /etc/buildinfo.
+
+    It searches for 'SIMA_BUILD_VERSION=' and extracts:
+      - core_version: the semantic version (e.g., '2.0.0')
+      - full_version: the complete build string (e.g., '2.0.0_develop_B1932')
+
+    Returns:
+        tuple: (core_version, full_version)
+               If not found, returns (None, None)
+    """
+    build_file_paths = ["/etc/build", "/etc/buildinfo"]
+    version_pattern = re.compile(r"SIMA_BUILD_VERSION\s*=\s*([\w\.\-\+]+)")
+
+    for path in build_file_paths:
+        if os.path.exists(path):
+            try:
+                with open(path, "r") as f:
+                    for line in f:
+                        match = version_pattern.search(line)
+                        if match:
+                            full_version = match.group(1)
+                            # Extract only major.minor.patch portion
+                            core_match = re.match(r"(\d+\.\d+\.\d+)", full_version)
+                            core_version = core_match.group(1) if core_match else None
+                            return core_version, full_version
+            except Exception:
+                continue
+
+    return None, None
+
 def is_pcie_host() -> bool:
     """
     Detect if running from a PCIe host (typically a Linux or macOS dev machine).
@@ -71,6 +104,31 @@ def get_sima_board_type() -> str:
 
     return ""
 
+def is_devkit_running_elxr() -> bool:
+    """
+    Check if the system is a SiMa devkit and is running ELXR software.
+
+    Conditions:
+      - Must be identified as a SiMa board via is_sima_board()
+      - /etc/buildinfo exists and contains "elxr" (case-insensitive)
+
+    Returns:
+        bool: True if SiMa devkit with ELXR software, False otherwise.
+    """
+    if not is_sima_board():
+        return False
+
+    buildinfo_path = "/etc/buildinfo"
+    if not os.path.exists(buildinfo_path):
+        return False
+
+    try:
+        with open(buildinfo_path, "r") as f:
+            content = f.read().lower()
+            return "elxr" in content
+    except Exception:
+        return False
+
 def is_modalix_devkit() -> bool:
     """
     Determines whether the current system is a Modalix DevKit (SoM)

sima_cli/utils/pkg_update_check.py

@@ -41,16 +41,19 @@ def update_package(package_name: str):
 def has_internet(timeout: float = 1.0) -> bool:
     """
     Quick check for internet connectivity by connecting to a known DNS server.
+    First tries Cloudflare (1.1.1.1), falls back to Google (8.8.8.8).
     Uses IP to avoid DNS lookup delays.
     """
-    try:
-        socket.setdefaulttimeout(timeout)
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.connect(("1.1.1.1", 53))
-        sock.close()
-        return True
-    except OSError:
-        return False
+    def try_connect(ip: str, port: int = 53) -> bool:
+        try:
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+                sock.settimeout(timeout)
+                sock.connect((ip, port))
+            return True
+        except OSError:
+            return False
+
+    return try_connect("1.1.1.1") or try_connect("8.8.8.8")
 
 def check_for_update(package_name: str, timeout: float = 2.0):
 

{sima_cli-0.0.36.dist-info → sima_cli-0.0.38.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=Bbhf5gpY7WnVH4M-cc4ByQEC0_SMh5CebOd37T5sqCA,49
-sima_cli/cli.py,sha256=qm8rtydcugVdd37Rd79weMdX78Y7SKWaUe4LGfX-1XY,17339
+sima_cli/__version__.py,sha256=Vmt5txS5JnPSX3Xq_JSjKsimA5tK-R4xOPnyOu6NbeI,49
+sima_cli/cli.py,sha256=jGufO70y0NGLsIfEhr1pQNdFoBdzMxTO1R7p386d4-8,19291
 sima_cli/app_zoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sima_cli/app_zoo/app.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sima_cli/app_zoo/app.py,sha256=6u3iIqVZkuMK49kK0f3dVJCCf5-qC-xzLOS78-TkeN8,15738
 sima_cli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/auth/basic_auth.py,sha256=UMEXCCnNQpjpp6RZxREs6iiKtYyaeqZBnTSR0wA8s6Q,8767
 sima_cli/auth/login.py,sha256=nE-dSHK_husXw1XJaEcOe3I1_bnwHkLgO_BqKuQODDM,3781
@@ -14,13 +14,13 @@ sima_cli/download/downloader.py,sha256=UQdrBWLQsPQygaoVaufOjbzWmRoNnk6pgLdnbnVi0
 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=zIxs9nSX7EC1d6qxL2woZiMSQfFfIOzB2natyTvIPDI,27428
-sima_cli/install/metadata_validator.py,sha256=7954rp9vFRNnqmIMvCVTjq40kUIEbGXzfc8HmQmChe0,5221
+sima_cli/install/metadata_installer.py,sha256=ZvR1bb8qie0e1v_UCpZOhtWPm83Bhi1oBQK69f8Ajhg,31462
+sima_cli/install/metadata_validator.py,sha256=Xp51J68hMvpQeX-11kPLgz1YarQZ2m-95gGpfe3-D3Q,5644
 sima_cli/install/optiview.py,sha256=r4DYdQDTUbZVCR87hl5T21gsjZrhqpU8hWnYxKmUJ_k,4790
 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/model_zoo/model.py,sha256=WjkVd5ZNadWkBRaOpiBBvgFmrZ2CcEtV56vj3h63eH8,11613
 sima_cli/network/network.py,sha256=kXYI2oxgeIg7LoGt2VKF9JlK8DIfQT87A9-x-D6uHCA,7714
 sima_cli/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/sdk/syscheck.py,sha256=h9zCULW67y4i2hqiGc-hc1ucBDShA5FAe9NxwBGq-fM,4575
@@ -33,20 +33,20 @@ sima_cli/update/bmaptool.py,sha256=KrhUGShBwY4Wzz50QiuMYAxxPgEy1nz5C68G-0a4qF4,4
 sima_cli/update/bootimg.py,sha256=OA_GyZwI8dbU3kaucKmoxAZbnnSnjXeOkU6yuDPji1k,13632
 sima_cli/update/cleanlog.py,sha256=-V6eDl3MdsvDmCfkKUJTqkXJ_WnLJE01uxS7z96b15g,909
 sima_cli/update/local.py,sha256=z3oRk6JH-zbCdoS3JpgeW_ZB4kolG7nPhLC55A2yssk,5597
-sima_cli/update/netboot.py,sha256=hsJQLq4HVwFFkaWjA54VZdkMGDhO0RmylciS78qAfrM,19663
+sima_cli/update/netboot.py,sha256=V0QiqyHzAdrucJ87Q3Xlm2EBvkpjpu4RwPRWw9NXRcs,20334
 sima_cli/update/query.py,sha256=6RgvQfQT1_EtBGcibvVcz003dRKOq17NaGgL2mhaBbY,4891
 sima_cli/update/remote.py,sha256=wC4MSBQVxmibxtPBchAzFMhZYcRjxTiLlPSzVI0en4o,14690
-sima_cli/update/updater.py,sha256=NPd32OzM_356Nm1bEDDNh7faubW_VSOk12J4I6Yc2SQ,24580
+sima_cli/update/updater.py,sha256=CYOXTV-8zIo92Lv2vyBzKtUyrtFBwkJiknttlS-UxF4,25648
 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/disk.py,sha256=66Kr631yhc_ny19up2aijfycWfD35AeLQOJgUsuH2hY,446
-sima_cli/utils/env.py,sha256=LtV8S1kCkOpi-7Gj4rhidQRN13x_NDKy4W_LxujheeI,8400
+sima_cli/utils/env.py,sha256=0qY1-PJiI1G3uDVv774aimPXhHQBtY56FqXSMeMQTps,10401
 sima_cli/utils/net.py,sha256=WVntA4CqipkNrrkA4tBVRadJft_pMcGYh4Re5xk3rqo,971
 sima_cli/utils/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
-sima_cli/utils/pkg_update_check.py,sha256=IAV_NAOsBDL_lYNYMRYfdZWuVq-rJ_zzHjJJZ7UQaoc,3274
-sima_cli-0.0.36.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli/utils/pkg_update_check.py,sha256=GD0XVS2_l2WpuzL81TKkEQIDHXXffJeF3LELefncHNM,3467
+sima_cli-0.0.38.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
@@ -55,8 +55,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.36.dist-info/METADATA,sha256=nRB0ysTR2pmyDNlBC6Tx7gk1VPJ6o83ZulKr99RLJTo,3705
-sima_cli-0.0.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.36.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.36.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.36.dist-info/RECORD,,
+sima_cli-0.0.38.dist-info/METADATA,sha256=EMJTYog2SdzP3e1dSwkTvzIQ_glqF9tQs7zTZAaGrgc,3705
+sima_cli-0.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sima_cli-0.0.38.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
+sima_cli-0.0.38.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
+sima_cli-0.0.38.dist-info/RECORD,,