Create found_gpus_by_model + fix typos

Author: philogicae

src/aleph_client/commands/help_strings.py

@@ -22,7 +22,7 @@
 ROOTFS = (
     "Hash of the rootfs to use for your instance. Defaults to Ubuntu 22. You can also create your own rootfs and pin it"
 )
-COMPUTE_UNITS = "Number of compute units to allocate. Compute units correspond to a tier that includes vcpus, memory, disk and gpu presets. For reference, run: `aleph pricing for --help`"
+COMPUTE_UNITS = "Number of compute units to allocate. Compute units correspond to a tier that includes vcpus, memory, disk and gpu presets. For reference, run: `aleph pricing --help`"
 ROOTFS_SIZE = "Rootfs size in MiB to allocate"
 VCPUS = "Number of virtual CPUs to allocate"
 MEMORY = "Maximum memory (RAM) in MiB to allocate"
@@ -36,7 +36,7 @@
 CONFIDENTIAL_FIRMWARE_HASH = "Hash of the UEFI Firmware content, to validate measure (ignored if path is provided)"
 CONFIDENTIAL_FIRMWARE_PATH = "Path to the UEFI Firmware content, to validate measure (instead of the hash)"
 GPU_OPTION = "Launch an instance attaching a GPU to it"
-GPU_PREMIUM_OPTION = "Premium GPUs only (high VRAM)"
+GPU_PREMIUM_OPTION = "Use Premium GPUs (VRAM > 48GiB)"
 KEEP_SESSION = "Keeping the already initiated session"
 VM_SECRET = "Secret password to start the VM"
 CRN_URL_VM_DELETION = "Domain of the CRN where an associated VM is running. It ensures your VM will be stopped and erased on the CRN before the instance message is actually deleted"

src/aleph_client/commands/instance/__init__.py

@@ -68,6 +68,7 @@
 from aleph_client.commands.utils import (
     filter_only_valid_messages,
     find_sevctl_or_exit,
+    found_gpus_by_model,
     get_or_prompt_volumes,
     setup_logging,
     str_to_datetime,
@@ -326,28 +327,7 @@ async def create(
     if gpu:
         echo("Fetching available GPU list...")
         crn_list = await fetch_crn_list(latest_crn_version=True, ipv6=True, stream_address=True, gpu=True)
-        found_gpu_models = {}
-        for crn_ in crn_list:
-            found_gpus: dict[str, dict[str, dict[str, int]]] = {}
-            for gpu_ in crn_.compatible_available_gpus:
-                model = gpu_["model"]
-                device = gpu_["device_name"]
-                if model not in found_gpus:
-                    found_gpus[model] = {device: {"count": 1, "on_crns": 1}}
-                elif device not in found_gpus[model]:
-                    found_gpus[model][device] = {"count": 1, "on_crns": 1}
-                else:
-                    found_gpus[model][device]["count"] += 1
-            for model, devices in found_gpus.items():
-                if model not in found_gpu_models:
-                    found_gpu_models[model] = devices
-                else:
-                    for device, details in devices.items():
-                        if device not in found_gpu_models[model]:
-                            found_gpu_models[model][device] = details
-                        else:
-                            found_gpu_models[model][device]["count"] += details["count"]
-                            found_gpu_models[model][device]["on_crns"] += details["on_crns"]
+        found_gpu_models = found_gpus_by_model(crn_list)
         premium = yes_no_input("Premium GPUs (high VRAM)?", default=False) if premium is None else premium
 
     pricing = await fetch_pricing()
@@ -643,7 +623,7 @@ async def create(
                             "Flow Distribution": "\n[bright_cyan]80% -> CRN wallet[/bright_cyan]"
                             f"\n  Address: {crn.stream_reward_address}\n  Tx: {flow_hash_crn}"
                             f"\n[bright_cyan]20% -> Community wallet[/bright_cyan]"
-                            f"\n  Address:{community_wallet_address}\n  Tx: {flow_hash_community}",
+                            f"\n  Address: {community_wallet_address}\n  Tx: {flow_hash_community}",
                         }.items()
                     )
                     console.print(

src/aleph_client/commands/pricing.py

@@ -168,12 +168,12 @@ def display_table_for(
             table.add_column("Tier", style="cyan")
             table.add_column("Compute Units", style="orchid")
             table.add_column("vCPUs", style="bright_cyan")
-            table.add_column("RAM (Gib)", style="bright_cyan")
-            table.add_column("Disk (Gib)", style="bright_cyan")
+            table.add_column("RAM (GiB)", style="bright_cyan")
+            table.add_column("Disk (GiB)", style="bright_cyan")
             if "model" in tiers[0]:
                 table.add_column("GPU Model", style="orange1")
             if "vram" in tiers[0]:
-                table.add_column("VRAM (Gib)", style="orange1")
+                table.add_column("VRAM (GiB)", style="orange1")
             if "holding" in price_unit:
                 table.add_column("$ALEPH (Holding)", style="red", justify="center")
             if "payg" in price_unit and pricing_entity in PAYG_GROUP:
@@ -245,15 +245,15 @@ def display_table_for(
 
             extra_price_holding = (
                 f"[red]{displayable_amount(Decimal(price_storage['holding'])*1024, decimals=5)}"
-                " token/Gib[/red] (Holding) -or- "
+                " token/GiB[/red] (Holding) -or- "
                 if "holding" in price_storage
                 else ""
             )
             infos = [
                 Text.from_markup(
                     f"Extra Volume Cost: {extra_price_holding}"
                     f"[green]{displayable_amount(Decimal(price_storage['payg'])*1024*24, decimals=5)}"
-                    " token/Gib/day[/green] (Pay-As-You-Go)"
+                    " token/GiB/day[/green] (Pay-As-You-Go)"
                 )
             ]
             displayable_group = Group(
@@ -275,7 +275,7 @@ def display_table_for(
                     f"{displayable_amount(Decimal(price_storage['holding']), decimals=5)}"
                     " token/Mib[/bright_cyan] -or- [bright_cyan]"
                     f"{displayable_amount(Decimal(price_storage['holding'])*1024, decimals=5)}"
-                    " token/Gib[/bright_cyan]"
+                    " token/GiB[/bright_cyan]"
                 )
             )
             displayable_group = Group(

src/aleph_client/commands/utils.py

@@ -336,3 +336,29 @@ def find_sevctl_or_exit() -> Path:
         echo("Instructions for setup https://docs.aleph.im/computing/confidential/requirements/")
         raise Exit(code=1)
     return Path(sevctl_path)
+
+
+def found_gpus_by_model(crn_list: list) -> dict[str, dict[str, dict[str, int]]]:
+    found_gpu_models: dict[str, dict[str, dict[str, int]]] = {}
+    for crn_ in crn_list:
+        found_gpus: dict[str, dict[str, dict[str, int]]] = {}
+        for gpu_ in crn_.compatible_available_gpus:
+            model = gpu_["model"]
+            device = gpu_["device_name"]
+            if model not in found_gpus:
+                found_gpus[model] = {device: {"count": 1, "on_crns": 1}}
+            elif device not in found_gpus[model]:
+                found_gpus[model][device] = {"count": 1, "on_crns": 1}
+            else:
+                found_gpus[model][device]["count"] += 1
+        for model, devices in found_gpus.items():
+            if model not in found_gpu_models:
+                found_gpu_models[model] = devices
+            else:
+                for device, details in devices.items():
+                    if device not in found_gpu_models[model]:
+                        found_gpu_models[model][device] = details
+                    else:
+                        found_gpu_models[model][device]["count"] += details["count"]
+                        found_gpu_models[model][device]["on_crns"] += details["on_crns"]
+    return found_gpu_models