sima-cli 0.0.21__py3-none-any.whl → 0.0.23__py3-none-any.whl

sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "0.0.21"
+__version__ = "0.0.23"

sima_cli/cli.py

@@ -9,8 +9,10 @@ from sima_cli.__version__ import __version__
 from sima_cli.utils.config import CONFIG_PATH
 from sima_cli.install.optiview import install_optiview
 from sima_cli.install.hostdriver import install_hostdriver
+from sima_cli.install.metadata_installer import install_from_metadata, metadata_resolver
 from sima_cli.serial.serial import connect_serial
-from sima_cli.nvme.nvme import nvme_format, nvme_remount
+from sima_cli.storage.nvme import nvme_format, nvme_remount
+from sima_cli.storage.sdcard import sdcard_format
 from sima_cli.network.network import network_menu
 
 # Entry point for the CLI tool using Click's command group decorator
@@ -118,6 +120,7 @@ def download(ctx, url, dest):
         click.echo(f"\n✅ File downloaded successfully to: {path}")
         return
     except Exception as e:
+        click.echo(f"❌ Failed to download as file {e}")
         pass
 
     # If that fails, try to treat as a folder and download all files
@@ -230,10 +233,11 @@ 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("-n", "--netboot", is_flag=True, default=False, show_default=True, help="Prepare image for network boot and launch TFTP server.")
 @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.pass_context
-def bootimg_cmd(ctx, version, boardtype, netboot, autoflash):
+def bootimg_cmd(ctx, version, boardtype, netboot, autoflash, fwtype):
     """
     Download and burn a removable media or setup TFTP boot.
 
@@ -255,6 +259,7 @@ def bootimg_cmd(ctx, version, boardtype, netboot, autoflash):
     click.echo(f"📦 Preparing boot image:")
     click.echo(f"   🔹 Version   : {version}")
     click.echo(f"   🔹 Board Type: {boardtype}")
+    click.echo(f"   🔹 F/W Type  : {fwtype}")
     click.echo(f"   🔹 F/W Flavor: headless")
     
     try:
@@ -263,7 +268,7 @@ def bootimg_cmd(ctx, version, boardtype, netboot, autoflash):
             setup_netboot(version, boardtype, internal, autoflash, flavor='headless')
             click.echo("✅ Netboot image prepared and TFTP server is running.")
         else:
-            write_image(version, boardtype, 'yocto', internal, flavor='headless')
+            write_image(version, boardtype, fwtype, internal, flavor='headless')
             click.echo("✅ Boot image successfully written.")
         click.echo("✅ Boot image successfully written.")
     except Exception as e:
@@ -278,22 +283,44 @@ SDK_INDEPENDENT_COMPONENTS = {"optiview"}
 ALL_COMPONENTS = SDK_DEPENDENT_COMPONENTS | SDK_INDEPENDENT_COMPONENTS
 
 @main.command(name="install")
-@click.argument("component", type=click.Choice(ALL_COMPONENTS, case_sensitive=False))
-@click.option("-v", "--version", help="SDK version (required for SDK-dependent 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.pass_context
-def install_cmd(ctx, component, version):
+def install_cmd(ctx, component, version, mirror, tag):
     """
-    Install supported components such as SDKs or tools.
+    Install supported components such as SDKs, tools, or generic packages via metadata.
 
     Examples:
 
         sima-cli install hostdriver -v 1.6.0
 
         sima-cli install optiview
+
+        sima-cli install -m https://example.com/packages/foo/metadata.json
+
+        sima-cli install examples.llima -v 1.7.0
     """
-    component = component.lower()
     internal = ctx.obj.get("internal", False)
 
+    # 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}")
+        if install_from_metadata(metadata_url=mirror, internal=internal):
+            click.echo("✅ Installation complete.")
+        return
+
+    # No component and no metadata: error
+    if not component:
+        click.echo("❌ You must specify either a component name or provide --metadata.")
+        ctx.exit(1)
+
+    component = component.lower()
+
+    # 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.")
         ctx.exit(1)
@@ -301,7 +328,7 @@ def install_cmd(ctx, component, version):
     if component in SDK_INDEPENDENT_COMPONENTS and version:
         click.echo(f"ℹ️ The component '{component}' does not require an SDK version. Ignoring -v {version}.")
 
-    # Perform the installation logic
+    # Hardcoded component installation
     if component == "palette":
         click.echo(f"🔧 Installing SDK component 'palette' for version {version} is not implemented yet...")
     elif component == "hostdriver":
@@ -310,9 +337,20 @@ def install_cmd(ctx, component, version):
     elif component == "optiview":
         click.echo("🔧 Installing tool 'optiview'...")
         install_optiview()
+    else:
+        # Case 4: Try to resolve metadata URL from version + tag
+        try:
+            metadata_url = metadata_resolver(component, version, tag)
+            click.echo(f"🔧 Installing '{component}' from resolved metadata: {metadata_url}")
+            if install_from_metadata(metadata_url=metadata_url, internal=internal):
+                click.echo("✅ Installation complete.")
+        except Exception as e:
+            click.echo(f"❌ Failed to resolve metadata for component '{component}': {e}")
+            ctx.exit(1)
 
     click.echo("✅ Installation complete.")
 
+
 # ----------------------
 # Serial Subcommands
 # ----------------------
@@ -377,14 +415,39 @@ def nvme_cmd(ctx, operation):
     elif operation == "remount":
         try:
             nvme_remount()
-            click.echo("✅ NVMe drive successfully remounted at /mnt/nvme.")
         except Exception as e:
             click.echo(f"❌ Failed to remount NVMe drive: {e}")
+            ctx.exit(1)
 
     else:
         click.echo(f"❌ Unsupported NVMe operation: {operation}")
         ctx.exit(1)
 
+# ----------------------
+# NVME Subcommands
+# ----------------------
+NVME_OPERATIONS = {"format"}
+@main.command(name="sdcard")
+@click.argument("operation", type=click.Choice(NVME_OPERATIONS, case_sensitive=False))
+@click.pass_context
+def sdcard_cmd(ctx, operation):
+    """
+    Prepare the SD Card as a data storage device for MLSoc DevKit or Modalix Early Access Unit
+
+    Available operations:
+
+      format   - Format the SD Card
+
+    Example:
+      sima-cli sdcard format
+    """
+    operation = operation.lower()
+
+    if operation == "format":
+        sdcard_format()
+
+
+
 # ----------------------
 # App Zoo Subcommands
 # ----------------------

sima_cli/download/downloader.py

@@ -80,10 +80,14 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
                 headers["Authorization"] = f"Bearer {auth_token}"
             request_fn = requests.get
             head_fn = requests.head
-        else:
+        elif 'https://docs.sima.ai' in url:
             session = login_external()
             request_fn = session.get
             head_fn = session.head
+        else:
+            session = requests.Session()
+            request_fn = session.get
+            head_fn = session.head            
 
         # HEAD request to get total file size
         head = head_fn(url, headers=headers, timeout=10)
@@ -95,7 +99,7 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
             existing_size = os.path.getsize(dest_path)
 
             if existing_size == total_size:
-                print(f"✔ File already exists and is complete: {file_name}")
+                print(f"✔  File already exists and is complete: {file_name}")
                 return dest_path
             elif existing_size < total_size:
                 resume_header['Range'] = f'bytes={existing_size}-'
@@ -113,7 +117,7 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
             final_total = existing_size + content_length
 
             with open(dest_path, mode) as f, tqdm(
-                desc=f"Downloading {file_name}",
+                desc=f"⬇️  Downloading {file_name}",
                 total=final_total,
                 initial=existing_size,
                 unit='B',

sima_cli/install/metadata_info.py

@@ -0,0 +1,57 @@
+from rich import print
+from rich.table import Table
+from rich.panel import Panel
+
+def print_metadata_summary(metadata: dict):
+    table = Table(show_header=False, box=None, padding=(0, 1))
+
+    table.add_row("[bold]Name[/bold]", metadata.get("name", "N/A"))
+    table.add_row("[bold]Version[/bold]", metadata.get("version", "N/A"))
+    table.add_row("[bold]Release[/bold]", metadata.get("release", "N/A"))
+    table.add_row("[bold]Description[/bold]", metadata.get("description", "N/A"))
+
+    # Platform info
+    platform_info = []
+    for p in metadata.get("platforms", []):
+        platform_type = p.get("type", "unknown")
+        if platform_type == "board":
+            compat = ", ".join(p.get("compatible_with", []))
+            platform_info.append(f"{platform_type} ({compat})")
+        elif platform_type in ("host", "generic"):
+            os_list = ", ".join(p.get("os", []))
+            platform_info.append(f"{platform_type} ({os_list})")
+        else:
+            platform_info.append(platform_type)
+
+    table.add_row("[bold]Platforms[/bold]", "; ".join(platform_info) or "N/A")
+
+    # Resources
+    resource_count = len(metadata.get("resources", []))
+    table.add_row("[bold]Resources[/bold]", f"{resource_count} file(s)")
+
+    # Size
+    size = metadata.get("size", {})
+    table.add_row("[bold]Download Size[/bold]", size.get("download", "N/A"))
+    table.add_row("[bold]Install Size[/bold]", size.get("install", "N/A"))
+
+    print()
+    print(Panel(table, title="📦 Package Summary", expand=False))
+    print()
+
+
+def parse_size_string_to_bytes(size_str: str) -> int:
+    """
+    Convert a size string like '40GB' or '512MB' to bytes.
+    """
+    size_str = size_str.strip().upper()
+    units = {"KB": 10**3, "MB": 10**6, "GB": 10**9}
+
+    for unit, multiplier in units.items():
+        if size_str.endswith(unit):
+            try:
+                value = float(size_str[:-len(unit)].strip())
+                return int(value * multiplier)
+            except ValueError:
+                raise ValueError(f"Invalid numeric value in size string: '{size_str}'")
+
+    raise ValueError(f"Unrecognized size unit in '{size_str}'. Must be KB, MB, or GB.")