sima-cli 2.1.16__tar.gz → 2.1.17__tar.gz

{sima_cli-2.1.16/sima_cli.egg-info → sima_cli-2.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 2.1.16
+Version: 2.1.17
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://community.sima.ai/
 Author: SiMa.ai
@@ -21,6 +21,7 @@ Requires-Dist: requests<3.0,>=2.32.4
 Requires-Dist: tqdm>=4.64
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: paramiko>=3.5.1
+Requires-Dist: cryptography>=3.3
 Requires-Dist: plotext==5.3.2
 Requires-Dist: rich==14.0.0
 Requires-Dist: InquirerPy==0.3.4
@@ -34,6 +35,8 @@ Dynamic: requires-python
 
 # sima-cli - SiMa Developer Portal CLI Tool
 
+**Documentation:** [English](docs/sima-cli/index.md) | [한국어](docs/i18n/ko/sima-cli/index.md) | [日本語](docs/i18n/ja/sima-cli/index.md) | [繁體中文](docs/i18n/zh-Hant/sima-cli/index.md) | [Українська](docs/i18n/uk/sima-cli/index.md)
+
 [![Python 3.8](https://img.shields.io/github/actions/workflow/status/sima-neat/sima-cli/vulcan-ci.yml?branch=main&job=Compatibility%20Python%203.8&label=python%203.8)](https://github.com/sima-neat/sima-cli/actions/workflows/vulcan-ci.yml)
 [![Python 3.9](https://img.shields.io/github/actions/workflow/status/sima-neat/sima-cli/vulcan-ci.yml?branch=main&job=Compatibility%20Python%203.9&label=python%203.9)](https://github.com/sima-neat/sima-cli/actions/workflows/vulcan-ci.yml)
 [![Python 3.10](https://img.shields.io/github/actions/workflow/status/sima-neat/sima-cli/vulcan-ci.yml?branch=main&job=Compatibility%20Python%203.10&label=python%203.10)](https://github.com/sima-neat/sima-cli/actions/workflows/vulcan-ci.yml)

{sima_cli-2.1.16 → sima_cli-2.1.17}/README.md

@@ -1,5 +1,7 @@
 # sima-cli - SiMa Developer Portal CLI Tool
 
+**Documentation:** [English](docs/sima-cli/index.md) | [한국어](docs/i18n/ko/sima-cli/index.md) | [日本語](docs/i18n/ja/sima-cli/index.md) | [繁體中文](docs/i18n/zh-Hant/sima-cli/index.md) | [Українська](docs/i18n/uk/sima-cli/index.md)
+
 [![Python 3.8](https://img.shields.io/github/actions/workflow/status/sima-neat/sima-cli/vulcan-ci.yml?branch=main&job=Compatibility%20Python%203.8&label=python%203.8)](https://github.com/sima-neat/sima-cli/actions/workflows/vulcan-ci.yml)
 [![Python 3.9](https://img.shields.io/github/actions/workflow/status/sima-neat/sima-cli/vulcan-ci.yml?branch=main&job=Compatibility%20Python%203.9&label=python%203.9)](https://github.com/sima-neat/sima-cli/actions/workflows/vulcan-ci.yml)
 [![Python 3.10](https://img.shields.io/github/actions/workflow/status/sima-neat/sima-cli/vulcan-ci.yml?branch=main&job=Compatibility%20Python%203.10&label=python%203.10)](https://github.com/sima-neat/sima-cli/actions/workflows/vulcan-ci.yml)

{sima_cli-2.1.16 → sima_cli-2.1.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sima-cli"
-version = "2.1.16"
+version = "2.1.17"
 description = "CLI tool for SiMa Developer Portal to download models, firmware, and apps."
 readme = "README.md"
 requires-python = ">=3.8"
@@ -27,6 +27,7 @@ dependencies = [
     "tqdm>=4.64",
     "pyyaml>=6.0",
     "paramiko>=3.5.1",
+    "cryptography>=3.3",
     "plotext==5.3.2",
     "rich==14.0.0",
     "InquirerPy==0.3.4",

{sima_cli-2.1.16 → sima_cli-2.1.17}/sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "2.1.16"
+__version__ = "2.1.17"

{sima_cli-2.1.16 → sima_cli-2.1.17}/sima_cli/cli.py

@@ -1,12 +1,14 @@
 import os
 import shutil
 import sys
+from contextlib import nullcontext, redirect_stdout
 import click
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
 from sima_cli.utils.env import get_environment_type
 from sima_cli.update.updater import perform_update
+from sima_cli.update.swu import handle_update
 from sima_cli.model_zoo.model import list_models, download_model, describe_model
 from sima_cli.app_zoo.app import list_apps, download_app, describe_app
 from sima_cli.utils.config_loader import internal_resource_exists
@@ -37,6 +39,7 @@ 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.models import register_models_commands
 from sima_cli.vulcan.commands import (
     ENV_METAVAR,
     _environment_shortcut_options,
@@ -99,19 +102,7 @@ def _rerun_current_command() -> None:
     os.execvpe(sys.executable, cmd, env)
 
 
-# Entry point for the CLI tool using Click's command group decorator
-@click.group(context_settings=dict(help_option_names=["-h", "--help", "-?"], max_content_width=120))
-@click.option('-i', '--internal', is_flag=True, help="Use internal Artifactory resources, Authorized Sima employees only")
-@click.option('-y', '--yes', is_flag=True, help="Assume yes for confirmation prompts.")
-@click.version_option(version=f"{__version__}", message="SiMa CLI version: %(version)s")
-@click.pass_context
-def main(ctx, internal, yes):
-    """
-    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)
-    """
+def _initialize_main_context(ctx, internal, yes):
     _configure_stdio_errors()
     auto_accept_update = yes or _update_auto_confirm_requested(sys.argv)
     previous_auto_accept = os.environ.get("SIMA_CLI_AUTO_ACCEPT_UPDATE")
@@ -134,26 +125,26 @@ def main(ctx, internal, yes):
     if not internal:
         internal = os.getenv("SIMA_CLI_INTERNAL", "0") in ("1", "true", "yes")
 
-    if internal and not internal_resource_exists():
-        click.echo("❌ You have specified -i or --internal argument to access internal resources, but you do not have an internal resource map configured.")        
+    defer_artifactory_access = ctx.invoked_subcommand == "update" or ctx.meta.get("daily_netboot", False)
+    if internal and not internal_resource_exists() and not defer_artifactory_access:
+        click.echo("❌ You have specified -i or --internal argument to access internal resources, but you do not have an internal resource map configured.")
         click.echo("Refer to the confluence page to find out how to configure internal resource map.")
-        exit(0)        
+        exit(0)
 
     internal_reachable = True
     if internal:
         internal_reachable = check_artifactory_reachability()
 
-    if internal and not internal_reachable and not _allows_external_prerelease_fallback(sys.argv):
+    if internal and not internal_reachable and not defer_artifactory_access and not _allows_external_prerelease_fallback(sys.argv):
         click.secho("❌ You have specified -i or --internal argument to access internal resources, but you can't connect to Artifactory.", fg='red')
         click.secho("Please make sure you are connected to VPN or are on the corporate network.", fg='red')
         exit(0)
 
-    if internal and not internal_reachable:
+    if internal and not internal_reachable and not defer_artifactory_access:
         click.secho(
             "⚠️  Internal resources are unreachable. --force allows this update to use the external pre-release mirror.",
             fg="yellow",
         )
-        
 
     ctx.obj["internal"] = internal
     ctx.obj["internal_reachable"] = internal_reachable
@@ -167,12 +158,61 @@ def main(ctx, internal, yes):
         click.echo(f"🔧 Environment: {env_type} ({env_subtype})")
 
 
+class InspectionAwareGroup(click.Group):
+    def parse_args(self, ctx, args):
+        # Capture the actual Click arguments (also works with CliRunner), before
+        # the root callback can perform a CLI self-update or network login.
+        options = args[:args.index('--')] if '--' in args else args
+        ctx.meta['daily_netboot'] = (
+            _command_name_from_argv(['sima-cli'] + options) == 'bootimg'
+            and any(arg in ('--netboot', '-n', '--autoflash', '-a') for arg in options)
+        )
+        if _command_name_from_argv(['sima-cli'] + options) == 'update' and '--inspect' in options:
+            ctx.meta['update_inspect'] = True
+        return super().parse_args(ctx, args)
+
+
+# Entry point for the CLI tool using Click's command group decorator
+@click.group(cls=InspectionAwareGroup, context_settings=dict(help_option_names=["-h", "--help", "-?"], max_content_width=120))
+@click.option('-i', '--internal', is_flag=True, help="Use internal Artifactory resources, Authorized Sima employees only")
+@click.option('-y', '--yes', is_flag=True, help="Assume yes for confirmation prompts.")
+@click.version_option(version=f"{__version__}", message="SiMa CLI version: %(version)s")
+@click.pass_context
+def main(ctx, internal, yes):
+    """
+    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)
+    """
+    internal = internal or os.getenv("SIMA_CLI_INTERNAL", "0") in ("1", "true", "yes")
+    if internal:
+        Console(stderr=True).print(Panel(
+            "Pre-release software may be unstable. Use at your own risk.",
+            title="Pre-release software", border_style="yellow",
+        ))
+    if ctx.meta.get('update_inspect'):
+        ctx.ensure_object(dict)
+        ctx.obj.update(internal=internal, yes=yes)
+        return
+    # Model Registry JSON must remain parseable on stdout. Route root-level
+    # update and environment diagnostics to stderr for this command group.
+    output_context = (
+        redirect_stdout(sys.stderr)
+        if ctx.invoked_subcommand == "models"
+        else nullcontext()
+    )
+    with output_context:
+        _initialize_main_context(ctx, internal, yes)
+
+
 # ----------------------
 # SDK Command
 # ----------------------
 register_sdk_commands(main)
 register_playbook_commands(main)
 register_vulcan_commands(main)
+register_models_commands(main)
 
 
 # ----------------------
@@ -294,7 +334,8 @@ def download(ctx, url, dest):
     is_flag=True,
     help=(
         "If the internal mirror is unreachable, fall back to the external pre-release mirror "
-        "without signature verification; without --internal, select that mirror directly (ELXR only)."
+        "(eLxr only). eLxr 3.0+ still verifies signed full-system bundles. "
+        "On eLxr 2.1, this disables repository signature verification and, without --internal, selects the mirror directly."
     )
 )
 @click.option(
@@ -307,10 +348,13 @@ def download(ctx, url, dest):
     "--dryrun",
     is_flag=True,
     default=False,
-    help="For ELXR updates only, validate the update path and print the simaai-ota command without running it."
+    help="For eLxr updates, validate the update path and show the command without installing."
 )
+@click.option("--inspect", "inspect_state", is_flag=True, help="Show eLxr 3.0+ A/B slot state without updating (local or --ip).")
+@click.option("--signing-cert", metavar="URL_OR_FILE", help="SWUpdate PEM verification certificate: HTTP(S) URL or local file. Defaults to the certificate for the selected channel when configured (eLxr 3.0+).")
+@click.option("--reboot", is_flag=True, help="Reboot after successful eLxr 3.0+ installation; verify remote boot health.")
 @click.pass_context
-def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force, troot_only, dryrun):
+def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force, troot_only, dryrun, inspect_state, reboot, signing_cert):
     """
     Update the software on a SiMa DevKit or remote SiMa device.
 
@@ -319,6 +363,24 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
     or remote devices accessible over the network). Updates may be
     installed directly on the device or pushed from a development host.
 
+    eLxr 3.0+ uses signed full-system SWU bundles. Use --inspect for A/B
+    state, --ip for remote updates, and --reboot to reboot after installation.
+    The verification certificate is downloaded for the selected channel when configured; use
+    --signing-cert URL_OR_FILE for an image signed with your own certificate.
+    Developer-portal version lookup for 3.0 is not available yet.
+
+    Internal mode warns that pre-release software may be unstable and is used
+    at your own risk. On eLxr 3.0+, unavailable Artifactory access falls back
+    to the public daily platform mirror, including missing login, HTTP 401/403,
+    connection failures, timeouts, and server errors. Exact build names select
+    directly; partial matches show builds newest first by build number.
+
+    Mirror downloads verify the indexed size and SHA-256 before signed
+    installation. A missing build or failed download stops before installation.
+    A connection loss after installation starts requires inspecting the board
+    before retrying. Devices running eLxr 2.1.3 retain the APT update flow;
+    upgrading those devices to 3.0 requires recovery/provisioning first.
+
     How Version Resolution Works:
 
       • If a version string is provided (e.g., ``1.7.0``), sima-cli automatically resolves it to the correct downloadable firmware asset based on channel, flavor, and board type.
@@ -368,7 +430,7 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
 
         sima-cli update -v 1.7.0 -y
 
-        # Update ELXR to the latest official release without prompts
+        # Update legacy eLxr (<3.0) to the latest official release without prompts
 
         sima-cli update -y
 
@@ -376,11 +438,11 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
 
         sima-cli -i update -y
 
-        # Update ELXR from the public pre-release mirror without prompts
+        # Update legacy eLxr (<3.0) from the public pre-release mirror without prompts
 
         sima-cli -y update -f -y
 
-        # Validate ELXR update path without running simaai-ota
+        # Validate the eLxr update path without installing
 
         sima-cli update --dryrun
 
@@ -392,6 +454,29 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
     # Prioritize explicit --version option over positional argument
     version_or_url = version_option or version_or_url
     is_elxr = is_devkit_running_elxr()
+    if inspect_state and (version_or_url or dryrun or force or troot_only or reboot or signing_cert is not None or flavor != 'auto'):
+        raise click.UsageError("--inspect cannot be combined with installation options.")
+    try:
+        if handle_update(version_or_url, ip=ip, passwd=passwd,
+                         internal=ctx.obj.get("internal", False),
+                         auto_confirm=yes or ctx.obj.get("yes", False), dryrun=dryrun,
+                         signing_cert=signing_cert, reboot=reboot, inspect=inspect_state, force=force,
+                         troot_only=troot_only, flavor=flavor, local_elxr=is_elxr):
+            return
+    except (click.ClickException, click.Abort):
+        raise
+    except Exception as exc:
+        raise click.ClickException(str(exc)) from exc
+
+    # Legacy updates retain their original access/--force policy after dispatch.
+    if ctx.obj.get("internal", False):
+        if not internal_resource_exists():
+            raise click.ClickException("Internal resources are not configured on this machine.")
+        if not ctx.obj.get("internal_reachable", True) and not force:
+            raise click.ClickException(
+                "Artifactory is unreachable. Connect to VPN or the corporate network. "
+                "Automatic daily SWU fallback requires a device already running eLxr 3.0+."
+            )
 
     if dryrun and not is_elxr:
         raise click.ClickException("--dryrun is only supported when running update on an ELXR devkit.")
@@ -514,14 +599,16 @@ def show_mla_memory_usage(ctx):
 # ----------------------
 @main.command(name="bootimg")
 @click.option("-v", "--version", required=True, help="Firmware version to download and write (e.g., 1.6.0)")
-@click.option("-b", "--boardtype", type=click.Choice(["modalix",  "mlsoc"], case_sensitive=False), default="mlsoc", show_default=True, help="Target board type.")
-@click.option("-t", "--fwtype", type=click.Choice(["yocto",  "elxr"], case_sensitive=False), default="yocto", show_default=True, help="Target firmware type.")
+@click.option("-b", "--boardtype", type=click.Choice(["modalix",  "mlsoc"], case_sensitive=False), default="modalix", show_default=True, help="Target board type.")
+@click.option("-t", "--fwtype", type=click.Choice(["yocto",  "elxr"], case_sensitive=False), default="elxr", show_default=True, help="Target firmware type.")
 @click.option("-n", "--netboot", is_flag=True, default=False, show_default=True, help="Prepare image for network boot and launch TFTP server.")
-@click.option("--devkit-ip", required=False, help="Optional DevKit IP address for pre-netboot version probing.")
+@click.option("-f", "--force", is_flag=True, help="Allow daily mirror fallback if Artifactory is unavailable (internal Modalix eLxr netboot only).")
+@click.option("--recovery", is_flag=True, help="Write eLxr Modalix recovery media for automatic eMMC recovery.")
+@click.option("--devkit", "--devkit-ip", "devkit_ip", required=False, help="DevKit IP for remote netboot; discover and select a DevKit when omitted.")
 @click.option("-r", "--rootfs", required=False, help="Custom root fs folders (internal use only)")
-@click.option("-a", "--autoflash", is_flag=True, default=False, show_default=True, help="Net boot the DevKit and automatically flash the internal storage - TBD")
+@click.option("-a", "--autoflash", is_flag=True, default=False, show_default=True, help="Network boot the selected DevKit, then automatically flash its internal storage once SSH is ready.")
 @click.pass_context
-def bootimg_cmd(ctx, version, boardtype, netboot, devkit_ip, autoflash, fwtype, rootfs):
+def bootimg_cmd(ctx, version, boardtype, netboot, devkit_ip, autoflash, fwtype, rootfs, recovery=False, force=False):
     """
     Prepare a bootable image for the SiMa DevKit.
 
@@ -530,6 +617,10 @@ def bootimg_cmd(ctx, version, boardtype, netboot, devkit_ip, autoflash, fwtype,
     network boot environment. It supports both MLSoC- and Modalix-based
     DevKits, as well as Yocto and eLxr firmware types.
 
+    Matching internal builds appear in aligned Version and Build time (UTC)
+    columns, newest first. Build time uses the newest Artifactory archive
+    creation timestamp for each version. Unknown timestamps appear last.
+
     Operations Performed:
 
       • Download the correct firmware bundle for the selected version
@@ -555,27 +646,46 @@ def bootimg_cmd(ctx, version, boardtype, netboot, devkit_ip, autoflash, fwtype,
 
         # Write an SD card image for an MLSoC DevKit
 
-        sima-cli bootimg -v 1.6.0 --boardtype mlsoc
+        sima-cli bootimg -v 1.6.0 --boardtype mlsoc --fwtype yocto
 
         # Set up netboot for a Modalix DevKit
 
-        sima-cli bootimg -v 1.6.0 --boardtype modalix --netboot
+        sima-cli bootimg -v 3.0.0 --netboot
+
+        # Select a DevKit for confirmed remote U-Boot setup and reboot
+
+        sima-cli bootimg -v 3.0.0 --netboot --devkit-ip 192.168.1.20
 
-        # Set up netboot and probe an existing DevKit first
+        # Allow daily mirror fallback for internal eLxr 3.0+ netboot
 
-        sima-cli bootimg -v 2.1.0 --boardtype modalix --netboot --devkit-ip 192.168.1.20
+        sima-cli -i bootimg -v 1247 --netboot -f
 
         # Prepare an eLxr netboot image for Modalix
 
-        sima-cli bootimg -v 2.0.0 --boardtype modalix --fwtype elxr --netboot
+        sima-cli bootimg -v 2.0.0 --netboot
+
+        # Prepare USB/SD recovery media that automatically recovers eMMC
+
+        sima-cli bootimg -v 3.0.0 --recovery
 
     """
 
+    if recovery:
+        if netboot or autoflash or rootfs or devkit_ip:
+            raise click.UsageError("--recovery cannot be combined with --netboot, --autoflash, --rootfs, or --devkit-ip.")
+        if ctx.get_parameter_source("boardtype") == click.core.ParameterSource.DEFAULT:
+            boardtype = "modalix"
+        if ctx.get_parameter_source("fwtype") == click.core.ParameterSource.DEFAULT:
+            fwtype = "elxr"
+        if boardtype != "modalix" or fwtype != "elxr":
+            raise click.UsageError("--recovery requires --boardtype modalix and --fwtype elxr.")
+
     from sima_cli.update.bootimg import write_image
     from sima_cli.update.netboot import setup_netboot
-    from sima_cli.update.remote import get_remote_board_info
-
     internal = ctx.obj.get("internal", False)
+    if internal and ctx.meta.get('daily_netboot') and (boardtype != 'modalix' or fwtype != 'elxr'):
+        if not internal_resource_exists() or not ctx.obj.get('internal_reachable', True):
+            raise click.ClickException('Artifactory is unavailable. Daily netboot fallback requires Modalix eLxr.')
 
     click.echo(f"📦 Preparing boot image:")
     click.echo(f"   🔹 Version   : {version}")
@@ -586,23 +696,13 @@ def bootimg_cmd(ctx, version, boardtype, netboot, devkit_ip, autoflash, fwtype,
     click.echo(f"   🔹 DevKit IP : {devkit_ip}")
     
     try:
-        if devkit_ip and (netboot or autoflash):
-            click.echo(f"🔎 Probing DevKit version at {devkit_ip} ...")
-            _, remote_version, _, _, _ = get_remote_board_info(devkit_ip)
-            if not remote_version:
-                raise click.ClickException(
-                    f"Unable to retrieve remote version from DevKit at {devkit_ip}."
-                )
-            click.echo(f"✅ DevKit current version: {remote_version}")
-
         boardtype = boardtype if boardtype != 'mlsoc' else 'davinci'
         if netboot or autoflash:
-            setup_netboot(version, boardtype, internal, autoflash, flavor='headless', rootfs=rootfs, swtype=fwtype)
+            setup_netboot(version, boardtype, internal, autoflash, flavor='headless', rootfs=rootfs, swtype=fwtype, allow_daily_fallback=force, devkit=devkit_ip)
             click.echo("✅ Netboot image prepared and TFTP server is running.")
         else:
-            write_image(version, boardtype, fwtype, internal, flavor='headless')
+            write_image(version, boardtype, fwtype, internal, flavor='headless', recovery=recovery)
             click.echo("✅ Boot image successfully written.")
-        click.echo("✅ Boot image successfully written.")
     except Exception as e:
         click.echo(f"❌ Failed to write boot image: {e}", err=True)
         ctx.exit(1)
@@ -616,6 +716,7 @@ ALL_COMPONENTS = SDK_DEPENDENT_COMPONENTS | SDK_INDEPENDENT_COMPONENTS
 NEAT_INSTALL_REPOSITORIES = {
     "apps",
     "core",
+    "edgematic-studio",
     "insight",
     "internals",
     "llima",

{sima_cli-2.1.16 → sima_cli-2.1.17}/sima_cli/download/downloader.py

@@ -97,6 +97,8 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
             return download_github_asset(url, token=token)
         else:
             session = requests.Session()
+            if parsed_url.hostname == 'artifacts.neat.sima.ai':
+                session.trust_env = False
             request_fn = session.get
             head_fn = session.head            
 

{sima_cli-2.1.16 → sima_cli-2.1.17}/sima_cli/install/metadata_installer.py

@@ -383,22 +383,35 @@ def _resolve_resource_url_candidates(base_url: str, resource: str) -> List[str]:
     return [primary_url, fallback_url]
 
 def _metadata_resource_path(dest_folder: str, resource: str, resource_url: str) -> Path:
+    install_root = Path(dest_folder).resolve()
+    if re.match(r"^[A-Za-z]:[\\/]", resource) or "\\" in resource:
+        raise click.ClickException(f"❌ Resource path must be a safe relative path: '{resource}'.")
+
     parsed_resource = urlparse(resource)
     if parsed_resource.scheme or parsed_resource.netloc:
         file_name = os.path.basename(urlparse(resource_url).path)
+        relative_parts = (file_name,)
     else:
-        file_name = os.path.basename(resource)
+        relative_parts = tuple(resource.split("/"))
+        if resource.startswith("/") or any(part in {"", ".", ".."} for part in relative_parts):
+            raise click.ClickException(f"❌ Resource path must be a safe relative path: '{resource}'.")
+        file_name = relative_parts[-1]
 
     if not file_name:
         raise click.ClickException(f"❌ Cannot determine file name for resource '{resource}'.")
 
-    return Path(dest_folder) / file_name
+    destination = Path(dest_folder).joinpath(*relative_parts)
+    resolved_destination = destination.resolve()
+    if resolved_destination != install_root and install_root not in resolved_destination.parents:
+        raise click.ClickException(f"❌ Resource path escapes the installation directory: '{resource}'.")
+    return destination
 
 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
 
+    expected_path.parent.mkdir(parents=True, exist_ok=True)
     if expected_path.exists():
         expected_path.unlink()
     downloaded_path.rename(expected_path)
@@ -416,7 +429,7 @@ def _download_metadata_file_resource(
         try:
             local_path = download_file_from_url(
                 url=resource_url,
-                dest_folder=dest_folder,
+                dest_folder=str(dest_path.parent),
                 internal=internal
             )
             return _normalize_downloaded_metadata_resource(local_path, dest_path)
@@ -1045,7 +1058,11 @@ def _combine_multipart_files(folder: str, local_paths=None):
         folder_resolved = folder.resolve()
         for p in local_paths:
             path = Path(p).resolve()
-            if path.exists() and path.is_file() and path.parent == folder_resolved:
+            if (
+                path.exists()
+                and path.is_file()
+                and folder_resolved in path.parents
+            ):
                 candidate_files.append(path)
 
     for file in candidate_files:
@@ -1055,12 +1072,12 @@ def _combine_multipart_files(folder: str, local_paths=None):
         match = re.match(r"(.+)-split-([a-z]{2})$", file.name)
         if match:
             base, part = match.groups()
-            parts_by_base.setdefault(base, []).append((part, file))
+            parts_by_base.setdefault((file.parent, base), []).append((part, file))
 
     # Step 2: Process each group
-    for base, parts in parts_by_base.items():
+    for (parent, base), parts in parts_by_base.items():
         parts.sort(key=lambda x: x[0])
-        output_file = folder / f"{base}.tar"
+        output_file = parent / f"{base}.tar"
         total_size = sum(part_file.stat().st_size for _, part_file in parts)
 
         print(f"\n🧩 Reassembling: {output_file.name} from {len(parts)} parts")
@@ -1089,7 +1106,7 @@ def _combine_multipart_files(folder: str, local_paths=None):
         print(f"✅ Created: {output_file.name} ({output_file.stat().st_size / 1e6:.2f} MB)")
 
         # Step 4: Auto-extract .tar
-        extract_dir = folder / base
+        extract_dir = parent / base
         print(f"📦 Extracting {output_file.name} to {extract_dir}/")
         _extract_tar_streaming(output_file, extract_dir)
 
@@ -1106,18 +1123,18 @@ def _extract_archives_in_folder(folder: str, local_paths):
         file = Path(local_path).resolve()
         if not file.exists() or not file.is_file():
             continue
-        if file.parent != folder:
+        if folder not in file.parents:
             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", "")
+            extract_dir = file.parent / file.stem.replace(".tar", "")
             print(f"📦 Extracting TAR/GZ: {file.name} to {extract_dir}/")
             _extract_tar_streaming(file, extract_dir)
 
         # ZIP
         elif file.suffix == ".zip":
-            extract_dir = folder / file.stem
+            extract_dir = file.parent / file.stem
             print(f"📦 Extracting ZIP: {file.name} to {extract_dir}/")
             _extract_zip_streaming(file, extract_dir)
 

sima_cli-2.1.17/sima_cli/models/__init__.py

@@ -0,0 +1,3 @@
+from .commands import register_models_commands
+
+__all__ = ["register_models_commands"]