sima-cli 2.1.12__tar.gz → 2.1.14__tar.gz

{sima_cli-2.1.12/sima_cli.egg-info → sima_cli-2.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 2.1.12
+Version: 2.1.14
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://community.sima.ai/
 Author: SiMa.ai

{sima_cli-2.1.12 → sima_cli-2.1.14}/pyproject.toml

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

{sima_cli-2.1.12 → sima_cli-2.1.14}/sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "2.1.12"
+__version__ = "2.1.14"

{sima_cli-2.1.12 → sima_cli-2.1.14}/sima_cli/install/package_builder.py

@@ -136,7 +136,17 @@ def _format_size(total_bytes: int) -> str:
 
 def _matches_exclude_pattern(resource: str, patterns: Sequence[str]) -> bool:
     filename = Path(resource).name
-    return any(pattern and (pattern in resource or pattern in filename) for pattern in patterns)
+    path_parts = resource.split("/")
+    for pattern in patterns:
+        if not pattern:
+            continue
+        if pattern.startswith(".") and "/" not in pattern and "\\" not in pattern:
+            if filename.endswith(pattern) or pattern in path_parts:
+                return True
+            continue
+        if pattern in resource or pattern in filename:
+            return True
+    return False
 
 
 def collect_artifact_resources(

{sima_cli-2.1.12 → sima_cli-2.1.14}/sima_cli/sdk/cmdexec.py

@@ -18,10 +18,15 @@ from sima_cli.sdk.utils import (
 
 console = Console()
 
+
+class SdkContainerUnavailable(RuntimeError):
+    """Raised when no running SDK container matches a requested tool."""
+
+
 # ─────────────────────────────────────────────
 # Core executer
 # ─────────────────────────────────────────────
-def exec_container_cmd(ctx, keyword: str, cmd: Optional[str] = None):
+def exec_container_cmd(ctx, keyword: str, cmd: Optional[str] = None, raise_on_missing: bool = False):
     """
     Find a running container matching the given SDK keyword (e.g. mpk, yocto),
     optionally filtering by version (from ctx.obj['version_filter']),
@@ -34,6 +39,8 @@ def exec_container_cmd(ctx, keyword: str, cmd: Optional[str] = None):
     containers = get_all_containers(running_containers_only=True)
     if not containers:
         console.print("[yellow]⚠️  No running containers found.[/yellow]")
+        if raise_on_missing:
+            raise SdkContainerUnavailable("No running containers found.")
         sys.exit(0)
 
     # ──────────────────────────────────────────────
@@ -61,11 +68,16 @@ def exec_container_cmd(ctx, keyword: str, cmd: Optional[str] = None):
         )
 
     if not matches:
-        console.print(
-            f"[red]❌ No running containers found for '{keyword}'"
+        message = (
+            f"No running containers found for '{keyword}'"
             + (f" with version '{version_filter}'" if version_filter else "")
-            + ".[/red]"
+            + "."
+        )
+        console.print(
+            f"[red]❌ {message}[/red]"
         )
+        if raise_on_missing:
+            raise SdkContainerUnavailable(message)
         sys.exit(1)
 
     # ──────────────────────────────────────────────

{sima_cli-2.1.12 → sima_cli-2.1.14}/sima_cli/sdk/commands.py

@@ -24,10 +24,10 @@ from typing import Optional
 from rich.console import Console
 from rich.panel import Panel
 from sima_cli.sdk.install import setup_and_start
-from sima_cli.sdk.cmdexec import exec_container_cmd
+from sima_cli.sdk.cmdexec import SdkContainerUnavailable, exec_container_cmd
 from sima_cli.sdk.uninstall import remove_containers, remove_unused_images
 from sima_cli.sdk.stop import stop_containers
-from sima_cli.sdk.utils import get_all_containers
+from sima_cli.sdk.utils import get_all_containers, container_matches_sdk_keyword
 from sima_cli.sdk.utils import extract_short_name
 from sima_cli.discover.discover import discover_and_probe
 from rich.table import Table
@@ -38,6 +38,7 @@ from sima_cli.sdk.config import IMAGE_CONFIG
 from sima_cli.sdk.network_doctor import (
     build_network_doctor_report,
     collect_network_doctor_bundle,
+    ensure_existing_neat_container_startable,
     print_network_doctor_report,
     repair_linux_devkit_network,
 )
@@ -156,7 +157,66 @@ def _resolve_devkit_ipv4(devkit: Optional[str]) -> str:
     return value
 
 
-def launch_sdk_tool(tool: str, cmd, ctx):
+def _container_name(container) -> str:
+    return container.get("Names") or container.get("Name") or container.get("name") or ""
+
+
+def _container_is_running(container) -> bool:
+    state = (container.get("State") or "").lower().strip()
+    status = (container.get("Status") or "").lower().strip()
+    return state == "running" or status.startswith("up") or "running" in status
+
+
+def _version_matches(container, version_filter: str) -> bool:
+    if not version_filter:
+        return True
+    needle = version_filter.lower()
+    name = _container_name(container).lower()
+    image = (container.get("Image") or container.get("image") or "").lower()
+    return needle in name or needle in image
+
+
+def _start_stopped_neat_containers(ctx) -> None:
+    version_filter = None
+    if ctx and getattr(ctx, "obj", None):
+        version_filter = ctx.obj.get("version_filter")
+
+    containers = get_all_containers(running_containers_only=False)
+    matches = [
+        container
+        for container in containers
+        if container_matches_sdk_keyword(container, "neat")
+        and _version_matches(container, version_filter)
+        and not _container_is_running(container)
+    ]
+
+    if not matches:
+        message = "No stopped Neat SDK containers found."
+        if version_filter:
+            message = f"No stopped Neat SDK containers found for version '{version_filter}'."
+        raise click.ClickException(f"{message} Run: sima-cli sdk setup")
+
+    for container in matches:
+        name = _container_name(container)
+        if not name:
+            continue
+        try:
+            ensure_existing_neat_container_startable(name)
+            console.print(
+                f"[cyan]▶ Starting existing Neat SDK container:[/cyan] [bold]{name}[/bold] "
+                "[dim](this may take a moment)[/dim]"
+            )
+            subprocess.run(["docker", "start", name], check=True, capture_output=True, text=True)
+        except subprocess.CalledProcessError as e:
+            raise click.ClickException(
+                f"Failed to start Neat SDK container '{name}' while running: {' '.join(e.cmd)}"
+            ) from e
+        except RuntimeError as e:
+            raise click.ClickException(str(e)) from e
+        console.print(f"[green]✅ Started Neat SDK container:[/green] [bold]{name}[/bold]")
+
+
+def launch_sdk_tool(tool: str, cmd, ctx, recover_unavailable: bool = False):
     """
     Launch a selected SDK tool container, optionally executing a command inside it.
     If no command is provided, defaults to an interactive bash login shell.
@@ -182,7 +242,17 @@ def launch_sdk_tool(tool: str, cmd, ctx):
     else:
         cmd_str = str(cmd)
 
-    exec_container_cmd(ctx, tool, cmd_str)
+    if not recover_unavailable:
+        exec_container_cmd(ctx, tool, cmd_str)
+        return
+
+    try:
+        exec_container_cmd(ctx, tool, cmd_str, raise_on_missing=True)
+    except SdkContainerUnavailable:
+        if tool != "neat":
+            raise
+        _start_stopped_neat_containers(ctx)
+        exec_container_cmd(ctx, tool, cmd_str)
 
 
 # ------------------------------------------------------------
@@ -554,13 +624,16 @@ def neat(ctx, cmd):
     running container with bash -lc. If CMD is omitted, sima-cli opens an
     interactive login shell.
 
+    If no matching Neat SDK container is running, existing stopped Neat SDK
+    container(s) are started automatically and the command is retried.
+
     \b
     Examples:
         sima-cli sdk neat
         sima-cli sdk neat python --version
         sima-cli sdk neat "python app.py --config config.json"
     """
-    launch_sdk_tool("neat", cmd, ctx)
+    launch_sdk_tool("neat", cmd, ctx, recover_unavailable=True)
 
 
 @sdk.command(

{sima_cli-2.1.12 → sima_cli-2.1.14}/sima_cli/sdk/install.py

@@ -765,6 +765,22 @@ def _format_gb(byte_count: int) -> str:
     return f"{byte_count / (1024 ** 3):.1f} GB"
 
 
+def _ensure_writable_sdk_extensions_dir(path: Path) -> Path:
+    resolved = Path(os.path.realpath(str(path)))
+    try:
+        resolved.mkdir(parents=True, exist_ok=True)
+        probe = resolved / ".sima-cli-write-test"
+        with open(probe, "w", encoding="utf-8") as handle:
+            handle.write("ok\n")
+        probe.unlink()
+    except OSError as e:
+        raise RuntimeError(
+            f"SDK extensions directory is not writable: {resolved}. "
+            "Choose another directory where your user can create files."
+        ) from e
+    return resolved
+
+
 def _setup_sdk_extensions(
     selected_images: List[str],
     noninteractive: bool = False,
@@ -791,12 +807,16 @@ def _setup_sdk_extensions(
     if noninteractive or yes_to_all:
         extensions_dir = default_extensions_dir
         click.echo(f"ℹ️  Using default SDK extensions directory: {extensions_dir}")
+        extensions_dir = _ensure_writable_sdk_extensions_dir(extensions_dir)
     else:
-        response = input(f"Enter SDK extensions directory [{default_extensions_dir}]: ").strip()
-        extensions_dir = Path(response).expanduser() if response else default_extensions_dir
-
-    extensions_dir = Path(os.path.realpath(str(extensions_dir)))
-    extensions_dir.mkdir(parents=True, exist_ok=True)
+        while True:
+            response = input(f"Enter SDK extensions directory [{default_extensions_dir}]: ").strip()
+            extensions_dir = Path(response).expanduser() if response else default_extensions_dir
+            try:
+                extensions_dir = _ensure_writable_sdk_extensions_dir(extensions_dir)
+                break
+            except RuntimeError as e:
+                click.secho(f"⚠️  {e}", fg="yellow")
     print(f"✅ SDK extensions directory configured: {extensions_dir}")
     return str(extensions_dir)
 
@@ -1148,6 +1168,16 @@ def setup_and_start(
                 configure_container_user(existing_container, login_name, user_uid, user_gid)
 
             if devkit_env and is_neat_sdk_image(img):
+                if not skip_insight:
+                    # Re-issue the mounted HTTPS cert for the (possibly new) host
+                    # IP before bootstrap restarts neat-insight, so the browser
+                    # doesn't hit a SAN mismatch ("connection is not private")
+                    # after a re-point.
+                    from sima_cli.sdk.neat import refresh_neat_certificates
+                    refresh_neat_certificates(
+                        workspace, existing_container, devkit_env,
+                        yes_to_all=yes_to_all, noninteractive=noninteractive,
+                    )
                 bootstrap_devkit_container(existing_container, devkit_env)
 
             if len(selected_images) == 1: