runtime-sdk 0.4.23__tar.gz → 0.4.25__tar.gz

{runtime_sdk-0.4.23 → runtime_sdk-0.4.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtime-sdk
-Version: 0.4.23
+Version: 0.4.25
 Summary: Runtime Python SDK and CLI
 Project-URL: Repository, https://github.com/The-Money-Company-Limited/runtimevm
 Project-URL: Issues, https://github.com/The-Money-Company-Limited/runtimevm/issues

{runtime_sdk-0.4.23 → runtime_sdk-0.4.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "runtime-sdk"
-version = "0.4.23"
+version = "0.4.25"
 description = "Runtime Python SDK and CLI"
 readme = "README.md"
 requires-python = ">=3.11"

{runtime_sdk-0.4.23 → runtime_sdk-0.4.25}/scripts/runtime_sdk/cli.py

@@ -325,6 +325,9 @@ def build_parser() -> argparse.ArgumentParser:
     )
     completion_cmd.add_argument("shell", choices=["bash", "zsh", "fish"], help="Target shell")
 
+    # Hidden helper used by shell completion to list slugs, one per line.
+    subparsers.add_parser("_slugs", help=argparse.SUPPRESS)
+
     parser.format_help = lambda: _format_top_help()  # type: ignore[assignment]
     return parser
 
@@ -571,6 +574,8 @@ def main(argv: list[str] | None = None) -> int:
             return handle_help(args.topic)
         if args.command == "completion":
             return handle_completion(args.shell)
+        if args.command == "_slugs":
+            return handle_slugs(config)
         if args.command == "_proxy_agent":
             return run_proxy_agent(
                 args.base_url,
@@ -884,22 +889,6 @@ def _prompt_typed_confirm(message: str, expected: str) -> bool:
     return typed.strip().lower() == expected.strip().lower()
 
 
-def _display_width(value: Any, minimum: int, maximum: int) -> int:
-    text = str(value or "")
-    return max(minimum, min(len(text), maximum))
-
-
-def _fit_cell(value: Any, width: int) -> str:
-    text = str(value or "")
-    if width <= 0:
-        return ""
-    if len(text) > width:
-        if width == 1:
-            return "…"
-        text = text[: width - 1] + "…"
-    return text.ljust(width)
-
-
 def _computer_power_state(c: dict[str, Any]) -> str:
     power = c.get("power_state")
     if power is not None:
@@ -1118,157 +1107,97 @@ def _computer_sort_key(c: dict[str, Any]) -> tuple[int, str, str]:
 
 
 
-def _computer_table_layout(computers: list[dict[str, Any]]) -> dict[str, int]:
-    term_width = shutil.get_terminal_size((100, 20)).columns
-    slug_width = max(_display_width(_computer_name(c), len("name"), 24) for c in computers)
-    status_width = max(
-        _display_width(_computer_status_label(c), len("state"), 20)
-        for c in computers
-    )
-    created_width = max(
-        _display_width(_computer_created_label(c), len("age"), 8)
-        for c in computers
-    )
-    reserved = slug_width + status_width + created_width + len("  ") * 3
-    url_budget = max(16, term_width - reserved)
-    url_width = max(
-        len("url"),
-        min(max(len(_computer_url_label(c)) for c in computers), url_budget),
-    )
-    return {
-        "slug": slug_width,
-        "status": status_width,
-        "public_url": url_width,
-        "created_at": created_width,
-    }
-
-
-def _format_computer_row(c: dict[str, Any], widths: dict[str, int]) -> str:
-    return " │ ".join(
-        [
-            _fit_cell(_computer_name(c), widths["slug"]),
-            _fit_cell(_computer_status_label(c), widths["status"]),
-            _fit_cell(_computer_url_label(c), widths["public_url"]),
-            _fit_cell(_computer_created_label(c), widths["created_at"]),
-        ]
-    )
-
-
-def _computer_table_prompt(prompt: str, computers: list[dict[str, Any]]) -> tuple[str, dict[str, int]]:
-    widths = _computer_table_layout(computers)
-    header = " │ ".join(
-        [
-            _fit_cell("name", widths["slug"]),
-            _fit_cell("state", widths["status"]),
-            _fit_cell("url", widths["public_url"]),
-            _fit_cell("age", widths["created_at"]),
-        ]
-    )
-    divider = "─" * len(header)
-    return f"{prompt}\n{header}\n{divider}", widths
+def _picker_status_color(status: str) -> str:
+    if "cold" in status:
+        return "fg:#60a5fa"  # cyan-blue
+    if "warm" in status or "running" in status:
+        return "fg:#22c55e"  # green
+    if "archiving" in status or "restoring" in status:
+        return "fg:#eab308"  # yellow
+    if "creating" in status:
+        return "fg:#a855f7"  # magenta
+    if "orphaned" in status:
+        return "fg:#ef4444"  # red
+    return "fg:#e5e7eb"
 
 
+def _picker_widths(computers: list[dict[str, Any]]) -> dict[str, int]:
+    """Compute aligned column widths for the interactive picker rows.
 
-def _computer_choice_title(c: dict[str, Any], widths: dict[str, int]) -> str:
-    del widths
+    We budget total width to leave room for questionary's pointer + indicator.
+    """
+    term_width = shutil.get_terminal_size((100, 20)).columns
+    name_w = max(len("name"), max((len(_computer_name(c)) for c in computers), default=0))
+    name_w = min(name_w, 24)
+    status_w = max(len("state"), max((len(_computer_status_label(c)) for c in computers), default=0))
+    status_w = min(status_w, 14)
+    age_w = max(len("age"), max((len(_computer_created_label(c)) for c in computers), default=0))
+    age_w = min(age_w, 6)
+    # pointer + indicator + 2 gaps * 3 + status dot (2 chars) + padding
+    reserved = 6 + name_w + status_w + age_w + 2 * 3 + 2
+    url_w = max(len("url"), min(max((len(_computer_url_label(c)) for c in computers), default=16), term_width - reserved))
+    url_w = max(10, url_w)
+    return {"name": name_w, "status": status_w, "url": url_w, "age": age_w}
+
+
+def _computer_choice_title(c: dict[str, Any], widths: dict[str, int]) -> list[tuple[str, str]]:
+    """Return a styled list-of-tuples title so the picker rows look tabular.
+
+    Columns: name · state (colored dot + label) · url · age.
+    """
+    name = _computer_name(c)
     status = _computer_status_label(c)
-    url = _computer_url_label(c)
-    created = _computer_created_label(c)
-    parts = [f"{_computer_name(c)}", status]
-    if url:
-        parts.append(url)
-    if created:
-        parts.append(created)
-    return "  ·  ".join(parts)
-
-
-
-def _render_computer_summary(computers: list[dict[str, Any]]) -> None:
-    mods = _UI.rich()
-    Panel, Text = mods["Panel"], mods["Text"]
-    counts: dict[str, int] = {}
-    for computer in computers:
-        status = _computer_status_label(computer)
-        counts[status] = counts.get(status, 0) + 1
-
-    body = Text()
-    body.append(f"total {len(computers)}", style="bold white")
-    if counts:
-        body.append("   ")
-    first = True
-    status_styles = {
-        "warm": "bold green",
-        "cold": "bold cyan",
-        "running": "bold green",
-        "archiving": "bold yellow",
-        "restoring": "bold yellow",
-        "creating": "bold magenta",
-        "orphaned": "bold red",
-    }
-    for status in sorted(counts):
-        if not first:
-            body.append("  •  ", style="dim")
-        first = False
-        status_style = "bold white"
-        for token, style in status_styles.items():
-            if token in status:
-                status_style = style
-                break
-        body.append(status, style=status_style)
-        body.append(f" {counts[status]}", style="white")
-
-    _UI.console().print(
-        Panel(body, title="runtime", border_style="blue", expand=False, padding=(0, 1))
-    )
-
+    url = _computer_url_label(c) or "—"
+    age = _computer_created_label(c) or ""
+    color = _picker_status_color(status)
+    dot = _computer_status_dot(status)
+    # Keep each column within its budget; truncate with ellipsis on overflow.
+    def fit(text: str, width: int, align: str = "<") -> str:
+        text = str(text or "")
+        if len(text) > width:
+            return text[: max(1, width - 1)] + "…"
+        return format(text, f"{align}{width}")
+    return [
+        ("", fit(name, widths["name"]) + "  "),
+        (color, f"{dot} "),
+        (color, fit(status, widths["status"])),
+        ("", "  "),
+        ("fg:#cbd5e1", fit(url, widths["url"])),
+        ("", "  "),
+        ("fg:#6b7280", fit(age, widths["age"], ">")),
+    ]
 
 
-def _render_computer_table(computers: list[dict[str, Any]], *, title: str | None = None) -> None:
-    mods = _UI.rich()
-    Table, box = mods["Table"], mods["box"]
-    table = Table(
-        title=title,
-        box=box.MINIMAL_DOUBLE_HEAD,
-        expand=True,
-        show_lines=False,
-        header_style="bold #7dd3fc",
-        title_style="bold white",
-        pad_edge=False,
-        collapse_padding=True,
-        row_styles=["", "dim"],
-    )
-    table.add_column("Name", style="bold white", no_wrap=True, ratio=2)
-    table.add_column("State", no_wrap=True, ratio=2)
-    table.add_column("URL", style="white", overflow="fold", ratio=4)
-    table.add_column("Age", style="dim", no_wrap=True, justify="right", ratio=1)
-
-    for computer in sorted(computers, key=_computer_sort_key):
-        status = _computer_status_label(computer)
-        status_style = _computer_status_style(status)
-        table.add_row(
-            _computer_name(computer),
-            f"[{status_style}]{_computer_status_dot(status)} {status}[/{status_style}]",
-            _computer_url_label(computer),
-            _computer_created_label(computer),
-        )
 
-    _UI.console().print(table)
 
 
 def _select_prompt(message: str, choices: list[Any], *, instruction: str | None = None) -> Any:
     # questionary rejects use_jk_keys together with use_search_filter because
     # j/k would be swallowed by the search prefix. We pick search over vim keys.
-    return _UI.q().select(
+    question = _UI.q().select(
         message,
         choices=choices,
         qmark="●",
         pointer="❯",
-        instruction=instruction or "↑↓ navigate · type to search · enter · esc cancel",
+        instruction=instruction or "↑↓ · type to search · enter select · esc back",
         use_indicator=True,
         use_jk_keys=False,
         use_search_filter=True,
         style=_UI.style(),
     )
+    # Bind ESC explicitly — questionary's select prompt does not bind it by
+    # default. With eager=True the binding fires before prompt_toolkit's
+    # meta-key timeout. .unsafe_ask() returns the `result` we pass to exit().
+    with contextlib.suppress(Exception):
+        from prompt_toolkit.keys import Keys
+
+        bindings = question.application.key_bindings
+
+        @bindings.add(Keys.Escape, eager=True)
+        def _escape(event: Any) -> None:
+            event.app.exit(result=None)
+
+    return question
 
 
 def _pick_computer(
@@ -1278,8 +1207,8 @@ def _pick_computer(
 ) -> dict[str, Any] | None:
     """Fetch computers and let the user arrow-key through them.
 
-    Returns the picked computer dict, or None if the list is empty or the user
-    explicitly chose "← cancel". Ctrl-C propagates as KeyboardInterrupt.
+    Returns the picked computer dict, or None on ESC / "← cancel".
+    Ctrl-C propagates as KeyboardInterrupt.
     """
     client = RuntimeClient(base_url=config.base_url, api_key=config.api_key)
     payload = client.list_computers()
@@ -1294,8 +1223,7 @@ def _pick_computer(
         return None
 
     questionary = _UI.q()
-    widths = _computer_table_layout(computers)
-    _render_computer_table(computers)
+    widths = _picker_widths(computers)
     choices = [
         questionary.Choice(title=_computer_choice_title(c, widths), value=c) for c in computers
     ]
@@ -2972,7 +2900,11 @@ def _send_terminal_resize(ws: Any) -> None:
 
 
 def _interactive_list(config: RuntimeConfig) -> int:
-    """Nested menu: table → pick VM → action → back."""
+    """Interactive top-level menu: picker is the display, no separate table.
+
+    ESC / Ctrl+C / "✕ quit" exit. "+ new computer" creates one. "↻ refresh"
+    re-fetches. Picking a VM drops into its action submenu.
+    """
     client = RuntimeClient(base_url=config.base_url, api_key=config.api_key)
     questionary = _UI.q()
 
@@ -2987,9 +2919,19 @@ def _interactive_list(config: RuntimeConfig) -> int:
             return handle_create(config, None, None, None, None)
 
         computers = sorted(computers, key=_computer_sort_key)
-        _render_computer_summary(computers)
-        widths = _computer_table_layout(computers)
-        _render_computer_table(computers, title="computers")
+        widths = _picker_widths(computers)
+
+        # Title summarises counts so the picker alone carries enough context.
+        total = len(computers)
+        warm = sum(1 for c in computers if "warm" in _computer_status_label(c) or "running" in _computer_status_label(c))
+        cold = sum(1 for c in computers if "cold" in _computer_status_label(c))
+        bits = [f"{total} total"]
+        if warm:
+            bits.append(f"{warm} warm")
+        if cold:
+            bits.append(f"{cold} cold")
+        summary = " · ".join(bits)
+
         choices: list[Any] = [
             questionary.Choice(title=_computer_choice_title(c, widths), value=c)
             for c in computers
@@ -2999,9 +2941,9 @@ def _interactive_list(config: RuntimeConfig) -> int:
         choices.append(questionary.Choice(title="↻ refresh", value="__refresh__"))
         choices.append(questionary.Choice(title="✕ quit", value="__quit__"))
 
-        picked = _select_prompt("Pick a computer", choices).unsafe_ask()
+        picked = _select_prompt(f"Pick a computer ({summary})", choices).unsafe_ask()
 
-        if picked == "__quit__":
+        if picked is None or picked == "__quit__":
             return 0
         if picked == "__refresh__":
             continue
@@ -3058,7 +3000,7 @@ def _vm_detail_menu(client: RuntimeClient, vm: dict[str, Any]) -> str:
             choices,
         ).unsafe_ask()
 
-        if action == "__back__":
+        if action is None or action == "__back__":
             return "__back__"
         if action == "__quit__":
             return "__quit__"
@@ -3270,9 +3212,9 @@ _runtime_complete() {
   fi
   sub="${COMP_WORDS[1]}"
   case "$sub" in
-    info|url|start|enter|run|publish|delete|rm|share|startup|service)
+    info|url|start|enter|run|publish|delete|rm|startup|service)
       local ids
-      ids=$(runtime ls 2>/dev/null | python3 -c 'import sys,json;print("\n".join(c["slug"] for c in json.load(sys.stdin).get("computers",[]) if c.get("slug")))' 2>/dev/null)
+      ids=$(runtime _slugs 2>/dev/null)
       COMPREPLY=( $(compgen -W "$ids" -- "$cur") )
       ;;
     completion)
@@ -3281,6 +3223,10 @@ _runtime_complete() {
     share)
       if [[ ${COMP_CWORD} -eq 2 ]]; then
         COMPREPLY=( $(compgen -W "public private" -- "$cur") )
+      else
+        local ids
+        ids=$(runtime _slugs 2>/dev/null)
+        COMPREPLY=( $(compgen -W "$ids" -- "$cur") )
       fi
       ;;
   esac
@@ -3331,11 +3277,17 @@ _runtime() {
       case ${words[1]} in
         info|url|start|enter|run|publish|delete|rm|startup|service)
           local -a ids
-          ids=(${(f)"$(runtime ls 2>/dev/null | python3 -c 'import sys,json;print(\"\\n\".join(c[\"slug\"] for c in json.load(sys.stdin).get(\"computers\",[]) if c.get(\"slug\")))' 2>/dev/null)"})
+          ids=(${(f)"$(runtime _slugs 2>/dev/null)"})
           _describe -t slugs 'computer' ids
           ;;
         share)
-          _values 'visibility' public private
+          if (( CURRENT == 2 )); then
+            _values 'visibility' public private
+          else
+            local -a ids
+            ids=(${(f)"$(runtime _slugs 2>/dev/null)"})
+            _describe -t slugs 'computer' ids
+          fi
           ;;
         completion)
           _values 'shell' bash zsh fish
@@ -3350,7 +3302,7 @@ _runtime "$@"
 
 _COMPLETION_FISH = r"""# fish completion for runtime
 function __runtime_slugs
-  runtime ls 2>/dev/null | python3 -c 'import sys,json;print("\n".join(c["slug"] for c in json.load(sys.stdin).get("computers",[]) if c.get("slug")))' 2>/dev/null
+  runtime _slugs 2>/dev/null
 end
 
 complete -c runtime -f
@@ -3387,5 +3339,25 @@ def handle_completion(shell: str) -> int:
     return 0
 
 
+def handle_slugs(config: RuntimeConfig) -> int:
+    """Print one slug per line. Used by shell completion scripts. Silent on errors."""
+    if not config.api_key:
+        return 0
+    try:
+        client = RuntimeClient(base_url=config.base_url, api_key=config.api_key)
+        payload = client.list_computers()
+    except Exception:
+        return 0
+    computers = payload.get("computers") or []
+    if not isinstance(computers, list):
+        return 0
+    for c in computers:
+        if isinstance(c, dict):
+            slug = str(c.get("slug") or "").strip()
+            if slug:
+                sys.stdout.write(slug + "\n")
+    return 0
+
+
 if __name__ == "__main__":
     raise SystemExit(main())

{runtime_sdk-0.4.23 → runtime_sdk-0.4.25}/scripts/runtime_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtime-sdk
-Version: 0.4.23
+Version: 0.4.25
 Summary: Runtime Python SDK and CLI
 Project-URL: Repository, https://github.com/The-Money-Company-Limited/runtimevm
 Project-URL: Issues, https://github.com/The-Money-Company-Limited/runtimevm/issues