sima-cli 0.0.35__py3-none-any.whl → 0.0.36__py3-none-any.whl

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.35"
+__version__ = "0.0.36"

sima_cli/auth/basic_auth.py

@@ -121,7 +121,6 @@ def login_external():
         session.headers["X-CSRF-Token"] = csrf_token
 
         if _is_session_valid(session):
-            click.echo("🚀 You are already logged in.")
             return session
 
         # Fresh login prompt

sima_cli/cli.py

@@ -313,9 +313,7 @@ def install_cmd(ctx, component, version, mirror, tag):
         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}")
-        if install_from_metadata(metadata_url=mirror, internal=internal):
-            click.echo("✅ Installation complete.")
-        return
+        return install_from_metadata(metadata_url=mirror, internal=internal)
 
     # No component and no metadata: error
     if not component:
@@ -324,6 +322,10 @@ def install_cmd(ctx, component, version, mirror, tag):
 
     component = component.lower()
 
+    # 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)
+
     # Validate version requirement
     if component in SDK_DEPENDENT_COMPONENTS and not version:
         click.echo(f"❌ The component '{component}' requires a specific SDK version. Please provide one using -v.")

sima_cli/download/downloader.py

@@ -135,6 +135,38 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
 
     return dest_path
 
+def check_url_available(url: str, internal: bool = False) -> bool:
+    """
+    Perform a HEAD request to check if a resource is available.
+
+    Args:
+        url (str): The full URL to check.
+        internal (bool): Whether this is an internal resource on Artifactory.
+
+    Returns:
+        bool: True if the resource is available (status 200–399), False otherwise.
+    """
+    headers = {}
+    try:
+        if internal:
+            auth_token = get_auth_token(internal=True)
+            if auth_token:
+                headers["Authorization"] = f"Bearer {auth_token}"
+            head_fn = requests.head
+        elif 'https://docs.sima.ai' in url:
+            session = login_external()
+            head_fn = session.head
+        else:
+            session = requests.Session()
+            head_fn = session.head
+
+        resp = head_fn(url, headers=headers, timeout=10, allow_redirects=True)
+        # Consider any 2xx or 3xx as "available"
+        return 200 <= resp.status_code < 400
+
+    except Exception as e:
+        print(f"⚠️ HEAD check failed for {url}: {e}")
+        return False
 
 def download_folder_from_url(url: str, dest_folder: str = ".", internal: bool = False) -> List[str]:
     """

sima_cli/install/metadata_installer.py

@@ -15,6 +15,7 @@ from tqdm import tqdm
 from urllib.parse import urljoin
 from pathlib import Path
 import subprocess
+import requests
 
 from rich.console import Console
 from rich.panel import Panel
@@ -29,6 +30,153 @@ from sima_cli.install.metadata_info import print_metadata_summary, parse_size_st
 
 console = Console()
 
+def _copy_dir(src: Path, dest: Path, label: str):
+    """
+    Copy files from src → dest, merging with existing files (no deletion).
+    Ensures that all parent directories for dest are created.
+    """
+    if not src.exists():
+        raise FileNotFoundError(f"SDK {label} not found: {src}")
+
+    # Ensure full path exists
+    dest.mkdir(parents=True, exist_ok=True)
+
+    # Copy tree correctly
+    for item in src.iterdir():
+        target = dest / item.name
+        if item.is_dir():
+            shutil.copytree(item, target, dirs_exist_ok=True)
+        else:
+            shutil.copy2(item, target)
+
+    click.echo(f"✅ Copied {label} into {dest}")
+
+def _prepare_pipeline_project(repo_dir: Path):
+    """
+    Prepare a pipeline project by copying required SDK sources into the repo.
+
+    Steps:
+      1. Copy core sources into the project folder
+      2. Parse .project/pluginsInfo
+      3. Copy required plugin sources from the SDK plugin zoo
+    """
+    plugins_info_file = repo_dir / ".project" / "pluginsInfo.json"
+    if not plugins_info_file.exists():
+        return 
+
+    click.echo("📦 Preparing pipeline project...")
+
+    try:
+        data = json.loads(plugins_info_file.read_text())
+        plugins = data.get("pluginsInfo", [])
+    except Exception as e:
+        raise RuntimeError(f"Failed to read {plugins_info_file}: {e}")
+
+    # Step a: copy core
+    # Define what to copy
+    copy_map = [
+        (
+            Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/core"),
+            repo_dir / "core",
+            "core"
+        ),
+        (
+            Path("/usr/local/simaai/utils/gst_app"),
+            repo_dir / "dependencies" / "gst_app",
+            "dependencies/gst_app"
+        ),
+        (
+            Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/gst/templates"),
+            repo_dir / "plugins" / "templates",
+            "plugins/templates"
+        ),
+    ]
+
+    # Execute
+    for src, dest, label in copy_map:
+        _copy_dir(src, dest, label)
+
+    # Step b/c: scan plugin paths and copy SDK plugins
+    sdk_plugins_base = Path("/usr/local/simaai/plugin_zoo/gst-simaai-plugins-base/gst")
+    dest_plugins_dir = repo_dir / "plugins"
+    dest_plugins_dir.mkdir(exist_ok=True)
+
+    for plugin in plugins:
+        try:
+            path = plugin.get("path", "")
+            if not path:
+                continue
+            parts = path.split("/")
+            if len(parts) < 2:
+                continue
+
+            plugin_name = parts[1]
+            sdk_plugin_path = sdk_plugins_base / plugin_name
+            if not sdk_plugin_path.exists():
+                click.echo(
+                    f"⚠️  Missing plugin source: {plugin_name} in the SDK, skipping. "
+                    "It's possible that this is a custom plugin already exists in the repo"
+                )
+                continue
+
+            dest_plugin_path = dest_plugins_dir / plugin_name
+            dest_plugin_path.mkdir(parents=True, exist_ok=True)
+
+            # Merge instead of deleting
+            shutil.copytree(sdk_plugin_path, dest_plugin_path, dirs_exist_ok=True)
+
+            click.echo(f"✅ Copied plugin {plugin_name} into {dest_plugin_path}")
+
+        except Exception as e:
+            click.echo(f"❌ Error copying plugin {plugin}: {e}")
+
+    click.echo("🎉 Pipeline project prepared.")
+
+def _download_github_repo(owner: str, repo: str, ref: str, dest_folder: str, token: str = None) -> str:
+    """
+    Download and extract a GitHub repo tarball via the REST API (no git required).
+
+    Args:
+        owner (str): GitHub org/user
+        repo (str): Repo name
+        ref (str): Branch, tag, or commit (default = default branch)
+        dest_folder (str): Where to extract
+        token (str): Optional GitHub token for private repos
+
+    Returns:
+        str: Path to the extracted repo
+    """
+    url = f"https://api.github.com/repos/{owner}/{repo}/tarball/{ref}" if ref else f"https://api.github.com/repos/{owner}/{repo}/tarball"
+    headers = {}
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+
+    click.echo(f"🐙 Downloading GitHub repo: {owner}/{repo}" + (f"@{ref}" if ref else ""))
+
+    with requests.get(url, headers=headers, stream=True) as r:
+        if r.status_code in (401, 403):
+            raise PermissionError("Authentication required for GitHub repo")
+        r.raise_for_status()
+
+        with tempfile.NamedTemporaryFile(delete=False, suffix=".tar.gz") as tmp_file:
+            for chunk in r.iter_content(chunk_size=8192):
+                tmp_file.write(chunk)
+            tmp_path = Path(tmp_file.name)
+
+    repo_dir = Path(dest_folder) / repo
+    repo_dir.mkdir(parents=True, exist_ok=True)
+
+    _extract_tar_strip_top_level(tmp_path, repo_dir)
+    tmp_path.unlink(missing_ok=True)
+    click.echo(f"✅ Downloaded GitHub repo to folder: {repo_dir}")
+
+    try:
+        _prepare_pipeline_project(repo_dir)
+    except Exception as e:
+        click.echo(f"⚠️  Pipeline preparation skipped: {e}")
+
+    return str(repo_dir)
+
 def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal: bool = False, skip_models: bool = False) -> list:
     """
     Downloads resources defined in metadata to a local destination folder.
@@ -84,11 +232,34 @@ def _download_assets(metadata: dict, base_url: str, dest_folder: str, internal:
                 model_path = snapshot_download(
                     repo_id=repo_id,
                     local_dir=target_dir,
-                    revision=revision  # None if not specified
+                    local_dir_use_symlinks=False
                 )
                 local_paths.append(model_path)
                 continue
 
+            if resource.startswith("gh:"):
+                resource_spec = resource[3:]
+                if "@" in resource_spec:
+                    repo_id, ref = resource_spec.split("@", 1)
+                else:
+                    repo_id, ref = resource_spec, None
+
+                if "/" not in repo_id:
+                    raise click.ClickException(f"❌ Invalid GitHub repo spec: {resource}")
+
+                owner, name = repo_id.split("/", 1)
+
+                try:
+                    token = os.getenv("GITHUB_TOKEN", None)
+                    repo_path = _download_github_repo(owner, name, ref, dest_folder, token)
+                except Exception as e:
+                    raise click.ClickException(
+                        f"❌ Failed to download GitHub repo {owner}/{name}@{ref or 'default'}: {e}"
+                    )
+
+                local_paths.append(repo_path)
+                continue
+
             # Handle normal relative or absolute URLs
             resource_url = urljoin(base_url, resource)
             local_path = download_file_from_url(
@@ -296,6 +467,25 @@ def _extract_zip_streaming(zip_path: Path, extract_dir: Path, overwrite: bool =
 
     print(f"✅ Extracted {len(members)} entries to {extract_dir}/")
 
+def _extract_tar_strip_top_level(tar_path: Path, extract_dir: Path):
+    """Extract a GitHub tarball, stripping the top-level folder."""
+    with tarfile.open(tar_path, "r:*") as tar:
+        members = tar.getmembers()
+
+        # Detect top-level prefix (first part before '/')
+        top_level = None
+        if members:
+            first_name = members[0].name
+            top_level = first_name.split("/", 1)[0]
+
+        for member in members:
+            # Strip top-level folder
+            if top_level and member.name.startswith(top_level + "/"):
+                member.name = member.name[len(top_level) + 1 :]
+            if not member.name:
+                continue
+            tar.extract(member, path=extract_dir)
+
 def _combine_multipart_files(folder: str):
     """
     Scan a folder for multipart files like name-split-aa, -ab, etc.,
@@ -353,20 +543,27 @@ def _combine_multipart_files(folder: str):
 
         print(f"✅ Extracted to: {extract_dir}/")
 
-def _extract_archives_in_folder(folder: str):
+def _extract_archives_in_folder(folder: str, local_paths):
     """
-    Extract all .tar.gz and .zip files in the given folder into subdirectories.
+    Extract .tar, .gz, .tar.gz, and .zip files in the given folder,
+    but only if they are listed in local_paths.
     Uses streaming to avoid NFS performance issues.
     """
     folder = Path(folder)
+    local_paths = {str(Path(p).resolve()) for p in local_paths}
+
     for file in folder.iterdir():
         if not file.is_file():
             continue
 
-        # TAR.GZ
-        if file.suffixes == [".tar", ".gz"] or file.name.endswith(".tar.gz"):
+        file_resolved = str(file.resolve())
+        if file_resolved not in local_paths:
+            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", "")
-            print(f"📦 Extracting TAR.GZ: {file.name} to {extract_dir}/")
+            print(f"📦 Extracting TAR/GZ: {file.name} to {extract_dir}/")
             _extract_tar_streaming(file, extract_dir)
 
         # ZIP
@@ -471,8 +668,45 @@ def _run_installation_script(metadata: Dict, extract_path: str = "."):
 
     print("✅ Installation completed successfully.")
 
+def _resolve_github_metadata_url(gh_ref: str) -> str:
+    """
+    Resolve a GitHub shorthand like gh:org/repo@tag into a raw URL for metadata.json.
+    If tag is omitted, defaults to 'main'.
+    """
+    try:
+        _, repo_ref = gh_ref.split(":", 1)  # remove 'gh:'
+        if "@" in repo_ref:
+            org_repo, tag = repo_ref.split("@", 1)
+        else:
+            org_repo, tag = repo_ref, "main"
+
+        owner, repo = org_repo.split("/", 1)
+        token = os.getenv("GITHUB_TOKEN")
+
+        # Use GitHub API to fetch the metadata.json file
+        api_url = f"https://api.github.com/repos/{owner}/{repo}/contents/metadata.json?ref={tag}"
+        headers = {"Accept": "application/vnd.github.v3.raw"}
+        if token:
+            headers["Authorization"] = f"token {token}"
+
+        r = requests.get(api_url, headers=headers)
+        r.raise_for_status()
+        
+        # Write metadata.json locally so downstream logic can use a file/URL
+        local_path = os.path.join("/tmp", f"{repo}-{tag}-metadata.json")
+        with open(local_path, "wb") as f:
+            f.write(r.content)
+
+        return local_path
+    except Exception as e:
+        raise RuntimeError(f"Failed to resolve GitHub metadata URL {gh_ref}: {e}")
+
 def install_from_metadata(metadata_url: str, internal: bool, install_dir: str = '.'):
     try:
+        if metadata_url.startswith("gh:"):
+            metadata_url = _resolve_github_metadata_url(metadata_url)
+            internal = False
+
         metadata, _ = _download_and_validate_metadata(metadata_url, internal)
         print_metadata_summary(metadata=metadata)
 
@@ -481,7 +715,7 @@ def install_from_metadata(metadata_url: str, internal: bool, install_dir: str =
                 local_paths = _download_assets(metadata, metadata_url, install_dir, internal)
                 if len(local_paths) > 0:
                     _combine_multipart_files(install_dir)
-                    _extract_archives_in_folder(install_dir)
+                    _extract_archives_in_folder(install_dir, local_paths)
                     _run_installation_script(metadata=metadata, extract_path=install_dir)
 
     except Exception as e:

{sima_cli-0.0.35.dist-info → sima_cli-0.0.36.dist-info}/METADATA

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

@@ -1,20 +1,20 @@
 sima_cli/__init__.py,sha256=Nb2jSg9-CX1XvSc1c21U9qQ3atINxphuNkNfmR-9P3o,332
 sima_cli/__main__.py,sha256=ehzD6AZ7zGytC2gLSvaJatxeD0jJdaEvNJvwYeGsWOg,69
-sima_cli/__version__.py,sha256=dV_wUomyW1FHtFgcX6fG1NT7ViHhyASu0XFi6X2mgRA,49
-sima_cli/cli.py,sha256=qnAQtlaM87tM8t9663NTIxxqMWIpU5--4V-v_0-gYZQ,17224
+sima_cli/__version__.py,sha256=Bbhf5gpY7WnVH4M-cc4ByQEC0_SMh5CebOd37T5sqCA,49
+sima_cli/cli.py,sha256=qm8rtydcugVdd37Rd79weMdX78Y7SKWaUe4LGfX-1XY,17339
 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/basic_auth.py,sha256=ht_mVXBtxV2UGvUYwvhkPHs4cMWL5Hw2B_OFxWdKw6c,8825
+sima_cli/auth/basic_auth.py,sha256=UMEXCCnNQpjpp6RZxREs6iiKtYyaeqZBnTSR0wA8s6Q,8767
 sima_cli/auth/login.py,sha256=nE-dSHK_husXw1XJaEcOe3I1_bnwHkLgO_BqKuQODDM,3781
 sima_cli/data/resources_internal.yaml,sha256=zlQD4cSnZK86bLtTWuvEudZTARKiuIKmB--Jv4ajL8o,200
 sima_cli/data/resources_public.yaml,sha256=U7hmUomGeQ2ULdo1BU2OQHr0PyKBamIdK9qrutDlX8o,201
 sima_cli/download/__init__.py,sha256=6y4O2FOCYFR2jdnQoVi3hRtEoZ0Gw6rydlTy1SGJ5FE,218
-sima_cli/download/downloader.py,sha256=nCBrr_0WdnKTIyecwKpg1sCdfm_4PSQTRPwEbiezy8M,5339
+sima_cli/download/downloader.py,sha256=UQdrBWLQsPQygaoVaufOjbzWmRoNnk6pgLdnbnVi04U,6436
 sima_cli/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sima_cli/install/hostdriver.py,sha256=kAWDLebs60mbWIyTbUxmNrChcKW1uD5r7FtWNSUVUE4,5852
 sima_cli/install/metadata_info.py,sha256=wmMqwzGfXbuilkqaxRVrFOzOtTOiONkmPCyA2oDAQpA,2168
-sima_cli/install/metadata_installer.py,sha256=kWhERFYfv3hkfAkFJ5yIMu0vv4Kkav8w1DPOOQEysmc,19098
+sima_cli/install/metadata_installer.py,sha256=zIxs9nSX7EC1d6qxL2woZiMSQfFfIOzB2natyTvIPDI,27428
 sima_cli/install/metadata_validator.py,sha256=7954rp9vFRNnqmIMvCVTjq40kUIEbGXzfc8HmQmChe0,5221
 sima_cli/install/optiview.py,sha256=r4DYdQDTUbZVCR87hl5T21gsjZrhqpU8hWnYxKmUJ_k,4790
 sima_cli/install/palette.py,sha256=uRznoHa4Mv9ZXHp6AoqknfC3RxpYNKi9Ins756Cyifk,3930
@@ -46,7 +46,7 @@ sima_cli/utils/env.py,sha256=LtV8S1kCkOpi-7Gj4rhidQRN13x_NDKy4W_LxujheeI,8400
 sima_cli/utils/net.py,sha256=WVntA4CqipkNrrkA4tBVRadJft_pMcGYh4Re5xk3rqo,971
 sima_cli/utils/network.py,sha256=UvqxbqbWUczGFyO-t1SybG7Q-x9kjUVRNIn_D6APzy8,1252
 sima_cli/utils/pkg_update_check.py,sha256=IAV_NAOsBDL_lYNYMRYfdZWuVq-rJ_zzHjJJZ7UQaoc,3274
-sima_cli-0.0.35.dist-info/licenses/LICENSE,sha256=a260OFuV4SsMZ6sQCkoYbtws_4o2deFtbnT9kg7Rfd4,1082
+sima_cli-0.0.36.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
@@ -55,8 +55,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.35.dist-info/METADATA,sha256=wT-QS9rbFlezkg5M_CmGhmMmHhxZ4XqPVovYiLJLSRw,3705
-sima_cli-0.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sima_cli-0.0.35.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
-sima_cli-0.0.35.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
-sima_cli-0.0.35.dist-info/RECORD,,
+sima_cli-0.0.36.dist-info/METADATA,sha256=nRB0ysTR2pmyDNlBC6Tx7gk1VPJ6o83ZulKr99RLJTo,3705
+sima_cli-0.0.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sima_cli-0.0.36.dist-info/entry_points.txt,sha256=xRYrDq1nCs6R8wEdB3c1kKuimxEjWJkHuCzArQPT0Xk,47
+sima_cli-0.0.36.dist-info/top_level.txt,sha256=FtrbAUdHNohtEPteOblArxQNwoX9_t8qJQd59fagDlc,15
+sima_cli-0.0.36.dist-info/RECORD,,