ap-client 0.3.1.dev1__tar.gz → 0.3.2__tar.gz

{ap_client-0.3.1.dev1 → ap_client-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.3.1.dev1
+Version: 0.3.2
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
 Requires-Dist: pyyaml>=6.0
@@ -9,9 +9,9 @@ Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: websockets>=13.0
 Provides-Extra: all
-Requires-Dist: instance-repo[oss]>=1.1.0; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.1.2; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]>=1.1.0; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.1.2; extra == 'dataset'
 Description-Content-Type: text/markdown
 
 A lightweight Python SDK and command line interface for Agent Platform. It provides helpers for configuring API access and managing templates, datasets, jobs, and groups.

{ap_client-0.3.1.dev1 → ap_client-0.3.2}/ap_client/api.py

@@ -294,24 +294,6 @@ def _secret_ws_params(workspace_id: Optional[str]) -> Optional[dict]:
     return {"workspace_id": workspace_id} if workspace_id else None
 
 
-def _unwrap_data(payload: Any) -> Any:
-    """Unwrap the apiserver ``{code,message,data}`` envelope when present.
-
-    The dataset-domain detail/create/patch endpoints return a bare JSON body,
-    but the same handlers are occasionally wrapped by the generic success
-    envelope. Tolerate both so command code never has to branch: a mapping that
-    carries ``data`` alongside ``code``/``message`` is treated as an envelope,
-    anything else is returned verbatim.
-    """
-    if (
-        isinstance(payload, dict)
-        and "data" in payload
-        and ("code" in payload or "message" in payload)
-    ):
-        return payload["data"]
-    return payload
-
-
 def _split_paged(payload: Any) -> tuple[list[dict], dict]:
     """Split a ``PagedSuccess`` envelope into ``(records, pagination)``.
 

{ap_client-0.3.1.dev1 → ap_client-0.3.2}/ap_client/cli.py

@@ -815,26 +815,43 @@ def _print_json_block(data: Any) -> None:
     typer.echo(json.dumps(data, ensure_ascii=False, indent=2))
 
 
+def _format_nested_detail(value: Any) -> str:
+    """Nested dict/list for detail views: compact one-liner, pretty JSON when long.
+
+    A detail view must not silently drop data - the manifest in ``ap instance
+    get`` used to be cut mid-JSON by the one-liner preview.
+    """
+    compact = json.dumps(value, ensure_ascii=False, separators=(",", ":"))
+    if len(compact) <= _PLAIN_VALUE_PREVIEW:
+        return compact
+    return json.dumps(value, ensure_ascii=False, indent=2)
+
+
 def _print_detail(data: object) -> None:
     """Render a single object as an aligned key/value detail view.
 
     Top-level scalars become key/value rows (``image`` fields shortened); nested
-    dict/list fields are shown as compact one-liners. Falls back to JSON for
+    dict/list fields are shown as compact one-liners, or pretty-printed across
+    multiple lines when the one-liner would not fit. Falls back to JSON for
     non-dict payloads.
     """
     if not isinstance(data, dict):
         _print_json(data)
         return
-    scalar_rows: list[tuple[str, Any]] = []
-    nested_rows: list[tuple[str, Any]] = []
+    rows: list[tuple[str, str]] = []
     for key, value in data.items():
         if isinstance(value, (dict, list)):
-            nested_rows.append((key, value))
+            rows.append((key, _format_nested_detail(value)))
         elif key == "image" and isinstance(value, str):
-            scalar_rows.append((key, _shorten_image(value)))
+            rows.append((key, _shorten_image(value)))
         else:
-            scalar_rows.append((key, value))
-    _print_key_values(scalar_rows + nested_rows, skip_empty=False)
+            rows.append((key, _format_plain_value(value, max_len=0)))
+    width = max((len(label) for label, _text in rows), default=0)
+    indent = " " * (width + 4)
+    for label, text in rows:
+        if "\n" in text:
+            text = text.replace("\n", f"\n{indent}")
+        typer.echo(f"  {label.ljust(width)}: {text}")
 
 
 def _print_template_get_plain(t: dict) -> None:
@@ -944,7 +961,7 @@ def _print_field_value(value: Any, output_format: str) -> None:
     _print_formatted(value, "json" if output_format == "plain" else output_format)
 
 
-def _format_plain_value(value: Any) -> str:
+def _format_plain_value(value: Any, *, max_len: int = _PLAIN_VALUE_PREVIEW) -> str:
     if value is None:
         return ""
     if isinstance(value, (dict, list)):
@@ -952,9 +969,9 @@ def _format_plain_value(value: Any) -> str:
     else:
         text = str(value)
     text = text.replace("\r", "\\r").replace("\n", "\\n")
-    if len(text) <= _PLAIN_VALUE_PREVIEW:
+    if not max_len or len(text) <= max_len:
         return text
-    return f"{text[: _PLAIN_VALUE_PREVIEW - 3]}..."
+    return f"{text[: max_len - 3]}..."
 
 
 def _print_key_values(rows: list[tuple[str, Any]], *, skip_empty: bool = True) -> None: