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

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.34"
+__version__ = "0.0.36"

sima_cli/auth/basic_auth.py

@@ -121,7 +121,6 @@ def login_external():
         session.headers["X-CSRF-Token"] = csrf_token
 
         if _is_session_valid(session):
-            click.echo("🚀 You are already logged in.")
             return session
 
         # Fresh login prompt

sima_cli/auth/login.py

@@ -60,15 +60,15 @@ def login_internal():
 
     click.echo(f"✅ Identity token is valid")
 
-    # Step 2: Exchange for a short-lived access token (default: 7 days)
-    access_token, user_name = exchange_identity_token(identity_token, exchange_url, expires_in=1209600)
+    # Step 2: Exchange for a short-lived access token (default: 30 days)
+    access_token, user_name = exchange_identity_token(identity_token, exchange_url, expires_in=2592000)
 
     if not access_token:
         return click.echo("❌ Failed to acquire short-lived access token.")
 
     # Step 3: Save token to internal auth config
     set_auth_token(access_token, internal=True)
-    click.echo(f"💾 Short-lived access token saved successfully for {user_name} (valid for 14 days).")
+    click.echo(f"💾 Short-lived access token saved successfully for {user_name} (valid for 30 days).")
 
 
 def _login_external():

sima_cli/cli.py

@@ -151,7 +151,7 @@ def download(ctx, url, dest):
     default='edgeai',
     help="Optional SSH password for remote board (default is 'edgeai')."
 )
-@click.option("-f", "--flavor", type=click.Choice(["headless",  "full"], case_sensitive=False), default="headless", show_default=True, help="firmware flavor, full image supports NVMe, GUI on Modalix DevKit.")
+@click.option("-f", "--flavor", type=click.Choice(["headless",  "full", "auto"], case_sensitive=False), default="auto", show_default=True, help="firmware flavor, full image supports NVMe, GUI on Modalix DevKit.")
 @click.pass_context
 def update(ctx, version_or_url, ip, yes, passwd, flavor):
     """
@@ -313,9 +313,7 @@ def install_cmd(ctx, component, version, mirror, tag):
         if component:
             click.echo(f"⚠️ Component '{component}' is ignored when using --metadata. Proceeding with metadata-based installation.")
         click.echo(f"🔧 Installing generic component from metadata URL: {mirror}")
-        if install_from_metadata(metadata_url=mirror, internal=internal):
-            click.echo("✅ Installation complete.")
-        return
+        return install_from_metadata(metadata_url=mirror, internal=internal)
 
     # No component and no metadata: error
     if not component:
@@ -324,6 +322,10 @@ def install_cmd(ctx, component, version, mirror, tag):
 
     component = component.lower()
 
+    # if user specified gh: as component, treat it the same as -m
+    if component.startswith("gh:"):
+        return install_from_metadata(metadata_url=component, internal=False)
+
     # Validate version requirement
     if component in SDK_DEPENDENT_COMPONENTS and not version:
         click.echo(f"❌ The component '{component}' requires a specific SDK version. Please provide one using -v.")

sima_cli/download/downloader.py

@@ -135,6 +135,38 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
 
     return dest_path
 
+def check_url_available(url: str, internal: bool = False) -> bool:
+    """
+    Perform a HEAD request to check if a resource is available.
+
+    Args:
+        url (str): The full URL to check.
+        internal (bool): Whether this is an internal resource on Artifactory.
+
+    Returns:
+        bool: True if the resource is available (status 200–399), False otherwise.
+    """
+    headers = {}
+    try:
+        if internal:
+            auth_token = get_auth_token(internal=True)
+            if auth_token:
+                headers["Authorization"] = f"Bearer {auth_token}"
+            head_fn = requests.head
+        elif 'https://docs.sima.ai' in url:
+            session = login_external()
+            head_fn = session.head
+        else:
+            session = requests.Session()
+            head_fn = session.head
+
+        resp = head_fn(url, headers=headers, timeout=10, allow_redirects=True)
+        # Consider any 2xx or 3xx as "available"
+        return 200 <= resp.status_code < 400
+
+    except Exception as e:
+        print(f"⚠️ HEAD check failed for {url}: {e}")
+        return False
 
 def download_folder_from_url(url: str, dest_folder: str = ".", internal: bool = False) -> List[str]:
     """

sima_cli/install/metadata_installer.py

@@ -9,13 +9,13 @@ import tarfile
 import zipfile
 import stat
 from urllib.parse import urlparse
-from InquirerPy import inquirer
 
 from typing import Dict
 from tqdm import tqdm
 from urllib.parse import urljoin
 from pathlib import Path
 import subprocess
+import requests
 
 from rich.console import Console
 from rich.panel import Panel
@@ -30,6 +30,153 @@ from sima_cli.install.metadata_info import print_metadata_summary, parse_size_st
 
 console = Console()
 
+def _copy_dir(src: Path, dest: Path, label: str):
+    """
+    Copy files from src → dest, merging with existing files (no deletion).
+    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)
+        else:
+            shutil.copy2(item, target)
+
+    click.echo(f"✅ Copied {label} into {dest}")
+
+def _prepare_pipeline_project(repo_dir: Path):
+    """
+    Prepare a pipeline project by copying required SDK sources into the repo.
+
+    Steps:
+      1. Copy core sources into the project folder
+      2. Parse .project/pluginsInfo
+      3. Copy required plugin sources from the SDK plugin zoo
+    """
+    plugins_info_file = repo_dir / ".project" / "pluginsInfo.json"
+    if not plugins_info_file.exists():
+        return 
+
+    click.echo("📦 Preparing pipeline project...")
+
+    try:
+        data = json.loads(plugins_info_file.read_text())
+        plugins = data.get("pluginsInfo", [])
+    except Exception as e:
+        raise RuntimeError(f"Failed to read {plugins_info_file}: {e}")
+
+    # Step a: copy core
+    # Define what to copy
+    copy_map = [
+        (
+            Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/core"),
+            repo_dir / "core",
+            "core"
+        ),
+        (
+            Path("/usr/local/simaai/utils/gst_app"),
+            repo_dir / "dependencies" / "gst_app",
+            "dependencies/gst_app"
+        ),
+        (
+            Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/gst/templates"),
+            repo_dir / "plugins" / "templates",
+            "plugins/templates"
+        ),
+    ]
+
+    # Execute
+    for src, dest, label in copy_map:
+        _copy_dir(src, dest, label)
+
+    # Step b/c: scan plugin paths and copy SDK plugins
+    sdk_plugins_base = Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/gst")
+    dest_plugins_dir = repo_dir / "plugins"
+    dest_plugins_dir.mkdir(exist_ok=True)
+
+    for plugin in plugins:
+        try:
+            path = plugin.get("path", "")
+            if not path:
+                continue
+            parts = path.split("/")
+            if len(parts) < 2:
+                continue
+
+            plugin_name = parts[1]
+            sdk_plugin_path = sdk_plugins_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"
+                )
+                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)
+
+            click.echo(f"✅ Copied plugin {plugin_name} into {dest_plugin_path}")
+
+        except Exception as e:
+            click.echo(f"❌ Error copying plugin {plugin}: {e}")
+
+    click.echo("🎉 Pipeline project prepared.")
+
+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).
+
+    Args:
+        owner (str): GitHub org/user
+        repo (str): Repo name
+        ref (str): Branch, tag, or commit (default = default branch)
+        dest_folder (str): Where to extract
+        token (str): Optional GitHub token for private repos
+
+    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"
+    headers = {}
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+
+    click.echo(f"🐙 Downloading GitHub repo: {owner}/{repo}" + (f"@{ref}" if ref else ""))
+
+    with requests.get(url, headers=headers, stream=True) as r:
+        if r.status_code in (401, 403):
+            raise PermissionError("Authentication required for GitHub repo")
+        r.raise_for_status()
+
+        with tempfile.NamedTemporaryFile(delete=False, suffix=".tar.gz") as tmp_file:
+            for chunk in r.iter_content(chunk_size=8192):
+                tmp_file.write(chunk)
+            tmp_path = Path(tmp_file.name)
+
+    repo_dir = Path(dest_folder) / repo
+    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}")
+
+    try:
+        _prepare_pipeline_project(repo_dir)
+    except Exception as e:
+        click.echo(f"⚠️  Pipeline preparation skipped: {e}")
+
+    return str(repo_dir)
+
 def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal: bool = False, skip_models: bool = False) -> list:
     """
     Downloads resources defined in metadata to a local destination folder.
@@ -85,11 +232,34 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
                 model_path = snapshot_download(
                     repo_id=repo_id,
                     local_dir=target_dir,
-                    revision=revision  # None if not specified
+                    local_dir_use_symlinks=False
                 )
                 local_paths.append(model_path)
                 continue
 
+            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
+
+                if "/" not in repo_id:
+                    raise click.ClickException(f"❌ Invalid GitHub repo spec: {resource}")
+
+                owner, name = repo_id.split("/", 1)
+
+                try:
+                    token = os.getenv("GITHUB_TOKEN", None)
+                    repo_path = _download_github_repo(owner, name, ref, dest_folder, token)
+                except Exception as e:
+                    raise click.ClickException(
+                        f"❌ Failed to download GitHub repo {owner}/{name}@{ref or 'default'}: {e}"
+                    )
+
+                local_paths.append(repo_path)
+                continue
+
             # Handle normal relative or absolute URLs
             resource_url = urljoin(base_url, resource)
             local_path = download_file_from_url(
@@ -113,6 +283,8 @@ def selectable_resource_handler(metadata):
     choices = [(f"{i.get('name','Unnamed')} ({i.get('url','')})" if i.get('url') else i.get('name','Unnamed')) for i in selectable]
     choices.append("Skip")
 
+    from InquirerPy import inquirer
+    
     sel = inquirer.select(message="Select an opt-in resource to download:", choices=choices).execute()
     if sel == "Skip":
         print("✅ No selectable resource chosen.")
@@ -295,6 +467,25 @@ def _extract_zip_streaming(zip_path: Path, extract_dir: Path, overwrite: bool =
 
     print(f"✅ Extracted {len(members)} entries to {extract_dir}/")
 
+def _extract_tar_strip_top_level(tar_path: Path, extract_dir: Path):
+    """Extract a GitHub tarball, stripping the top-level folder."""
+    with tarfile.open(tar_path, "r:*") as tar:
+        members = tar.getmembers()
+
+        # Detect top-level prefix (first part before '/')
+        top_level = None
+        if members:
+            first_name = members[0].name
+            top_level = first_name.split("/", 1)[0]
+
+        for member in members:
+            # Strip top-level folder
+            if top_level and member.name.startswith(top_level + "/"):
+                member.name = member.name[len(top_level) + 1 :]
+            if not member.name:
+                continue
+            tar.extract(member, path=extract_dir)
+
 def _combine_multipart_files(folder: str):
     """
     Scan a folder for multipart files like name-split-aa, -ab, etc.,
@@ -352,20 +543,27 @@ def _combine_multipart_files(folder: str):
 
         print(f"✅ Extracted to: {extract_dir}/")
 
-def _extract_archives_in_folder(folder: str):
+def _extract_archives_in_folder(folder: str, local_paths):
     """
-    Extract all .tar.gz and .zip files in the given folder into subdirectories.
+    Extract .tar, .gz, .tar.gz, and .zip files in the given folder,
+    but only if they are listed in local_paths.
     Uses streaming to avoid NFS performance issues.
     """
     folder = Path(folder)
+    local_paths = {str(Path(p).resolve()) for p in local_paths}
+
     for file in folder.iterdir():
         if not file.is_file():
             continue
 
-        # TAR.GZ
-        if file.suffixes == [".tar", ".gz"] or file.name.endswith(".tar.gz"):
+        file_resolved = str(file.resolve())
+        if file_resolved not in local_paths:
+            continue
+
+        # TAR, GZ, TAR.GZ → all handled by _extract_tar_streaming
+        if file.suffix in [".tar", ".gz"] or file.name.endswith(".tar.gz"):
             extract_dir = folder / file.stem.replace(".tar", "")
-            print(f"📦 Extracting TAR.GZ: {file.name} to {extract_dir}/")
+            print(f"📦 Extracting TAR/GZ: {file.name} to {extract_dir}/")
             _extract_tar_streaming(file, extract_dir)
 
         # ZIP
@@ -470,8 +668,45 @@ def _run_installation_script(metadata: Dict, extract_path: str = "."):
 
     print("✅ Installation completed successfully.")
 
+def _resolve_github_metadata_url(gh_ref: str) -> str:
+    """
+    Resolve a GitHub shorthand like gh:org/repo@tag into a raw URL for metadata.json.
+    If tag is omitted, defaults to 'main'.
+    """
+    try:
+        _, repo_ref = gh_ref.split(":", 1)  # remove 'gh:'
+        if "@" in repo_ref:
+            org_repo, tag = repo_ref.split("@", 1)
+        else:
+            org_repo, tag = repo_ref, "main"
+
+        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}"
+        headers = {"Accept": "application/vnd.github.v3.raw"}
+        if token:
+            headers["Authorization"] = f"token {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")
+        with open(local_path, "wb") as f:
+            f.write(r.content)
+
+        return local_path
+    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:
+        if metadata_url.startswith("gh:"):
+            metadata_url = _resolve_github_metadata_url(metadata_url)
+            internal = False
+
         metadata, _ = _download_and_validate_metadata(metadata_url, internal)
         print_metadata_summary(metadata=metadata)
 
@@ -480,7 +715,7 @@ def install_from_metadata(metadata_url: str, internal: bool, install_dir: str =
                 local_paths = _download_assets(metadata, metadata_url, install_dir, internal)
                 if len(local_paths) > 0:
                     _combine_multipart_files(install_dir)
-                    _extract_archives_in_folder(install_dir)
+                    _extract_archives_in_folder(install_dir, local_paths)
                     _run_installation_script(metadata=metadata, extract_path=install_dir)
 
     except Exception as e:

sima_cli/network/network.py

@@ -1,4 +1,3 @@
-from InquirerPy import inquirer
 import subprocess
 import os
 import re
@@ -144,6 +143,7 @@ def set_default_route(iface, ip):
             check=True
         )
         print(f"✅ Default route set via {iface} ({gateway})")
+        
     except subprocess.CalledProcessError:
         print(f"❌ Failed to set default route via {iface}")
 
@@ -152,6 +152,10 @@ def network_menu():
         print("❌ This command only runs on the DevKit")
         return
 
+    from InquirerPy import inquirer
+
+    print("✅ Scanning network configuration, please wait...")
+    
     while True:
         interfaces = get_interfaces()
         choices = ["🚪 Quit Menu"]
@@ -165,6 +169,8 @@ def network_menu():
             iface_map[label] = iface
 
         try:
+            
+
             iface_choice = inquirer.fuzzy(
                 message="Select Ethernet Interface:",
                 choices=choices,

sima_cli/update/local.py

@@ -86,7 +86,7 @@ def get_local_board_info() -> Tuple[str, str, bool]:
     Retrieve the local board type and build version by reading /etc/build or /etc/buildinfo.
 
     Returns:
-        (board_type, build_version, fdt_name, full_image): Tuple of strings, or ('', '') on failure.
+        (board_type, build_version, devkit_name, full_image): Tuple of strings, or ('', '') on failure.
     """
     board_type = ""
     build_version = ""
@@ -107,9 +107,9 @@ def get_local_board_info() -> Tuple[str, str, bool]:
         except Exception:
             continue
 
-    fdt_name = get_exact_devkit_type()
+    devkit_name = get_exact_devkit_type()
 
-    return board_type, build_version, fdt_name, is_board_running_full_image()
+    return board_type, build_version, devkit_name, is_board_running_full_image()
 
 
 def get_boot_mmc(mounts_path="/proc/mounts", cmdline_path="/proc/cmdline"):

sima_cli/update/remote.py

@@ -53,19 +53,22 @@ def _wait_for_ssh(ip: str, timeout: int = 120):
     else:
         print("\r✅ Board is online!           \n")
 
-def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str, str, str]:
+
+def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str, str, str, bool]:
     """
-    Connect to the remote board and retrieve board type, build version, and fdt_name.
+    Connect to the remote board and retrieve board type, build version, and devkit model.
 
     Args:
         ip (str): IP address of the board.
+        passwd (str): SSH password.
 
     Returns:
-        (board_type, build_version, fdt_name, full_image): Tuple of strings, or ('', '', '') on failure.
+        (board_type, build_version, devkit_model, full_image):
+            Tuple of strings + bool, or ('', '', '', False) on failure.
     """
     board_type = ""
     build_version = ""
-    fdt_name = ""
+    devkit_model = ""
     full_image = False
 
     try:
@@ -77,12 +80,17 @@ def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str,
         _, stdout, _ = ssh.exec_command("cat /etc/build 2>/dev/null || cat /etc/buildinfo 2>/dev/null")
         build_output = stdout.read().decode()
 
-        # Retrieve fdt_name from fw_printenv
-        _, stdout, _ = ssh.exec_command("fw_printenv fdt_name 2>/dev/null")
-        fdt_output = stdout.read().decode()
-
-        # 3) NVMe presence (ensure sbin is in PATH for non-root shells)
-        #    Note: 'command -v' is POSIX; 'which' as fallback on some busybox setups.
+        # Retrieve model from /proc/device-tree/model
+        _, stdout, _ = ssh.exec_command("cat /proc/device-tree/model 2>/dev/null || echo ''")
+        model_output = stdout.read().decode().strip()
+        if model_output:
+            # Normalize string: remove "SiMa.ai " prefix and trailing "Board"
+            if model_output.startswith("SiMa.ai "):
+                model_output = model_output[len("SiMa.ai "):]
+            model_output = model_output.replace(" Board", "")
+            devkit_model = model_output.lower().replace(" ", "-")
+
+        # Check for NVMe tool presence (determine if full image is flashed)
         nvme_check_cmd = r'PATH="$PATH:/usr/sbin:/sbin"; command -v nvme >/dev/null 2>&1 || which nvme >/dev/null 2>&1; echo $?'
         _, stdout, _ = ssh.exec_command(nvme_check_cmd)
         nvme_rc = stdout.read().decode().strip()
@@ -90,6 +98,7 @@ def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str,
 
         ssh.close()
 
+        # Parse build info
         for line in build_output.splitlines():
             line = line.strip()
             if line.startswith("MACHINE"):
@@ -97,11 +106,7 @@ def get_remote_board_info(ip: str, passwd: str = DEFAULT_PASSWORD) -> Tuple[str,
             elif line.startswith("SIMA_BUILD_VERSION"):
                 build_version = line.split("=", 1)[-1].strip()
 
-        for line in fdt_output.splitlines():
-            if line.startswith("fdt_name"):
-                fdt_name = line.split("=", 1)[-1].strip().replace('.dtb', '')
-
-        return board_type, build_version, fdt_name, full_image
+        return board_type, build_version, devkit_model, full_image
 
     except Exception as e:
         click.echo(f"Unable to retrieve board info with error: {e}, board may be still booting.")

sima_cli/update/updater.py

@@ -7,7 +7,6 @@ import tarfile
 import gzip
 import subprocess
 import shutil
-from InquirerPy import inquirer
 from urllib.parse import urlparse
 from typing import List
 from sima_cli.utils.env import get_environment_type
@@ -82,6 +81,11 @@ def _confirm_flavor_switching(full_image: bool, flavor: str) -> str:
     Returns:
         str: The flavor to use ('full' or 'headless')
     """
+    # when the flavor is set to auto use the detected flavor instead
+    if flavor == 'auto':
+        flavor = 'full' if full_image else 'headless'
+        click.echo(f"✅ Automatically detected the flavor of the running image: [{flavor}], Proceeding to update")
+
     if (full_image and flavor != 'full') or (not full_image and flavor == 'full'):
         click.echo(f"🔄 The current image running on the board has a different flavor from what you specified ({flavor}).")
         click.echo("Please choose an option:")
@@ -113,7 +117,9 @@ def _pick_from_available_versions(board: str, version_or_url: str, internal: boo
     try:
         if len(available_versions) > 1:
             click.echo("Multiple firmware versions found matching your input:")
-
+            
+            from InquirerPy import inquirer
+            
             selected_version = inquirer.fuzzy(
                 message="Select a version:",
                 choices=available_versions,
@@ -440,7 +446,7 @@ def _update_remote(extracted_paths: List[str], ip: str, board: str, passwd: str,
 
     # Get remote board info
     click.echo("🔍 Checking remote board type and version...")
-    remote_board, remote_version, fdt_name, full_image = get_remote_board_info(ip, passwd)
+    remote_board, remote_version, _, _ = get_remote_board_info(ip, passwd)
 
     if not remote_board:
         click.echo("❌ Could not determine remote board type.")
@@ -480,7 +486,7 @@ def download_image(version_or_url: str, board: str, swtype: str, internal: bool
     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'):
+def perform_update(version_or_url: str, ip: str = None, internal: bool = False, passwd: str = "edgeai", auto_confirm: bool = False, flavor: str = 'auto'):
     r"""
     Update the system based on environment and input.
 
@@ -495,7 +501,7 @@ def perform_update(version_or_url: str, ip: str = None, internal: bool = False,
         internal (bool): If True, enable internal-only behaviors (e.g., Artifactory access).
         passwd (str): Password for the board user (default: "edgeai").
         auto_confirm (bool): If True, auto-confirm firmware update without prompting.
-        flavor (str): headless or full
+        flavor (str): headless or full, or auto (detect the running image flavor and use it)
     """
     try:
         board = ''
@@ -504,17 +510,17 @@ def perform_update(version_or_url: str, ip: str = None, internal: bool = False,
         click.echo(f"🔧 Requested version or URL: {version_or_url}, with flavor {flavor}")
 
         if env_type == 'board':
-            board, version, fdt_name, full_image = get_local_board_info()
+            board, version, devkit_name, full_image = get_local_board_info()
         else:
-            board, version, fdt_name, full_image = get_remote_board_info(ip, passwd)
+            board, version, devkit_name, full_image = get_remote_board_info(ip, passwd)
 
         flavor = _confirm_flavor_switching(full_image=full_image, flavor=flavor)
 
         if board in ['davinci', 'modalix']:
-            click.echo(f"🔧 Target board: {board} : {fdt_name}, board currently running: {version}, full_image: {full_image}")
+            click.echo(f"🔧 Target board: {board}, specific type: [{devkit_name}], board currently running: {version}, full_image: {full_image}")
             
-            if flavor == 'full' and 'modalix' not in fdt_name:
-                click.echo(f"❌ You've requested updating {fdt_name} to full image, this is only supported for the Modalix DevKit")
+            if flavor == 'full' and 'modalix' not in devkit_name:
+                click.echo(f"❌ You've requested updating {devkit_name} to full image, this is only supported for the Modalix DevKit")
                 return
 
             # Davinci only supports headless build, so ignore the full flavor

sima_cli/utils/env.py

@@ -73,44 +73,51 @@ def get_sima_board_type() -> str:
 
 def is_modalix_devkit() -> bool:
     """
-    Determines whether the current system is a Modalix DevKit (SOM)
-    by checking if 'fdt_name=modalix-som.dtb' is present in fw_printenv output.
+    Determines whether the current system is a Modalix DevKit (SoM)
+    by checking if "Modalix SoM" is present in /proc/device-tree/model.
 
     Returns:
-        bool: True if running on a Modalix DevKit, False otherwise.
+        bool: True if running on a Modalix DevKit (SoM), False otherwise.
     """
-    if not shutil.which("fw_printenv"):
+    model_path = "/proc/device-tree/model"
+    if not os.path.exists(model_path):
         return False
 
     try:
-        output = subprocess.check_output(["fw_printenv"], text=True)
-        for line in output.splitlines():
-            if line.strip().startswith("fdt_name="):
-                return "modalix-som.dtb" in line
-    except subprocess.CalledProcessError:
+        with open(model_path, "r") as f:
+            line = f.readline().strip()
+            return "Modalix SoM" in line
+    except Exception:
         return False
-
-    return False
+    
 
 def get_exact_devkit_type() -> str:
     """
-    Extracts the exact devkit type from 'fdt_name' in fw_printenv output.
+    Extracts the exact devkit type from /proc/device-tree/model.
+
+    Example mappings:
+        "SiMa.ai Modalix SoM Board"       -> "modalix-som"
+        "SiMa.ai Modalix DVT Board"       -> "modalix-dvt"
+        "SiMa.ai DaVinci Half-Height..."  -> "davinci-half-height-half-length"
 
     Returns:
-        str: The value of fdt_name (e.g., "modalix-som"), or an empty string if not found or unavailable.
+        str: Normalized devkit type (lowercase, spaces -> "-"),
+             or an empty string if not found or unavailable.
     """
-    if not shutil.which("fw_printenv"):
+    model_path = "/proc/device-tree/model"
+    if not os.path.exists(model_path):
         return ""
 
     try:
-        output = subprocess.check_output(["fw_printenv"], text=True)
-        for line in output.splitlines():
-            line = line.strip()
-            if line.startswith("fdt_name="):
-                _, value = line.split("=", 1)
-                return value.strip().replace('.dtb','')
-    except subprocess.CalledProcessError:
-        return ""
+        with open(model_path, "r") as f:
+            line = f.readline().strip()
+            # Remove "SiMa.ai " prefix if present
+            if line.startswith("SiMa.ai "):
+                line = line[len("SiMa.ai "):]
+            # Remove trailing "Board"
+            line = line.replace(" Board", "")
+            # Normalize
+            return line.lower().replace(" ", "-")
     except Exception:
         return ""
 

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

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

@@ -1,27 +1,27 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=LhxWChlQ8xoXdQiVEuQK-O-_Z5UrnjYg4N-UwvKNSHk,49
-sima_cli/cli.py,sha256=uCZ-9mKBGyGtfx3p97WZkdMjXL2KJlqihfZm8VsWiqw,17220
+sima_cli/__version__.py,sha256=Bbhf5gpY7WnVH4M-cc4ByQEC0_SMh5CebOd37T5sqCA,49
+sima_cli/cli.py,sha256=qm8rtydcugVdd37Rd79weMdX78Y7SKWaUe4LGfX-1XY,17339
 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=ht_mVXBtxV2UGvUYwvhkPHs4cMWL5Hw2B_OFxWdKw6c,8825
-sima_cli/auth/login.py,sha256=yCYXWgrfbP4jSTZ3hITfxlgHkdVQVzsd8hQKpqaqCKs,3780
+sima_cli/auth/basic_auth.py,sha256=UMEXCCnNQpjpp6RZxREs6iiKtYyaeqZBnTSR0wA8s6Q,8767
+sima_cli/auth/login.py,sha256=nE-dSHK_husXw1XJaEcOe3I1_bnwHkLgO_BqKuQODDM,3781
 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=nCBrr_0WdnKTIyecwKpg1sCdfm_4PSQTRPwEbiezy8M,5339
+sima_cli/download/downloader.py,sha256=UQdrBWLQsPQygaoVaufOjbzWmRoNnk6pgLdnbnVi04U,6436
 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=sVvMaUABra1FMgeTKK7Wj0u9UMamJ3wvJkSe_tuF0ug,19089
+sima_cli/install/metadata_installer.py,sha256=zIxs9nSX7EC1d6qxL2woZiMSQfFfIOzB2natyTvIPDI,27428
 sima_cli/install/metadata_validator.py,sha256=7954rp9vFRNnqmIMvCVTjq40kUIEbGXzfc8HmQmChe0,5221
 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/network/network.py,sha256=ToDCQBfX0bUFEWWtfS8srImK5T11MX6R4MBQFM80faY,7617
+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
 sima_cli/serial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,21 +32,21 @@ sima_cli/update/__init__.py,sha256=0P-z-rSaev40IhfJXytK3AFWv2_sdQU4Ry6ei2sEus0,6
 sima_cli/update/bmaptool.py,sha256=KrhUGShBwY4Wzz50QiuMYAxxPgEy1nz5C68G-0a4qF4,4988
 sima_cli/update/bootimg.py,sha256=OA_GyZwI8dbU3kaucKmoxAZbnnSnjXeOkU6yuDPji1k,13632
 sima_cli/update/cleanlog.py,sha256=-V6eDl3MdsvDmCfkKUJTqkXJ_WnLJE01uxS7z96b15g,909
-sima_cli/update/local.py,sha256=yOMvOu9nrODEzYZBrxUpdmlfqmkahkDk9nAEuG4RyAg,5588
+sima_cli/update/local.py,sha256=z3oRk6JH-zbCdoS3JpgeW_ZB4kolG7nPhLC55A2yssk,5597
 sima_cli/update/netboot.py,sha256=hsJQLq4HVwFFkaWjA54VZdkMGDhO0RmylciS78qAfrM,19663
 sima_cli/update/query.py,sha256=6RgvQfQT1_EtBGcibvVcz003dRKOq17NaGgL2mhaBbY,4891
-sima_cli/update/remote.py,sha256=dAMIGpHqpf7VBps9JPe4hfHD_qyi1tG6ZW8E_qXQQiQ,14446
-sima_cli/update/updater.py,sha256=UEWcV3wZbikNaTMk1nWFGiciBwUZtdX94reZWn22plk,24213
+sima_cli/update/remote.py,sha256=wC4MSBQVxmibxtPBchAzFMhZYcRjxTiLlPSzVI0en4o,14690
+sima_cli/update/updater.py,sha256=NPd32OzM_356Nm1bEDDNh7faubW_VSOk12J4I6Yc2SQ,24580
 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=IP5HrH0lE7RMSiBeXcEt5GCLMT5p-QQroG-uGzl5XFU,8181
+sima_cli/utils/env.py,sha256=LtV8S1kCkOpi-7Gj4rhidQRN13x_NDKy4W_LxujheeI,8400
 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.34.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.36.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.34.dist-info/METADATA,sha256=h10I6DLYXz3ryXHSNaSW5Ie3pWKkhf6bwCBgXyQiDSE,3705
-sima_cli-0.0.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.34.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.34.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.34.dist-info/RECORD,,
+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,,