sima-cli 0.0.1__py3-none-any.whl → 0.0.11__py3-none-any.whl

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.1"
+__version__ = "0.0.11"

sima_cli/auth/login.py

@@ -0,0 +1,103 @@
+import click
+import getpass
+import requests
+from sima_cli.utils.config import set_auth_token, get_auth_token
+from sima_cli.utils.config_loader import load_resource_config
+from sima_cli.utils.artifactory import exchange_identity_token, validate_token
+
+def login(method: str = "external"):
+    """
+    Dispatch login based on the specified method.
+
+    Args:
+        method (str): 'external' (public developer portal) or 'internal' (Artifactory).
+    """
+    if method == "internal":
+        return login_internal()
+    else:
+        return login_external()
+
+def login_internal():
+    """
+    Internal login using a manually provided identity token.
+
+    Flow:
+    1. Prompt for identity token.
+    2. Validate the token using the configured validation URL.
+    3. If valid, exchange it for a short-lived access token.
+    4. Save the short-lived token to local config.
+    """
+
+    cfg = load_resource_config()
+    auth_cfg = cfg.get("internal", {}).get("auth", {})
+    base_url = cfg.get("internal", {}).get("artifactory", {}).get("url", {})
+    validate_url = f"{base_url}/{auth_cfg.get("validate_url")}"
+    exchange_url = f"{base_url}/{auth_cfg.get("internal_url")}"
+
+    # Check for required config values
+    if not validate_url or not exchange_url:
+        click.echo("❌ Missing 'validate_url' or 'internal_url' in internal auth config.")
+        click.echo("👉 Please check ~/.sima-cli/resources_internal.yaml")
+        return
+
+    # Prompt for identity token
+    click.echo("🔐 Paste your Artifactory identity token below.")
+    identity_token = click.prompt("Identity Token", hide_input=True)
+
+    if not identity_token or len(identity_token.strip()) < 10:
+        return click.echo("❌ Invalid or empty token.")
+
+    # Step 1: Validate the identity token
+    is_valid, username = validate_token(identity_token, validate_url)
+    if not is_valid:
+        return click.echo("❌ Token validation failed. Please check your identity token.")
+
+    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=604800)
+
+    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 7 days).")
+
+
+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")
+
+    if not auth_url:
+        click.echo("❌ External auth URL not configured in YAML.")
+        return
+
+    click.echo("🌐 Logging in using external Developer Portal...")
+
+    # Prompt for credentials
+    username = click.prompt("Email or Username")
+    password = getpass.getpass("Password: ")
+
+    data = {
+        "username": username,
+        "password": password
+    }
+
+    try:
+        response = requests.post(auth_url, json=data)
+        response.raise_for_status()
+
+        token = response.json().get("access_token")
+        if not token:
+            return click.echo("❌ Failed to retrieve access token.")
+
+        set_auth_token(token)
+        click.echo("✅ External login successful.")
+
+    except requests.RequestException as e:
+        click.echo(f"❌ External login failed: {e}")

sima_cli/cli.py

@@ -1,22 +1,52 @@
+import os
 import click
 from sima_cli.utils.env import get_environment_type
 from sima_cli.update.updater import perform_update
+from sima_cli.model_zoo.model import list_models, download_model
 
 # Entry point for the CLI tool using Click's command group decorator
 @click.group()
-def main():
-    """sima-cli – SiMa Developer Portal CLI Tool"""
+@click.option('-i', '--internal', is_flag=True, help="Use internal Artifactory resources.")
+@click.pass_context
+def main(ctx, internal):
+    """
+    sima-cli – SiMa Developer Portal CLI Tool
+
+    Global Options:
+      --internal  Use internal Artifactory resources (can also be set via env variable SIMA_CLI_INTERNAL=1)
+    """
+    ctx.ensure_object(dict)
+
+    # Allow env override if --internal not explicitly passed
+    if not internal:
+        internal = os.getenv("SIMA_CLI_INTERNAL", "0") in ("1", "true", "yes")
+
+    ctx.obj["internal"] = internal
+
+    from sima_cli.utils.env import get_environment_type
     env_type, env_subtype = get_environment_type()
-    click.echo(f"🔧 Environment: {env_type} ({env_subtype})")
+
+    if internal:
+        click.echo(f"🔧 Environment: {env_type} ({env_subtype}) | Internal: {internal}")
+    else:
+        click.echo(f"🔧 Environment: {env_type} ({env_subtype})")
+
+    if not internal:
+        click.echo(f"external environment is not supported yet..")
+        exit(0)
 
 # ----------------------
 # Authentication Command
 # ----------------------
 @main.command()
-def login():
+@click.pass_context
+def login(ctx):
     """Authenticate with the SiMa Developer Portal."""
-    # Placeholder: Implement browser or manual token-based login
-    click.echo("Login flow not yet implemented.")
+
+    from sima_cli.auth import login as perform_login
+
+    internal = ctx.obj.get("internal", False)
+    perform_login.login("internal" if internal else "external")
 
 # ----------------------
 # Download Command
@@ -24,14 +54,17 @@ def login():
 @main.command(name="download")
 @click.argument('url')  # Accept both file and folder URLs
 @click.option('-d', '--dest', type=click.Path(), default='.', help="Target download directory")
-def download(url, dest):
+@click.pass_context
+def download(ctx, url, dest):
     """Download a file or a whole folder from a given URL."""
     from sima_cli.download.downloader import download_file_from_url, download_folder_from_url
 
+    internal = ctx.obj.get("internal", False)
+
     # First, try to download as a file
     try:
         click.echo("🔍 Checking if URL is a direct file...")
-        path = download_file_from_url(url, dest)
+        path = download_file_from_url(url, dest, internal)
         click.echo(f"\n✅ File downloaded successfully to: {path}")
         return
     except Exception as e:
@@ -40,7 +73,7 @@ def download(url, dest):
     # If that fails, try to treat as a folder and download all files
     try:
         click.echo("🔍 Attempting folder download...")
-        paths = download_folder_from_url(url, dest)
+        paths = download_folder_from_url(url, dest, internal)
         if not paths:
             raise RuntimeError("No files were downloaded.")
         click.echo(f"\n✅ Folder download completed. {len(paths)} files saved to: {dest}")
@@ -53,55 +86,85 @@ def download(url, dest):
 @main.command(name="update")
 @click.argument('version_or_url')
 @click.option('--ip', help="Target device IP address for remote firmware update.")
-def update(version_or_url, ip):
-    """Run system update across different environments."""
-    perform_update(version_or_url, ip)
+@click.option(
+    '--board',
+    default='davinci',
+    type=click.Choice(['davinci', 'modalix'], case_sensitive=False),
+    show_default=True,
+    help="Target board type (davinci or modalix)."
+)
+@click.option(
+    '--passwd',
+    default='edgeai',
+    help="Optional SSH password for remote board (default is 'edgeai')."
+)
+@click.pass_context
+def update(ctx, version_or_url, ip, board, passwd):
+    """
+    Run system update across different environments.
+    Downloads and applies firmware updates for PCIe host or SiMa board.
+
+    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)
+    perform_update(version_or_url, ip, board.lower(), internal, passwd=passwd)
 
 # ----------------------
 # Model Zoo Subcommands
 # ----------------------
 @main.group()
-def model_zoo():
+@click.option('--ver', default="1.6.0", show_default=True, help="SDK version, minimum and default is 1.6.0")
+@click.pass_context
+def modelzoo(ctx, ver):
     """Access models from the Model Zoo."""
+    ctx.ensure_object(dict)
+    ctx.obj['ver'] = ver
     pass
 
-@model_zoo.command("list")
-@click.option('--ver', help="SDK version")
-def list_models(ver):
+@modelzoo.command("list")
+@click.pass_context
+def list_models_cmd(ctx):
     """List available models."""
-    # Placeholder: Call API to list models
-    click.echo(f"Listing models for version: {ver or 'latest'}")
+    internal = ctx.obj.get("internal", False)
+    version = ctx.obj.get("ver")
+    click.echo(f"Listing models for version: {version}")
+    list_models(internal, version)
 
-@model_zoo.command("get")
-@click.argument('model_name')  # Required: model name
-@click.option('--ver', help="SDK version")
-def get_model(model_name, ver):
+@modelzoo.command("get")
+@click.argument('model_name') 
+@click.pass_context
+def get_model(ctx, model_name):
     """Download a specific model."""
-    # Placeholder: Download and validate model
-    click.echo(f"Getting model '{model_name}' for version: {ver or 'latest'}")
+    ver = ctx.obj.get("ver")
+    internal = ctx.obj.get("internal", False)
+    click.echo(f"Getting model '{model_name}' for version: {ver}")
+    download_model(internal, ver, model_name)
 
 # ----------------------
 # App Zoo Subcommands
 # ----------------------
-@main.group()
-def app_zoo():
-    """Access apps from the App Zoo."""
-    pass
+# @main.group()
+# @click.pass_context
+# def app_zoo(ctx):
+#     """Access apps from the App Zoo."""
+#     pass
+
+# @app_zoo.command("list")
+# @click.option('--ver', help="SDK version")
+# @click.pass_context
+# def list_apps(ctx, ver):
+#     """List available apps."""
+#     # Placeholder: Call API to list apps
+#     click.echo(f"Listing apps for version: {ver or 'latest'}")
 
-@app_zoo.command("list")
-@click.option('--ver', help="SDK version")
-def list_apps(ver):
-    """List available apps."""
-    # Placeholder: Call API to list apps
-    click.echo(f"Listing apps for version: {ver or 'latest'}")
-
-@app_zoo.command("get")
-@click.argument('app_name')  # Required: app name
-@click.option('--ver', help="SDK version")
-def get_app(app_name, ver):
-    """Download a specific app."""
-    # Placeholder: Download and validate app
-    click.echo(f"Getting app '{app_name}' for version: {ver or 'latest'}")
+# @app_zoo.command("get")
+# @click.argument('app_name')  # Required: app name
+# @click.option('--ver', help="SDK version")
+# @click.pass_context
+# def get_app(ctx, app_name, ver):
+#     """Download a specific app."""
+#     # Placeholder: Download and validate app
+#     click.echo(f"Getting app '{app_name}' for version: {ver or 'latest'}")
 
 # ----------------------
 # Entry point for direct execution

sima_cli/download/downloader.py

@@ -3,13 +3,15 @@ import requests
 from urllib.parse import urlparse
 from tqdm import tqdm
 from typing import List
+from sima_cli.utils.config import get_auth_token
 
-def _list_directory_files(url: str) -> List[str]:
+def _list_directory_files(url: str, internal: bool = False) -> List[str]:
     """
     Attempt to list files in a server-hosted directory with index browsing enabled.
 
     Args:
         url (str): Base URL to the folder.
+        internal (bool): Whether the resource is internal (requires token).
 
     Returns:
         List[str]: List of full file URLs.
@@ -18,14 +20,18 @@ def _list_directory_files(url: str) -> List[str]:
         RuntimeError: If listing fails or HTML cannot be parsed.
     """
     try:
-        response = requests.get(url, timeout=10)
+        headers = {}
+        token = get_auth_token(internal)
+        if token:
+            headers["Authorization"] = f"Bearer {token}"
+
+        response = requests.get(url, headers=headers, timeout=10)
         response.raise_for_status()
 
         if "text/html" not in response.headers.get("Content-Type", ""):
             raise RuntimeError("Directory listing not supported (non-HTML response).")
 
         import re
-
         hrefs = re.findall(r'href="([^"?/][^"?]*)"', response.text)
         files = [href for href in hrefs if href not in ("../", "") and not href.endswith("/")]
 
@@ -38,21 +44,21 @@ def _list_directory_files(url: str) -> List[str]:
         raise RuntimeError(f"Failed to list folder '{url}': {e}")
 
 
-def download_file_from_url(url: str, dest_folder: str = ".") -> str:
+def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = False) -> str:
     """
     Download a file from a direct URL with resume and skip support.
-    
+
     Args:
         url (str): The full URL to download.
         dest_folder (str): The folder to save the downloaded file.
-    
+        internal (bool): Whether this is internal resource on Artifactory
+
     Returns:
         str: Path to the downloaded file.
-    
+
     Raises:
         Exception: if download fails.
     """
-    # Extract file name
     parsed_url = urlparse(url)
     file_name = os.path.basename(parsed_url.path)
     if not file_name:
@@ -62,12 +68,17 @@ def download_file_from_url(url: str, dest_folder: str = ".") -> str:
     dest_path = os.path.join(dest_folder, file_name)
 
     resume_header = {}
+    headers = {}
     mode = 'wb'
     existing_size = 0
 
     try:
-        # Get total size from HEAD request
-        head = requests.head(url, timeout=10)
+        auth_token = get_auth_token(internal)
+        if auth_token:
+            headers["Authorization"] = f"Bearer {auth_token}"
+
+        # HEAD request to get total file size
+        head = requests.head(url, headers=headers, timeout=10)
         head.raise_for_status()
         total_size = int(head.headers.get('content-length', 0))
 
@@ -79,19 +90,17 @@ def download_file_from_url(url: str, dest_folder: str = ".") -> str:
                 print(f"✔ File already exists and is complete: {file_name}")
                 return dest_path
             elif existing_size < total_size:
-                # Set up resume
                 resume_header['Range'] = f'bytes={existing_size}-'
                 mode = 'ab'
+                headers['Range'] = resume_header['Range']
             else:
-                # Local file is bigger than expected — reset
                 existing_size = 0
                 mode = 'wb'
 
-        # Start download (with optional Range header)
-        with requests.get(url, stream=True, headers=resume_header, timeout=30) as r:
+        # Begin download with headers
+        with requests.get(url, stream=True, headers=headers, timeout=30) as r:
             r.raise_for_status()
 
-            # If resuming, adjust total to show correct progress bar
             content_length = int(r.headers.get('content-length', 0))
             final_total = existing_size + content_length
 
@@ -113,25 +122,27 @@ def download_file_from_url(url: str, dest_folder: str = ".") -> str:
 
     return dest_path
 
-def download_folder_from_url(url: str, dest_folder: str = ".") -> List[str]:
+
+def download_folder_from_url(url: str, dest_folder: str = ".", internal: bool = False) -> List[str]:
     """
     Download all files listed in a remote folder (server must support listing).
 
     Args:
         url (str): Folder URL.
         dest_folder (str): Local folder to save downloads.
+        internal (bool): Whether this is internal resource on Artifactory
 
     Returns:
         List[str]: Paths to all downloaded files.
     """
-    file_urls = _list_directory_files(url)
+    file_urls = _list_directory_files(url, internal=internal)
     downloaded_paths = []
 
     for file_url in file_urls:
         try:
-            downloaded_path = download_file_from_url(file_url, dest_folder)
+            downloaded_path = download_file_from_url(file_url, dest_folder, internal=internal)
             downloaded_paths.append(downloaded_path)
         except Exception as e:
             print(f"⚠ Skipped {file_url}: {e}")
 
-    return downloaded_paths
+    return downloaded_paths

sima_cli/model_zoo/model.py

@@ -0,0 +1,148 @@
+# model_zoo/models.py
+
+import requests
+import click
+import os
+from urllib.parse import urlparse
+
+from sima_cli.utils.config import get_auth_token
+from sima_cli.download import download_file_from_url
+
+ARTIFACTORY_BASE_URL = "https://artifacts.eng.sima.ai:443/artifactory"
+
+def _is_valid_url(url: str) -> bool:
+    try:
+        result = urlparse(url)
+        return all([result.scheme, result.netloc])
+    except:
+        return False
+
+def _download_model_internal(ver: str, model_name: str):
+    repo = "sima-qa-releases"
+    base_path = f"SiMaCLI-SDK-Releases/{ver}-Release/modelzoo_edgematic/{model_name}"
+    aql_query = f"""
+                items.find({{
+                "repo": "{repo}",
+                "path": {{
+                    "$match": "{base_path}*"
+                }},
+                "type": "file"
+                }}).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:
+        click.echo(f"Failed to list model files. Status: {response.status_code}, path: {aql_url}")
+        click.echo(response.text)
+        return
+
+    results = response.json().get("results", [])
+    if not results:
+        click.echo(f"No files found for model: {model_name}")
+        return
+
+    dest_dir = os.path.join(os.getcwd(), model_name)
+    os.makedirs(dest_dir, exist_ok=True)
+
+    click.echo(f"Downloading files for model '{model_name}' to '{dest_dir}'...")
+
+    for item in results:
+        file_path = item["path"]
+        file_name = item["name"]
+        download_url = f"{ARTIFACTORY_BASE_URL}/{repo}/{file_path}/{file_name}"
+
+        try:
+            local_path = download_file_from_url(download_url, dest_folder=dest_dir, internal=True)
+            click.echo(f"✅ {file_name} -> {local_path}")
+        except Exception as e:
+            click.echo(f"❌ Failed to download {file_name}: {e}")
+
+    # Check for model_path.txt and optionally download external ONNX model
+    model_path_file = os.path.join(dest_dir, "model_path.txt")
+    if os.path.exists(model_path_file):
+        with open(model_path_file, "r") as f:
+            first_line = f.readline().strip()
+            if _is_valid_url(first_line):
+                click.echo(f"\n🔍 model_path.txt contains external model link:\n{first_line}")
+                if click.confirm("Do you want to download the FP32 ONNX model from this link?", default=True):
+                    try:
+                        external_model_path = download_file_from_url(first_line, dest_folder=dest_dir, internal=True)
+                        click.echo(f"✅ External model downloaded to: {external_model_path}")
+                    except Exception as e:
+                        click.echo(f"❌ Failed to download external model: {e}")
+            else:
+                click.echo("⚠️ model_path.txt exists but does not contain a valid URL.")
+
+def _list_available_models_internal(version: str):
+    repo_path = f"SiMaCLI-SDK-Releases/{version}-Release/modelzoo_edgematic"
+    aql_query = f"""
+                items.find({{
+                "repo": "sima-qa-releases",
+                "path": {{
+                    "$match": "{repo_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:
+        click.echo(f"Failed to retrieve model list. Status: {response.status_code}")
+        click.echo(response.text)
+        return
+
+    results = response.json().get("results", [])
+    
+    base_prefix = f"SiMaCLI-SDK-Releases/{version}-Release/modelzoo_edgematic/"
+    model_paths = sorted({
+        item["path"].replace(base_prefix, "").rstrip("/") + "/" + item["name"]
+        for item in results
+    })
+
+    if not model_paths:
+        click.echo("No models found.")
+        return
+
+    # Pretty print table
+    max_len = max(len(name) for name in model_paths)
+    click.echo(f"{'-' * max_len}")
+    for path in model_paths:
+        click.echo(path.ljust(max_len))
+
+    return model_paths
+
+def list_models(internal, ver):
+    if internal:
+        click.echo("Model Zoo Source : SiMa Artifactory...")
+        return _list_available_models_internal(ver)
+    else:
+        print('External model zoo not supported yet')
+
+def download_model(internal, ver, model_name):
+    if internal:
+        click.echo("Model Zoo Source : SiMa Artifactory...")
+        return _download_model_internal(ver, model_name)
+    else:
+        print('External model zoo not supported yet')
+
+# Module CLI tests
+if __name__ == "__main__":
+    import sys
+    if len(sys.argv) < 2:
+        print("Usage: python models.py <version>")
+    else:
+        version_arg = sys.argv[1]
+        _list_available_models_internal(version_arg)