sima-cli 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.14"
+__version__ = "0.0.15"

sima_cli/auth/basic_auth.py

@@ -0,0 +1,132 @@
+import os
+import click
+import getpass
+import requests
+import json
+from http.cookiejar import MozillaCookieJar
+
+HOME_DIR = os.path.expanduser("~/.sima-cli")
+COOKIE_JAR_PATH = os.path.join(HOME_DIR, ".sima-cli-cookies.txt")
+CSRF_PATH = os.path.join(HOME_DIR, ".sima-cli-csrf.json")
+
+CSRF_URL = "https://developer.sima.ai/session/csrf"
+LOGIN_URL = "https://developer.sima.ai/session"
+DUMMY_CHECK_URL = "https://docs.sima.ai/pkg_downloads/dummy"
+
+HEADERS = {
+    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36",
+    "X-Requested-With": "XMLHttpRequest",
+    "Referer": "https://developer.sima.ai/login",
+    "Origin": "https://developer.sima.ai",
+    "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+    "sec-ch-ua": '"Google Chrome";v="137", "Chromium";v="137", "Not/A)Brand";v="24"',
+    "sec-ch-ua-mobile": "?0",
+    "sec-ch-ua-platform": '"macOS"',
+}
+
+
+def _is_session_valid(session: requests.Session) -> bool:
+    try:
+        response = session.get(DUMMY_CHECK_URL, allow_redirects=False)
+        return response.status_code == 200
+    except Exception:
+        return False
+
+def _delete_auth_files():
+    for path in [COOKIE_JAR_PATH, CSRF_PATH]:
+        if os.path.exists(path):
+            try:
+                os.remove(path)
+            except Exception as e:
+                click.echo(f"⚠️ Could not delete {path}: {e}")
+
+
+def _save_cookie_jar(session: requests.Session):
+    cj = MozillaCookieJar(COOKIE_JAR_PATH)
+    for c in session.cookies:
+        cj.set_cookie(c)
+    cj.save(ignore_discard=True)
+
+
+def _load_cookie_jar(session: requests.Session):
+    if os.path.exists(COOKIE_JAR_PATH):
+        cj = MozillaCookieJar()
+        cj.load(COOKIE_JAR_PATH, ignore_discard=True)
+        session.cookies.update(cj)
+
+
+def _load_csrf_token() -> str:
+    if os.path.exists(CSRF_PATH):
+        with open(CSRF_PATH, "r") as f:
+            data = json.load(f)
+            return data.get("csrf", "")
+    return ""
+
+
+def _fetch_and_store_csrf_token(session: requests.Session) -> str:
+    try:
+        resp = session.get(CSRF_URL)
+        resp.raise_for_status()
+        csrf_token = resp.json().get("csrf")
+        if csrf_token:
+            with open(CSRF_PATH, "w") as f:
+                json.dump({"csrf": csrf_token}, f)
+        return csrf_token
+    except Exception as e:
+        click.echo(f"❌ Failed to fetch CSRF token: {e}")
+        return ""
+
+
+def login_external():
+    """Interactive login workflow with CSRF token, cookie caching, and dummy session validation."""
+    for attempt in range(1, 4):
+        session = requests.Session()
+        session.headers.update(HEADERS)
+
+        _load_cookie_jar(session)
+        csrf_token = _load_csrf_token()
+
+        if not csrf_token:
+            csrf_token = _fetch_and_store_csrf_token(session)
+
+        if not csrf_token:
+            click.echo("❌ CSRF token is missing or invalid.")
+            continue
+
+        session.headers["X-CSRF-Token"] = csrf_token
+
+        if _is_session_valid(session):
+            click.echo("🚀 Reusing existing session.")
+            return session
+
+        # Prompt user login
+        _delete_auth_files()
+        click.echo(f"🔐 Login attempt {attempt}/3")
+        username = click.prompt("Email or Username")
+        password = getpass.getpass("Password: ")
+
+        login_data = {
+            "login": username,
+            "password": password,
+            "second_factor_method": "1"
+        }
+
+        try:
+            resp = session.post(LOGIN_URL, data=login_data)
+            name = resp.json().get('users')[0]['name'] if 'users' in resp.json() else ''
+            if resp.status_code != 200:
+                click.echo(f"⚠️ Login request returned status {resp.status_code}")
+                continue
+        except Exception as e:
+            click.echo(f"❌ Login request failed: {e}")
+            continue
+
+        if _is_session_valid(session):
+            _save_cookie_jar(session)
+            click.echo(f"✅ Login successful. Welcome to Sima Developer Portal, {name}!")
+            return session
+        else:
+            click.echo("❌ Login failed.")
+
+    click.echo("❌ Login failed after 3 attempts.")
+    raise SystemExit(1)

sima_cli/auth/login.py

@@ -4,6 +4,7 @@ import requests
 from sima_cli.utils.config import set_auth_token, get_auth_token
 from sima_cli.utils.config_loader import load_resource_config, artifactory_url
 from sima_cli.utils.artifactory import exchange_identity_token, validate_token
+from sima_cli.auth.basic_auth import login_external
 
 def login(method: str = "external"):
     """
@@ -67,13 +68,14 @@ def login_internal():
     click.echo(f"💾 Short-lived access token saved successfully for {user_name} (valid for 7 days).")
 
 
-def login_external():
+def _login_external():
     """
     External login using Developer Portal endpoint defined in the 'public' section of YAML config.
     Prompts for username/password and retrieves access token.
     """
+    
     cfg = load_resource_config()
-    auth_url = cfg.get("public", {}).get("auth", {}).get("external_url")
+    auth_url = cfg.get("public", {}).get("auth", {}).get("auth_url")
 
     if not auth_url:
         click.echo("❌ External auth URL not configured in YAML.")

sima_cli/data/resources_public.yaml

@@ -0,0 +1,9 @@
+artifactory:
+  url: "https://developer.sima.ai"
+
+auth:
+  auth_url: "/login"
+  validate_url: "artifactory/api/security/encryptedPassword"
+
+download:
+  download_url: "artifactory/"

sima_cli/update/query.py

@@ -0,0 +1,64 @@
+import requests
+from sima_cli.utils.config_loader import load_resource_config, artifactory_url
+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):
+    fw_path = f"{board}" 
+    aql_query = f"""
+                items.find({{
+                    "repo": "soc-images",
+                    "path": {{
+                        "$match": "{fw_path}/*"
+                    }},
+                    "type": "folder"
+                }}).include("repo", "path", "name")
+                """.strip()
+
+    aql_url = f"{ARTIFACTORY_BASE_URL}/api/search/aql"
+    headers = {
+        "Content-Type": "text/plain",
+        "Authorization": f"Bearer {get_auth_token(internal=True)}"
+    }
+
+    response = requests.post(aql_url, data=aql_query, headers=headers)
+    if response.status_code != 200:
+        return None
+
+    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 match_keyword:
+        match_keyword = match_keyword.lower()
+        top_level_folders = [
+            f for f in top_level_folders if match_keyword in f.lower()
+        ]
+
+    return top_level_folders
+
+
+def list_available_firmware_versions(board: str, match_keyword: str = None, internal: bool = False):
+    """
+    Public interface to list available firmware versions.
+
+    Parameters:
+    - board: str – Name of the board (e.g. 'davinci')
+    - match_keyword: str – Optional keyword to filter versions (case-insensitive)
+    - internal: bool – Must be True to access internal Artifactory
+
+    Returns:
+    - 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_internal(board, match_keyword)

sima_cli/update/updater.py

@@ -5,6 +5,7 @@ import time
 import tempfile
 import tarfile
 import subprocess
+from InquirerPy import inquirer
 from urllib.parse import urlparse
 from typing import List
 from sima_cli.utils.env import get_environment_type
@@ -12,6 +13,7 @@ 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
 
 def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = False) -> str:
     """
@@ -44,6 +46,42 @@ def _resolve_firmware_url(version_or_url: str, board: str, internal: bool = Fals
     download_url = url.rstrip("/") + f"/soc-images/{board}/{version_or_url}/artifacts/release.tar.gz"
     return download_url
 
+def _pick_from_available_versions(board: str, version_or_url: str, internal: bool) -> str:
+    """
+    Presents an interactive menu (with search) for selecting a firmware version.
+    """
+
+    if "http" in version_or_url:
+        return version_or_url
+
+    available_versions = list_available_firmware_versions(board, version_or_url, internal=True)
+
+    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()
+
+        if not selected_version:
+            click.echo("No selection made. Exiting.", err=True)
+            raise SystemExit(1)
+
+        return selected_version
+
+    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)
+
 def _sanitize_url_to_filename(url: str) -> str:
     """
     Convert a URL to a safe filename by replacing slashes and removing protocol.
@@ -317,6 +355,10 @@ 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:
+                version_or_url = _pick_from_available_versions(board, version_or_url, internal)
+
             extracted_paths = _download_image(version_or_url, board, internal)
             click.echo("⚠️  DO NOT INTERRUPT THE UPDATE PROCESS...")
 

{sima_cli-0.0.14.dist-info → sima_cli-0.0.15.dist-info}/METADATA

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

@@ -1,13 +1,14 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=TP5y2P3zgHu81qy4udz5Y12lPztKWvIhvZuO1-ajKQw,49
+sima_cli/__version__.py,sha256=rZ8VyuhqgF22Ho9wHPc5IESWFORxhypVEyKqL_-8IvU,49
 sima_cli/cli.py,sha256=yd4ClOInhKAFA2ffMX1lUPRvWVziMZLHToSTAr_eyAA,6894
 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/login.py,sha256=-0ZUJR3uvrgKACjuSYapTXUN5yfkKz436YYGlAydPaI,3633
+sima_cli/auth/basic_auth.py,sha256=xS_EC0iYyozDSrZEoz44lU5dLBk6covxiCv09WiQECw,4264
+sima_cli/auth/login.py,sha256=Tpe5ZRau4QrlQ6Zxg1rBco4qZ2nr4rkfZAohiTPBbVk,3687
 sima_cli/data/resources_internal.yaml,sha256=zlQD4cSnZK86bLtTWuvEudZTARKiuIKmB--Jv4ajL8o,200
-sima_cli/data/resources_public.yaml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sima_cli/data/resources_public.yaml,sha256=ZT1CzPrGMfSLVWiRJfW2-jb-ilmh7yNlkqyO5Fvqk58,178
 sima_cli/download/__init__.py,sha256=6y4O2FOCYFR2jdnQoVi3hRtEoZ0Gw6rydlTy1SGJ5FE,218
 sima_cli/download/downloader.py,sha256=zL8daM7Fqj1evzfQ9EHL1CVbuYL0_aQNhromqm7LkE0,4863
 sima_cli/mla/meminfo.py,sha256=ndc8kQJmWGEIdvNh6iIhATGdrkqM2pbddr_eHxaPNfg,1466
@@ -15,15 +16,16 @@ sima_cli/model_zoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 sima_cli/model_zoo/model.py,sha256=q91Nrg62j1TqwPO8HiX4nlEFCCmzNEFcyFTBVMbJm8w,9836
 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=sPJKsIZKKSx_MqGFrpUH11Hh0hULzVj32zIfYwoUWjc,13799
+sima_cli/update/updater.py,sha256=GtYOyhZj_Xk99iI-Zj4hGywAnitkah2MuMoE9NEa9V0,15228
 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/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
-sima_cli-0.0.14.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.15.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
@@ -32,8 +34,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.14.dist-info/METADATA,sha256=j3Nh9wE5H9b2fu0A6x35qjya6Ck-LVidx9_zOxSsaUI,3605
-sima_cli-0.0.14.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
-sima_cli-0.0.14.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.14.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.14.dist-info/RECORD,,
+sima_cli-0.0.15.dist-info/METADATA,sha256=Gfm1zm3xrURxtFf9DMeq5d5vjkko8Mnk8sWVpvW4EU8,3605
+sima_cli-0.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sima_cli-0.0.15.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
+sima_cli-0.0.15.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
+sima_cli-0.0.15.dist-info/RECORD,,

{sima_cli-0.0.14.dist-info → sima_cli-0.0.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any