devnomads-cli 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

{devnomads_cli-0.5.2.dist-info → devnomads_cli-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devnomads-cli
-Version: 0.5.2
+Version: 0.5.4
 Summary: Manage your DevNomads services from the command line
 Author-email: DevNomads <support@devnomads.nl>
 License: MIT

devnomads_cli-0.5.4.dist-info/RECORD

@@ -0,0 +1,7 @@
+dncli.py,sha256=3WdV9xsEWXaJnaqyzCviKYV7hdADMZa2v69afkMPvOw,124105
+devnomads_cli-0.5.4.dist-info/licenses/LICENSE,sha256=WPXQ_lmpr3tVzTD9Z6VTiBgFnFey-cEwEYoG4HlmbxY,1066
+devnomads_cli-0.5.4.dist-info/METADATA,sha256=r1_WaqFGTmdROvJL3RdfCZX8xI8S751POgZ_Pygtn4U,5268
+devnomads_cli-0.5.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+devnomads_cli-0.5.4.dist-info/entry_points.txt,sha256=irLaKiGtIzEKi87exmXAg0srUmoDK31fL0SlqJasAEU,69
+devnomads_cli-0.5.4.dist-info/top_level.txt,sha256=rFWIJDQgL3jA2q6b2GAqZgCknDED4WLxNcHTktuWS1I,6
+devnomads_cli-0.5.4.dist-info/RECORD,,

dncli.py

@@ -44,6 +44,7 @@ from devnomads.api import Client as ApiClient
 from devnomads.api import DevNomadsError
 from devnomads.api.client import _unwrap as _lib_unwrap
 from devnomads.dns import Dns, challenge_name
+from rich import box
 from rich.console import Console
 from rich.markup import escape
 from rich.table import Table
@@ -233,7 +234,35 @@ def _summarize_item(item: dict[str, Any]) -> str:
     return " ".join(parts)
 
 
-def _cell(value: Any) -> str:
+def _summarize_list(items: list[dict[str, Any]]) -> str:
+    """Compact list-view summary of an object array: the count, plus a grouped
+    state breakdown when the items carry a state-like field (e.g. instances).
+    Full per-item detail is available via the matching ``show`` command."""
+
+    n = len(items)
+    key = next(
+        (
+            k
+            for k in ("state_last_known", "state", "status", "phase")
+            if any(k in it for it in items)
+        ),
+        None,
+    )
+    if key is None:
+        return str(n)
+    counts: dict[str, int] = {}
+    for item in items:
+        value = str(item.get(key, ""))
+        counts[value] = counts.get(value, 0) + 1
+    if len(counts) == 1:
+        return f"{n} {next(iter(counts))}".strip()
+    return ", ".join(f"{count} {value}" for value, count in counts.items())
+
+
+def _cell(value: Any, *, compact: bool = False) -> str:
+    """Render a value for a table cell. ``compact`` (list views) collapses an
+    object array to a count summary; otherwise each item gets its own line."""
+
     if value is None:
         return ""
     if isinstance(value, bool):
@@ -244,8 +273,10 @@ def _cell(value: Any) -> str:
         if not value:
             return ""
         if all(isinstance(item, dict) for item in value):
-            # a list of objects (instances, mailboxes, ips, ...) -> one
-            # readable line per item instead of an unreadable JSON blob.
+            # a list of objects (instances, mailboxes, ips, ...): a count
+            # summary in lists, one line per item in detail views.
+            if compact:
+                return _summarize_list(value)
             return "\n".join(_summarize_item(item) for item in value)
         if not any(isinstance(item, (dict, list)) for item in value):
             return ", ".join(str(item) for item in value)
@@ -272,15 +303,80 @@ def _flatten_row(row: dict[str, Any]) -> dict[str, Any]:
     return flat
 
 
+def _is_object_list(value: Any) -> bool:
+    return (
+        isinstance(value, list)
+        and len(value) > 0
+        and all(isinstance(item, dict) for item in value)
+    )
+
+
+def _object_table(items: list[dict[str, Any]]) -> Table:
+    """A compact sub-table for an array of objects, used inside the detail
+    view so nested data (instances, mailboxes, ips, ...) reads as a table
+    rather than one long line."""
+
+    cols = _auto_columns(items)
+    if not cols:  # all columns dropped (e.g. identical rows): show everything
+        cols = list(dict.fromkeys(key for item in items for key in item))
+    table = Table(box=box.SIMPLE_HEAD, show_header=True, pad_edge=False)
+    for col in cols:
+        table.add_column(col)
+    for item in items:
+        table.add_row(*(_cell(item.get(col), compact=True) for col in cols))
+    return table
+
+
 def _render_kv(data: dict[str, Any], title: str | None) -> None:
     table = Table(title=title, show_header=False)
     table.add_column(style="bold")
-    table.add_column()
+    table.add_column(overflow="fold")
     for key, value in _flatten_row(data).items():
-        table.add_row(key, _cell(value))
+        if value is None or value == "" or value == [] or value == {}:
+            continue  # drop empty fields so the detail view stays readable
+        cell: Any = _object_table(value) if _is_object_list(value) else _cell(value)
+        table.add_row(key, cell)
     out_console.print(table)
 
 
+def _auto_columns(rows: list[dict[str, Any]]) -> list[str]:
+    """Choose the columns worth showing in a list view, from the data itself.
+
+    Two things get dropped, because a list is an overview and the full record
+    is always available via the matching ``show`` command (or ``-o json``):
+
+    * columns empty in every row (no information at all);
+    * columns holding a list of objects (instances, mailboxes, ips, ...) -
+      these are detail, belonging in the ``show`` view, not the overview.
+
+    Every other field is kept, even if its value is the same on every row.
+    """
+
+    cols: list[str] = []
+    for row in rows:
+        if isinstance(row, dict):
+            for key in row:
+                if key not in cols:
+                    cols.append(key)
+
+    def empty(value: Any) -> bool:
+        return value is None or value == "" or value == [] or value == {}
+
+    def is_object_list(col: str) -> bool:
+        return any(
+            isinstance(row.get(col), list)
+            and row.get(col)
+            and all(isinstance(item, dict) for item in row[col])
+            for row in rows
+        )
+
+    return [
+        c
+        for c in cols
+        if any(not empty(row.get(c)) for row in rows) and not is_object_list(c)
+    ]
+
+
 def _render_rows(
     rows: list[dict[str, Any]], columns: list[str] | None, title: str | None
 ) -> None:
@@ -288,12 +384,12 @@ def _render_rows(
         err_console.print("[dim]no results[/]")
         return
     rows = [_flatten_row(row) if isinstance(row, dict) else row for row in rows]
-    cols = columns or list(rows[0].keys())
+    cols = columns if columns is not None else _auto_columns(rows)
     table = Table(title=title)
     for col in cols:
         table.add_column(col)
     for row in rows:
-        table.add_row(*(_cell(row.get(col)) for col in cols))
+        table.add_row(*(_cell(row.get(col), compact=True) for col in cols))
     out_console.print(table)
 
 

devnomads_cli-0.5.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-dncli.py,sha256=h6cfEBaxc5RrRRmVnD3OiOCD7GMJxAfez0iY7gHNEoQ,120626
-devnomads_cli-0.5.2.dist-info/licenses/LICENSE,sha256=WPXQ_lmpr3tVzTD9Z6VTiBgFnFey-cEwEYoG4HlmbxY,1066
-devnomads_cli-0.5.2.dist-info/METADATA,sha256=OzLplEX2KBKUnnUuzPDrzyyTV71kZaLF10G1U0YjLzc,5268
-devnomads_cli-0.5.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-devnomads_cli-0.5.2.dist-info/entry_points.txt,sha256=irLaKiGtIzEKi87exmXAg0srUmoDK31fL0SlqJasAEU,69
-devnomads_cli-0.5.2.dist-info/top_level.txt,sha256=rFWIJDQgL3jA2q6b2GAqZgCknDED4WLxNcHTktuWS1I,6
-devnomads_cli-0.5.2.dist-info/RECORD,,