sima-cli 2.1.6__tar.gz → 2.1.8__tar.gz

{sima_cli-2.1.6/sima_cli.egg-info → sima_cli-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 2.1.6
+Version: 2.1.8
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://developer.sima.ai/
 Author: SiMa.ai
@@ -163,10 +163,11 @@ sima-cli vulcan download --env production core main
   - `dev`: `https://artifacts.neat.paconsultings.com`
   - `staging`: `https://artifacts.stg.neat.sima.ai`
   - `production`: `https://artifacts.neat.sima.ai`
-- `staging` and `production` are not yet available for Vulcan downloads; use `--env dev` for now.
+- `dev` and `staging` are available for Vulcan downloads. `production` is not yet available.
 - Usage:
-  - `sima-cli vulcan --env {dev|staging|production} download [REPO] [BRANCH_OR_TAG]`
-  - `sima-cli vulcan download --env {dev|staging|production} [REPO] [BRANCH_OR_TAG]`
+  - `sima-cli vulcan --env {dev|stg|staging|prd|prod|production} download [REPO] [BRANCH_OR_TAG]`
+  - `sima-cli vulcan download --env {dev|stg|staging|prd|prod|production} [REPO] [BRANCH_OR_TAG]`
+  - Shortcut flags are also available: `--dev`, `--stg`/`--staging`, and `--prd`/`--prod`.
   - If `REPO` is omitted, the CLI prompts for a repository.
   - If `BRANCH_OR_TAG` is omitted, the CLI downloads `branches.json` and prompts for a branch.
   - For automation, pass both values and add `--json` for structured output.
@@ -587,7 +588,19 @@ sima-cli selfupdate
 sima-cli selfupdate --dev
 ```
 
-- Update from the latest tested artifact installer. On Windows, this prints the PowerShell commands to run in a new shell.
+- Update from Vulcan dev artifacts. If `--branch` is omitted, sima-cli loads `branches.json` and prompts for a branch.
+
+```bash
+sima-cli selfupdate --stg --branch main
+```
+
+- Update from Vulcan staging artifacts.
+
+```bash
+sima-cli selfupdate --neat --branch main
+```
+
+- Update from Vulcan production artifacts. Production aliases are `--prd`, `--prod`, `--neat`, and `--vulcan`.
 
 ```bash
 sima-cli selfupdate -v 0.0.46

{sima_cli-2.1.6 → sima_cli-2.1.8}/README.md

@@ -129,10 +129,11 @@ sima-cli vulcan download --env production core main
   - `dev`: `https://artifacts.neat.paconsultings.com`
   - `staging`: `https://artifacts.stg.neat.sima.ai`
   - `production`: `https://artifacts.neat.sima.ai`
-- `staging` and `production` are not yet available for Vulcan downloads; use `--env dev` for now.
+- `dev` and `staging` are available for Vulcan downloads. `production` is not yet available.
 - Usage:
-  - `sima-cli vulcan --env {dev|staging|production} download [REPO] [BRANCH_OR_TAG]`
-  - `sima-cli vulcan download --env {dev|staging|production} [REPO] [BRANCH_OR_TAG]`
+  - `sima-cli vulcan --env {dev|stg|staging|prd|prod|production} download [REPO] [BRANCH_OR_TAG]`
+  - `sima-cli vulcan download --env {dev|stg|staging|prd|prod|production} [REPO] [BRANCH_OR_TAG]`
+  - Shortcut flags are also available: `--dev`, `--stg`/`--staging`, and `--prd`/`--prod`.
   - If `REPO` is omitted, the CLI prompts for a repository.
   - If `BRANCH_OR_TAG` is omitted, the CLI downloads `branches.json` and prompts for a branch.
   - For automation, pass both values and add `--json` for structured output.
@@ -553,7 +554,19 @@ sima-cli selfupdate
 sima-cli selfupdate --dev
 ```
 
-- Update from the latest tested artifact installer. On Windows, this prints the PowerShell commands to run in a new shell.
+- Update from Vulcan dev artifacts. If `--branch` is omitted, sima-cli loads `branches.json` and prompts for a branch.
+
+```bash
+sima-cli selfupdate --stg --branch main
+```
+
+- Update from Vulcan staging artifacts.
+
+```bash
+sima-cli selfupdate --neat --branch main
+```
+
+- Update from Vulcan production artifacts. Production aliases are `--prd`, `--prod`, `--neat`, and `--vulcan`.
 
 ```bash
 sima-cli selfupdate -v 0.0.46

{sima_cli-2.1.6 → sima_cli-2.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sima-cli"
-version = "2.1.6"
+version = "2.1.8"
 description = "CLI tool for SiMa Developer Portal to download models, firmware, and apps."
 readme = "README.md"
 requires-python = ">=3.8"

{sima_cli-2.1.6 → sima_cli-2.1.8}/sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "2.1.6"
+__version__ = "2.1.8"

{sima_cli-2.1.6 → sima_cli-2.1.8}/sima_cli/cli.py

@@ -30,6 +30,13 @@ from sima_cli.install.registry import register_packages_commands
 from sima_cli.upgrade.selfupdate import register_selfupdate_command
 from sima_cli.playbooks import register_playbook_commands
 from sima_cli.vulcan import register_vulcan_commands
+from sima_cli.vulcan.commands import (
+    ENV_METAVAR,
+    _environment_shortcut_options,
+    _normalize_environment_option,
+    _resolve_environment,
+    install_vulcan_package,
+)
 
 def _configure_stdio_errors() -> None:
     for stream in (getattr(sys, "stdout", None), getattr(sys, "stderr", None)):
@@ -504,7 +511,39 @@ ALL_COMPONENTS = SDK_DEPENDENT_COMPONENTS | SDK_INDEPENDENT_COMPONENTS
 @click.argument("component", required=False)
 @click.option("-v", "--version", help="SDK version (required for SDK-dependent components unless --metadata is provided)")
 @click.option("-m", "--mirror", help="URL to a metadata.json file for generic installation")
-@click.option("-t", "--tag", help="Tag of the package (optional)")
+@click.option("-t", "--tag", help="Tag of the package. With --neat, metadata variant type such as minimum.")
+@click.option("--neat", "use_neat", is_flag=True, help="Install from Neat artifacts using the Neat package resolver.")
+@click.option(
+    "--vulcan",
+    "use_vulcan",
+    is_flag=True,
+    help="Install from Neat/Vulcan artifacts. Compatibility alias for --neat.",
+)
+@_environment_shortcut_options
+@click.option(
+    "--env",
+    "vulcan_environment",
+    metavar=ENV_METAVAR,
+    callback=_normalize_environment_option,
+    default=None,
+    help="Neat artifact environment. Used with --neat or --vulcan. Defaults to production.",
+)
+@click.option(
+    "--base-url",
+    "vulcan_base_url",
+    default=None,
+    envvar="SIMA_NEAT_BASE_URL",
+    help="Override the Neat artifact base URL. Used with --neat or --vulcan.",
+)
+@click.option(
+    "-d",
+    "--install-dir",
+    default=".",
+    show_default=True,
+    type=click.Path(file_okay=False, dir_okay=True, path_type=str),
+    help="Directory where Neat package resources are downloaded and installed. Used with --neat or --vulcan.",
+)
+@click.option("--json", "json_output", is_flag=True, help="With --neat or --vulcan, print resolved metadata URL and exit.")
 @click.option(
     "-f",
     "--force",
@@ -513,7 +552,21 @@ ALL_COMPONENTS = SDK_DEPENDENT_COMPONENTS | SDK_INDEPENDENT_COMPONENTS
     help="Force installation even if compatibility checks fail.",
 )
 @click.pass_context
-def install_cmd(ctx, component, version, mirror, tag, force):
+def install_cmd(
+    ctx,
+    component,
+    version,
+    mirror,
+    tag,
+    use_neat,
+    use_vulcan,
+    vulcan_environment,
+    environment_flag,
+    vulcan_base_url,
+    install_dir,
+    json_output,
+    force,
+):
     """
     Install SiMa packages.
 
@@ -548,12 +601,32 @@ def install_cmd(ctx, component, version, mirror, tag, force):
     """
     internal = ctx.obj.get("internal", False)
 
+    use_neat_resolver = use_neat or use_vulcan
+    if use_neat_resolver:
+        if use_neat and use_vulcan:
+            raise click.ClickException("Use only one of --neat or --vulcan.")
+        if mirror:
+            raise click.ClickException("--mirror cannot be used with --neat.")
+        if not component:
+            raise click.ClickException("You must specify a Neat target when using --neat.")
+        install_vulcan_package(
+            target=component,
+            environment=_resolve_environment(vulcan_environment, environment_flag),
+            base_url=vulcan_base_url or os.getenv("SIMA_VULCAN_BASE_URL"),
+            package_type=tag,
+            install_dir=install_dir,
+            force=force,
+            json_output=json_output,
+        )
+        return None
+
     # Metadata-based installation path
     if mirror:
         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}")
-        return install_from_metadata(metadata_url=mirror, internal=internal, force=force)
+        install_from_metadata(metadata_url=mirror, internal=internal, force=force)
+        return None
 
     # No component and no metadata: error
     if not component:
@@ -562,11 +635,13 @@ def install_cmd(ctx, component, version, mirror, tag, force):
 
     # 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, force=force)
+        install_from_metadata(metadata_url=component, internal=False, force=force)
+        return None
     
     # if the user specified cr: or ghcr: as component, install from container registry
     if component.startswith("cr:") or component.startswith("ghcr:"):
-        return install_from_cr(resource_spec=component, internal=internal)
+        install_from_cr(resource_spec=component, internal=internal)
+        return None
 
     version = resolve_version(version)
 
@@ -601,6 +676,7 @@ def install_cmd(ctx, component, version, mirror, tag, force):
             ctx.exit(1)
 
     click.echo("✅ Installation complete.")
+    return None
 
 
 # ----------------------

{sima_cli-2.1.6 → sima_cli-2.1.8}/sima_cli/install/metadata_installer.py

@@ -11,7 +11,7 @@ import stat
 import shlex
 import platform
 import hashlib
-from urllib.parse import urlparse, quote, urljoin
+from urllib.parse import urlparse, quote, urljoin, unquote
 from typing import Dict
 from tqdm import tqdm
 from pathlib import Path
@@ -280,6 +280,169 @@ def _compute_sha256(file_path: Path, chunk_size: int = 1024 * 1024) -> str:
                 hasher.update(chunk)
     return hasher.hexdigest()
 
+def _resolve_resource_url(base_url: str, resource: str) -> str:
+    """
+    Resolve a metadata resource to a downloadable URL.
+
+    Metadata resources are file names or relative paths. Encode each path segment
+    so URL-reserved characters that are valid in artifact names, such as '+', do
+    not get interpreted by object storage/CDNs as a different key.
+    """
+    parsed_resource = urlparse(resource)
+    if parsed_resource.scheme or parsed_resource.netloc:
+        return resource
+
+    encoded_resource = "/".join(
+        quote(segment, safe="")
+        for segment in resource.split("/")
+    )
+    return urljoin(base_url, encoded_resource)
+
+def _resolve_resource_url_candidates(base_url: str, resource: str) -> list[str]:
+    primary_url = _resolve_resource_url(base_url, resource)
+
+    parsed_resource = urlparse(resource)
+    if parsed_resource.scheme or parsed_resource.netloc or "%" not in resource:
+        return [primary_url]
+
+    percent_preserving_resource = "/".join(
+        quote(segment, safe="%")
+        for segment in resource.split("/")
+    )
+    fallback_url = urljoin(base_url, percent_preserving_resource)
+    if fallback_url == primary_url:
+        return [primary_url]
+    return [primary_url, fallback_url]
+
+def _metadata_resource_path(dest_folder: str, resource: str, resource_url: str) -> Path:
+    parsed_resource = urlparse(resource)
+    if parsed_resource.scheme or parsed_resource.netloc:
+        file_name = os.path.basename(urlparse(resource_url).path)
+    else:
+        file_name = os.path.basename(resource)
+
+    if not file_name:
+        raise click.ClickException(f"❌ Cannot determine file name for resource '{resource}'.")
+
+    return Path(dest_folder) / file_name
+
+def _normalize_downloaded_metadata_resource(local_path: str, expected_path: Path) -> str:
+    downloaded_path = Path(local_path)
+    if downloaded_path == expected_path:
+        return local_path
+
+    if expected_path.exists():
+        expected_path.unlink()
+    downloaded_path.rename(expected_path)
+    return str(expected_path)
+
+def _download_metadata_file_resource(
+    resource: str,
+    resource_urls: list[str],
+    dest_folder: str,
+    dest_path: Path,
+    internal: bool,
+) -> str:
+    errors: list[str] = []
+    for index, resource_url in enumerate(resource_urls):
+        try:
+            local_path = download_file_from_url(
+                url=resource_url,
+                dest_folder=dest_folder,
+                internal=internal
+            )
+            return _normalize_downloaded_metadata_resource(local_path, dest_path)
+        except Exception as e:
+            errors.append(f"{resource_url}: {e}")
+            if index < len(resource_urls) - 1:
+                click.echo(
+                    f"⚠️  Download failed for encoded resource URL; retrying percent-preserving URL for '{resource}'."
+                )
+
+    raise click.ClickException("; ".join(errors))
+
+
+def _resource_basename(resource: str) -> str:
+    parsed = urlparse(resource)
+    path = parsed.path if parsed.scheme or parsed.netloc else resource
+    return unquote(os.path.basename(path)).lower()
+
+
+def _is_wheel_resource(resource: str) -> bool:
+    return _resource_basename(resource).endswith(".whl")
+
+
+def _wheel_platform_tag(resource: str) -> str:
+    name = _resource_basename(resource)
+    if not name.endswith(".whl"):
+        return ""
+    parts = name[:-4].split("-")
+    if len(parts) < 5:
+        return ""
+    return parts[-1].lower()
+
+
+def _current_wheel_platform() -> tuple:
+    system = platform.system().lower()
+    machine = platform.machine().lower()
+
+    if system == "darwin":
+        os_family = "mac"
+    elif system == "windows":
+        os_family = "windows"
+    elif system == "linux":
+        os_family = "linux"
+    else:
+        os_family = system
+
+    if machine in {"x86_64", "amd64"}:
+        arch_tokens = {"x86_64", "amd64"}
+    elif machine in {"aarch64", "arm64"}:
+        arch_tokens = {"aarch64", "arm64"}
+    elif machine in {"i386", "i686", "x86"}:
+        arch_tokens = {"i386", "i686", "x86", "win32"}
+    else:
+        arch_tokens = {machine} if machine else set()
+
+    return os_family, arch_tokens
+
+
+def _wheel_arch_matches(platform_tag: str, arch_tokens: set) -> bool:
+    known_arch_tokens = {"x86_64", "amd64", "aarch64", "arm64", "i386", "i686", "x86", "win32"}
+    present_tokens = {token for token in known_arch_tokens if token in platform_tag}
+    return not present_tokens or bool(present_tokens & arch_tokens)
+
+
+def _is_compatible_wheel_resource(resource: str) -> bool:
+    platform_tag = _wheel_platform_tag(resource)
+    if not platform_tag:
+        return True
+    if platform_tag in {"any", "none"}:
+        return True
+
+    os_family, arch_tokens = _current_wheel_platform()
+    if os_family == "mac":
+        os_matches = platform_tag.startswith("macosx") or "macos" in platform_tag
+    elif os_family == "windows":
+        os_matches = platform_tag.startswith("win") or platform_tag in {"win32", "win_amd64", "win_arm64"}
+    elif os_family == "linux":
+        os_matches = "linux" in platform_tag
+    else:
+        os_matches = False
+
+    return os_matches and _wheel_arch_matches(platform_tag, arch_tokens)
+
+
+def _filter_download_compatible_resources(resources: list) -> list:
+    filtered = []
+    for resource in resources:
+        if _is_wheel_resource(resource) and not _is_compatible_wheel_resource(resource):
+            click.echo(f"⏭️  Skipping incompatible wheel for this platform: {resource}")
+            continue
+        filtered.append(resource)
+    return filtered
+
+
 def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal: bool = False, skip_models: bool = False, tag: str = None) -> list:
     """
     Downloads resources defined in metadata to a local destination folder.
@@ -321,8 +484,11 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
             continue
         filtered_resources.append(r)
 
+    if metadata.get("download-compatible-files-only"):
+        filtered_resources = _filter_download_compatible_resources(filtered_resources)
+
     if not filtered_resources:
-        click.echo("ℹ️ No non-model resources to download.")
+        click.echo("ℹ️ No compatible resources to download.")
         return []
 
     click.echo(f"📥 Downloading {len(filtered_resources)} resource(s) to: {dest_folder}\n")
@@ -387,10 +553,8 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
                 continue
 
             # 🌐 Standard file or URL
-            resource_url = urljoin(base_url, resource)
-            parsed = urlparse(resource_url)
-            file_name = os.path.basename(parsed.path)
-            dest_path = Path(dest_folder) / file_name
+            resource_urls = _resolve_resource_url_candidates(base_url, resource)
+            dest_path = _metadata_resource_path(dest_folder, resource, resource_urls[0])
 
             if expected_sha256 and dest_path.exists() and dest_path.is_file():
                 existing_sha = _compute_sha256(dest_path)
@@ -398,9 +562,11 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
                     click.echo(f"♻️  Checksum mismatch for existing file '{dest_path.name}', re-downloading.")
                     dest_path.unlink()
 
-            local_path = download_file_from_url(
-                url=resource_url,
+            local_path = _download_metadata_file_resource(
+                resource=resource,
+                resource_urls=resource_urls,
                 dest_folder=dest_folder,
+                dest_path=dest_path,
                 internal=internal
             )
             if expected_sha256:
@@ -417,6 +583,28 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
 
     return local_paths
 
+def _mark_install_script_executable(metadata: Dict, install_dir: str) -> None:
+    script = metadata.get("installation", {}).get("script", "")
+    if not isinstance(script, str):
+        return
+
+    script = script.strip()
+    if not script or any(char in script for char in "\n\r;&|`$<>"):
+        return
+
+    script_path = Path(script)
+    if not script_path.is_absolute():
+        script_path = Path(install_dir) / script_path
+    try:
+        resolved = script_path.resolve()
+        install_root = Path(install_dir).resolve()
+        if resolved != install_root and install_root not in resolved.parents:
+            return
+        if resolved.is_file():
+            resolved.chmod(resolved.stat().st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+    except OSError:
+        return
+
 def selectable_resource_handler(metadata):
     """
     Allow user to select one or more opt-in resources to download.
@@ -936,6 +1124,10 @@ def _is_platform_compatible(metadata: dict, force: bool = False) -> bool:
     platforms = metadata.get("platforms", [])
     board_ver, _ = get_sima_build_version()
 
+    if not platforms:
+        click.echo("ℹ️  No platform restrictions specified; treating package as compatible with all platforms.")
+        return True
+
     # Detect current OS and version
     os_name = platform.system().lower()  # 'darwin', 'windows', 'linux'
     os_version = "Unknown"
@@ -1218,8 +1410,10 @@ def install_from_metadata(metadata_url: str, internal: bool, install_dir: str =
                 if _is_platform_compatible(metadata, force) or force:
                     local_paths = _download_assets(metadata, metadata_url, install_dir, internal, tag=tag)
                     if len(local_paths) > 0:
+                        _mark_install_script_executable(metadata, install_dir)
                         _combine_multipart_files(install_dir, local_paths=local_paths)
                         _extract_archives_in_folder(install_dir, local_paths)
+                        _mark_install_script_executable(metadata, install_dir)
                         _run_installation_script(metadata=metadata, extract_path=install_dir)
 
     except Exception as e: