lyceum-cli 1.2.1__tar.gz → 1.2.2__tar.gz

{lyceum_cli-1.2.1 → lyceum_cli-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lyceum-cli
-Version: 1.2.1
+Version: 1.2.2
 Summary: Command-line interface for Lyceum Cloud
 Author-email: Lyceum <support@lyceum.technology>
 License: MIT

{lyceum_cli-1.2.1 → lyceum_cli-1.2.2}/lyceum/_version.py

@@ -7,4 +7,4 @@ __version__ lives in this module. A future refactor could move these modules
 under lyceum/cli/, claiming one subpackage the way the other two do.
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"

{lyceum_cli-1.2.1 → lyceum_cli-1.2.2}/lyceum/external/vms/management.py

@@ -47,6 +47,54 @@ def _print_ssh_command(ip_addr: str):
         console.print(f"\n[cyan]SSH command:[/cyan] ssh -i <your-key> lyceum@{ip_addr}")
 
 
+def _attached_volumes_of(vm_id: str) -> list[dict[str, Any]]:
+    try:
+        data = api_request("GET", f"/api/v2/external/vms/{vm_id}/status", silent=True)
+    except typer.Exit:
+        return []
+    return (data or {}).get("volumes") or []
+
+
+def _print_volumes_with_ids(volumes: list[dict[str, Any]]):
+    for volume in volumes:
+        size = volume.get("size_gb")
+        mount_path = volume.get("mount_path")
+        details = ", ".join(part for part in (f"{size} GB" if size else "", mount_path or "") if part)
+        console.print(f"  [cyan]{volume.get('volume_id', '-')}[/cyan]" + (f"  [dim]{details}[/dim]" if details else ""))
+
+
+def _warn_about_attached_storage_being_not_deleted(volumes: list[dict[str, Any]]):
+    if not volumes:
+        return
+
+    one = len(volumes) == 1
+    noun, them, keep = ("volume", "it", "keeps") if one else ("volumes", "them", "keep")
+    console.print(f"\n[yellow]This VM is holding {len(volumes)} block storage {noun}:[/yellow]")
+    _print_volumes_with_ids(volumes)
+    console.print(
+        f"[yellow]Stopping the VM detaches {them} but does not delete {them}.[/yellow]\n"
+        f"[dim]The {noun} {keep} your data and {keep} being billed until you delete {them} separately.[/dim]\n"
+    )
+
+
+def _report_detached_storage_with_usage_hints(volumes: list[dict[str, Any]]):
+    if not volumes:
+        return
+
+    one = len(volumes) == 1
+    noun = "volume" if one else "volumes"
+    verb = "is" if one else "are"
+    console.print(f"\n[yellow]{len(volumes)} block storage {noun} outlived the VM and {verb} still billed:[/yellow]")
+    _print_volumes_with_ids(volumes)
+    console.print(f"\n[dim]Delete {'it' if one else 'each one'} with:[/dim]")
+    for volume in volumes:
+        console.print(f"  [cyan]lyceum storage block delete {volume.get('volume_id', '<volume-id>')}[/cyan]")
+    console.print(
+        f"[dim]Or keep {'it' if one else 'them'} for the next VM: "
+        "lyceum vm start --attach-storage <volume-id> ...[/dim]"
+    )
+
+
 def _validate_storage_options(
     attach_storage: list[str] | None,
     create_block_storage: int | None,
@@ -73,11 +121,14 @@ def _print_storage_result(data: dict[str, Any]):
     """Report the block storage a VM was created with, if any."""
     volume = data.get("volume")
     if volume:
+        name = volume.get("name", "-")
         console.print(
-            f"[bold]Block storage:[/bold] {volume['volume_id']} "
+            f"[bold]Block storage:[/bold] {name} "
             f"({volume['size_gb']} GB, {_status_style(volume.get('status', 'pending'))})"
         )
-        console.print("[dim]The volume outlives this VM; delete it with: lyceum storage block delete <id>[/dim]")
+        # The volume is named here rather than identified, because the provider
+        # has issued no ID yet. `storage block list` carries it once it has.
+        console.print("[dim]The volume outlives this VM; see it with: lyceum storage block list[/dim]")
 
     notice = data.get("volume_notice")
     if notice:
@@ -575,11 +626,15 @@ def terminate_instance(
 ):
     """Stop and delete a VM instance"""
     if not force:
+        _warn_about_attached_storage_being_not_deleted(_attached_volumes_of(vm_id))
         confirm = typer.confirm(f"Are you sure you want to terminate VM {vm_id}?")
         if not confirm:
             console.print("[yellow]Termination cancelled.[/yellow]")
             return
 
     console.print("[dim]Terminating VM instance...[/dim]")
-    data = api_request("DELETE", f"/api/v2/external/vms/{vm_id}")
+    data = api_request("DELETE", f"/api/v2/external/vms/{vm_id}") or {}
     console.print(f"[green]✓ {data.get('message', 'VM instance terminated successfully')}[/green]")
+    # Taken from the delete rather than the lookup above, so --force hears about
+    # the storage too.
+    _report_detached_storage_with_usage_hints(data.get("detached_volumes") or [])

{lyceum_cli-1.2.1 → lyceum_cli-1.2.2}/lyceum_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lyceum-cli
-Version: 1.2.1
+Version: 1.2.2
 Summary: Command-line interface for Lyceum Cloud
 Author-email: Lyceum <support@lyceum.technology>
 License: MIT

{lyceum_cli-1.2.1 → lyceum_cli-1.2.2}/tests/test_block_storage.py

@@ -1,6 +1,7 @@
 """The CLI surface for block storage: `storage block` and `vm start`'s options."""
 
 import pytest
+import typer
 from typer.testing import CliRunner
 
 from lyceum.external.storage import block
@@ -271,7 +272,7 @@ def test_a_copy_can_be_switched_off(gateway):
 
 def test_a_new_volume_is_asked_for_by_size(gateway):
     gateway.bodies["/api/v2/external/vms/create"] = _vm_body(
-        volume={"volume_id": "hyd-devel-vol-new", "size_gb": 100, "status": "pending"}
+        volume={"name": "hyd-devel-vol-new", "size_gb": 100, "status": "pending"}
     )
 
     result = runner.invoke(app, [*_VM_ARGS, "--create-block-storage", "100"])
@@ -312,3 +313,87 @@ def test_a_volume_being_copied_is_reported_instead_of_polled(gateway):
     assert result.exit_code == 0
     assert "being copied" in result.output
     assert "lyceum storage block list" in result.output
+
+
+# --- lyceum vm stop ---------------------------------------------------------
+
+
+def _stop_bodies(gateway, volumes: list[dict], detached: list[dict] | None = None):
+    """What the gateway answers a stop with: the VM's storage, then the delete."""
+    gateway.bodies["/api/v2/external/vms/vm-1/status"] = {"vm_id": "vm-1", "status": "ready", "volumes": volumes}
+    gateway.bodies["/api/v2/external/vms/vm-1"] = {
+        "vm_id": "vm-1",
+        "status": "terminated",
+        "message": "VM vm-1 has been terminated",
+        "detached_volumes": volumes if detached is None else detached,
+    }
+
+
+def test_stopping_a_vm_names_its_storage_before_asking(gateway):
+    """The prompt is the last point at which knowing costs the customer nothing."""
+    _stop_bodies(gateway, [_VOLUME])
+
+    result = runner.invoke(app, ["vm", "stop", "vm-1"], input="y\n")
+
+    assert result.exit_code == 0
+    assert "vol-abc" in result.output
+    assert "does not delete" in result.output
+    # Being billed on is the part no other command would have told them.
+    assert "billed" in result.output
+
+
+def test_a_vm_without_storage_is_not_warned_about_any(gateway):
+    _stop_bodies(gateway, [])
+
+    result = runner.invoke(app, ["vm", "stop", "vm-1"], input="y\n")
+
+    assert result.exit_code == 0
+    assert "block storage" not in result.output.lower()
+
+
+def test_declining_the_prompt_stops_nothing(gateway):
+    _stop_bodies(gateway, [_VOLUME])
+
+    result = runner.invoke(app, ["vm", "stop", "vm-1"], input="n\n")
+
+    assert result.exit_code == 0
+    assert "cancelled" in result.output.lower()
+    assert not any(method == "DELETE" for method, _path, _kwargs in gateway.calls)
+
+
+def test_the_storage_left_behind_comes_with_the_command_that_deletes_it(gateway):
+    _stop_bodies(gateway, [_VOLUME])
+
+    result = runner.invoke(app, ["vm", "stop", "vm-1"], input="y\n")
+
+    assert result.exit_code == 0
+    assert "lyceum storage block delete vol-abc" in result.output
+
+
+def test_force_hears_about_the_storage_even_though_it_skips_the_prompt(gateway):
+    """--force waives the question, not the answer: the volumes are still billed."""
+    _stop_bodies(gateway, [_VOLUME])
+
+    result = runner.invoke(app, ["vm", "stop", "vm-1", "--force"])
+
+    assert result.exit_code == 0
+    # Nothing was asked, so the status lookup behind the prompt was not made.
+    assert [path for _method, path, _kwargs in gateway.calls] == ["/api/v2/external/vms/vm-1"]
+    assert "lyceum storage block delete vol-abc" in result.output
+
+
+def test_a_status_lookup_that_fails_does_not_block_the_stop(gateway, monkeypatch):
+    """Not knowing about the storage is no reason to refuse to stop the VM."""
+    _stop_bodies(gateway, [_VOLUME])
+
+    def refuse_the_status(method, path, **kwargs):
+        if path.endswith("/status"):
+            raise typer.Exit(1)
+        return gateway(method, path, **kwargs)
+
+    monkeypatch.setattr(management, "api_request", refuse_the_status)
+
+    result = runner.invoke(app, ["vm", "stop", "vm-1"], input="y\n")
+
+    assert result.exit_code == 0
+    assert "terminated" in result.output