zen-cli 0.1.2__tar.gz → 0.1.5__tar.gz

{zen_cli-0.1.2 → zen_cli-0.1.5}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.5
 Name: zen-cli
-Version: 0.1.2
-Summary: Command-line toolbox for Zen Cloud PC. Operate orgs, pools, VMs, and tasks; call ZDS APIs; expose a stdio MCP server.
+Version: 0.1.5
+Summary: CLI for Zen Desktop Service. Designed for AI and Human.
 Project-URL: Homepage, https://pypi.org/project/zen-cli/
 Author: zen-cli authors
 License-Expression: MIT
@@ -36,6 +36,17 @@ Description-Content-Type: text/markdown
 
 Command-line toolbox for Zen Cloud PC, designed for AI and human.
 
+## Contents
+
+- [Try it out](#try-it-out)
+  - [Prerequisites](#prerequisites)
+  - [Installation](#installation)
+    - [Mac & Linux](#mac--linux)
+    - [Windows](#windows)
+  - [Use the CLI](#use-the-cli)
+- [Documentation](#documentation)
+- [License](#license)
+
 ## Try it out
 
 ### Prerequisites
@@ -64,20 +75,23 @@ If Python was installed without “Add python to PATH”, add Python and its `Sc
 ```text
 zen login
 zen auth status
+zen auth details
+zen auth token
 ```
 
-`zen login` reuses cached or configured credentials. Interactive login is `zen login --device-code`; machine login is `zen login --client-id` / `--client-secret`. Use `zen auth status` / `zen auth token` to inspect the session (`--service` for a per-service override). `zen auth refresh` refreshes the cached token.
+`zen login` reuses a valid cached token or configured credentials (API token, client id/secret). If neither is available it starts device-code login. It does not print the access token. Machine login is `zen login --client-id` / `--client-secret`. `zen auth status` is JSON (`logged_in`, `method`, `ttl`). `zen auth details` is the JWT and org. `zen auth token` is the bearer (`--service` on details/token). `zen auth refresh` refreshes the cached token.
 
-Run a command, for example, list orgs:
+Run a command, for example, list pools:
 
 ```text
-zen org list
+zen pool list
 ```
 
 ## Documentation
 
-* [Cheatsheet](docs/cheatsheet.md)
-* [Developer guide](docs/dev.md)
+* [User guide](docs/user-guide.md) — profiles, flags, payloads, and command conventions
+* [Cheatsheet](docs/cheatsheet.md) — command examples
+* [Developer guide](docs/dev.md) — build, test, and package layout
 
 ## License
 

{zen_cli-0.1.2 → zen_cli-0.1.5}/README.md

@@ -4,6 +4,17 @@
 
 Command-line toolbox for Zen Cloud PC, designed for AI and human.
 
+## Contents
+
+- [Try it out](#try-it-out)
+  - [Prerequisites](#prerequisites)
+  - [Installation](#installation)
+    - [Mac & Linux](#mac--linux)
+    - [Windows](#windows)
+  - [Use the CLI](#use-the-cli)
+- [Documentation](#documentation)
+- [License](#license)
+
 ## Try it out
 
 ### Prerequisites
@@ -32,20 +43,23 @@ If Python was installed without “Add python to PATH”, add Python and its `Sc
 ```text
 zen login
 zen auth status
+zen auth details
+zen auth token
 ```
 
-`zen login` reuses cached or configured credentials. Interactive login is `zen login --device-code`; machine login is `zen login --client-id` / `--client-secret`. Use `zen auth status` / `zen auth token` to inspect the session (`--service` for a per-service override). `zen auth refresh` refreshes the cached token.
+`zen login` reuses a valid cached token or configured credentials (API token, client id/secret). If neither is available it starts device-code login. It does not print the access token. Machine login is `zen login --client-id` / `--client-secret`. `zen auth status` is JSON (`logged_in`, `method`, `ttl`). `zen auth details` is the JWT and org. `zen auth token` is the bearer (`--service` on details/token). `zen auth refresh` refreshes the cached token.
 
-Run a command, for example, list orgs:
+Run a command, for example, list pools:
 
 ```text
-zen org list
+zen pool list
 ```
 
 ## Documentation
 
-* [Cheatsheet](docs/cheatsheet.md)
-* [Developer guide](docs/dev.md)
+* [User guide](docs/user-guide.md) — profiles, flags, payloads, and command conventions
+* [Cheatsheet](docs/cheatsheet.md) — command examples
+* [Developer guide](docs/dev.md) — build, test, and package layout
 
 ## License
 

{zen_cli-0.1.2 → zen_cli-0.1.5}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "zen-cli"
-version = "0.1.2"
-description = "Command-line toolbox for Zen Cloud PC. Operate orgs, pools, VMs, and tasks; call ZDS APIs; expose a stdio MCP server."
+version = "0.1.5"
+description = "CLI for Zen Desktop Service. Designed for AI and Human."
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -44,7 +44,7 @@ include = ["src/zen_cli", "tests", "README.md", "LICENSE"]
 target-version = "py312"
 line-length = 120
 src = ["src"]
-exclude = ["cli-ref"]
+exclude = ["cli-ref", "src/zen_cli/support/test_utils2.py"]
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "UP", "B", "SIM", "RUF"]
@@ -53,6 +53,7 @@ select = ["E", "F", "I", "UP", "B", "SIM", "RUF"]
 python_version = "3.12"
 strict = true
 files = ["src"]
+exclude = ["test_utils2\\.py"]
 
 [[tool.mypy.overrides]]
 module = ["mcp", "mcp.*"]
@@ -67,9 +68,14 @@ module = [
     "yaml",
     "httpx2",
     "httpx2.*",
+    "coloredlogs",
 ]
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
 module = ["zen_cli.cmds", "zen_cli.cmds.*", "zen_cli.ctxp", "zen_cli.ctxp.*"]
 disallow_untyped_decorators = false
+
+[[tool.mypy.overrides]]
+module = ["zen_cli.service.task"]
+disallow_subclassing_any = false

{zen_cli-0.1.2 → zen_cli-0.1.5}/src/zen_cli/cmds/api.py

@@ -1,73 +1,11 @@
-import json
-import sys
-from pathlib import Path
 from typing import Any
 
 import click
 
-from zen_cli.ctxp import CtxpException
 from zen_cli.service import api as zen_api
 from zen_cli.sglib import mdc as mdc_session
 from zen_cli.sglib.client_util import resolve_zds_base_url
-
-
-def _has_stdin_data() -> bool:
-    return not sys.stdin.isatty()
-
-
-def _resolve_data(data_arg: str | None) -> str | None:
-    """Resolve data from various sources following curl-style conventions."""
-    if not data_arg:
-        return None
-
-    if data_arg == "-":
-        content = sys.stdin.read()
-        return content if content else None
-
-    if data_arg.startswith("@"):
-        filepath = data_arg[1:]
-        try:
-            content = Path(filepath).read_text()
-            return content or None
-        except FileNotFoundError:
-            raise CtxpException(f"File not found: {filepath}") from None
-
-    return data_arg
-
-
-def _handle_data_input(data_arg: str | None, json_arg: str | None) -> tuple[str | None, Any]:
-    if data_arg and json_arg:
-        raise click.UsageError("Cannot specify both --data and --json options. Use one of them.")
-
-    raw_data = None
-    json_data = None
-
-    if data_arg:
-        if _has_stdin_data() and data_arg != "-":
-            raise click.UsageError(
-                "Cannot specify --data when data is piped via stdin. Use '--data -' for explicit stdin input."
-            )
-        raw_data = _resolve_data(data_arg)
-    elif json_arg:
-        if _has_stdin_data() and json_arg != "-":
-            raise click.UsageError(
-                "Cannot specify --json when data is piped via stdin. Use '--json -' for explicit stdin input."
-            )
-        content = _resolve_data(json_arg)
-        if content:
-            try:
-                json_data = json.loads(content.strip())
-            except json.JSONDecodeError as e:
-                raise CtxpException(f"Invalid JSON: {e}. File={json_arg}.") from e
-    elif _has_stdin_data():
-        stdin_content = sys.stdin.read().strip()
-        if stdin_content:
-            try:
-                json_data = json.loads(stdin_content)
-            except json.JSONDecodeError:
-                raw_data = stdin_content
-
-    return raw_data, json_data
+from zen_cli.support.payload import handle_data_input
 
 
 def _build_headers(header: list[str], content_type: str | None) -> dict[str, str] | None:
@@ -170,7 +108,7 @@ def api(
     if raise_on_404 and method not in ("GET", "DELETE"):
         raise click.UsageError("The --raise-on-404 option is only applicable for GET and DELETE methods.")
 
-    raw_data, json_data = _handle_data_input(data_arg, json_arg)
+    raw_data, json_data = handle_data_input(data_arg, json_arg)
 
     if method in ["GET", "DELETE"] and (raw_data is not None or json_data is not None):
         raise click.UsageError(

zen_cli-0.1.2/src/zen_cli/cmds/auth/status.py → zen_cli-0.1.5/src/zen_cli/cmds/auth/details.py

@@ -13,7 +13,7 @@ from zen_cli.support import auth as auth_support
     required=False,
     help="Get the auth details for a target service. Useful if per-service auth override is configured.",
 )
-def status(service: str | None) -> Any:
-    """Show current authentication details."""
+def details(service: str | None) -> Any:
+    """Show cached token, JWT claims, and org."""
     token = auth_support.oauth_token(service)
     return sglib.auth.details_from_token(token, False)

zen_cli-0.1.5/src/zen_cli/cmds/auth/status.py

@@ -0,0 +1,17 @@
+from typing import Any
+
+import click
+
+from zen_cli.support import auth as auth_support
+
+
+@click.command()
+@click.option(
+    "--service",
+    "-s",
+    required=False,
+    help="Report login status for a target service override.",
+)
+def status(service: str | None) -> Any:
+    """Show whether you are logged in, the login method, and token TTL in seconds."""
+    return auth_support.session_status(service)

zen_cli-0.1.5/src/zen_cli/cmds/credential/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service import credential
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create a credential from a JSON payload."""
+    return run_create("credential", credential.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/credential/delete.py

@@ -0,0 +1,27 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service import credential
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+def delete(id: str, confirm: bool, org: str) -> Any:
+    """Delete credential by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("credential", id)
+    ret = credential.get(id, org_id)
+    if not ret:
+        click.echo(f"Credential {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        click.confirm(f"Delete credential {ret.get('name', id)} ({id})?", abort=True)
+
+    return credential.delete(id, org_id)

zen_cli-0.1.5/src/zen_cli/cmds/deployment/create.py

@@ -0,0 +1,19 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.service import deployment
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@cli.org_id
+@payload_options
+def create(org: str, data_arg: str | None, json_arg: str | None) -> Any:
+    """Create an express deployment from a JSON payload."""
+
+    def _create(payload: Any) -> Any:
+        return deployment.create(payload, org_id=cli.get_org_id(org))
+
+    return run_create("deployment", _create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/deployment/delete.py

@@ -0,0 +1,28 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service import deployment
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+def delete(id: str, confirm: bool, org: str) -> Any:
+    """Delete express deployment by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("deployment", id)
+    ret = deployment.get(id, org_id)
+    if not ret:
+        click.echo(f"Deployment {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        label = ret.get("name") or ret.get("providerId") or id
+        click.confirm(f"Delete deployment {label} ({id})?", abort=True)
+
+    return deployment.delete(id, org_id)

zen_cli-0.1.5/src/zen_cli/cmds/entitlement/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service.broker import entitlement
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create an entitlement from a JSON payload."""
+    return run_create("entitlement", entitlement.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/entitlement/delete.py

@@ -0,0 +1,27 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service.broker import entitlement
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+def delete(id: str, confirm: bool, org: str) -> Any:
+    """Delete entitlement by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("entitlement", id)
+    ret = entitlement.get(id, org_id)
+    if not ret:
+        click.echo(f"Entitlement {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        click.confirm(f"Delete entitlement {ret.get('name', id)} ({id})?", abort=True)
+
+    return entitlement.delete(id, org_id)

zen_cli-0.1.5/src/zen_cli/cmds/group/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service.broker import pool_group
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create a pool group from a JSON payload."""
+    return run_create("group", pool_group.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/group/delete.py

@@ -0,0 +1,33 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service.broker import pool_group
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+@cli.wait
+def delete(id: str, confirm: bool, org: str, wait: str) -> Any:
+    """Delete pool group by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("group", id)
+    ret = pool_group.get(id, org_id)
+    if not ret:
+        click.echo(f"Group {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        click.confirm(f"Delete group {ret.get('name', id)} ({id})?", abort=True)
+
+    ret = pool_group.delete(id, org_id)
+
+    if wait == "0":
+        return ret
+
+    pool_group.wait_for_deleted(id, org_id, wait)

{zen_cli-0.1.2 → zen_cli-0.1.5}/src/zen_cli/cmds/login.py

@@ -89,15 +89,16 @@ def login(
 
     This command works with the current profile and will update the current profile.
     With no method flag, reuses the cached token or configured credentials.
-    Browser SSO runs only with `--browser`.
+    If neither is available, starts device-code login. Browser SSO runs only
+    with `--browser`.
 
     Inspect or refresh an existing session with `zen auth` (not this command):
-    `zen auth status`, `zen auth token`, `zen auth refresh`.
-    Per-service tokens: `zen auth status --service` / `zen auth token --service`.
+    `zen auth status`, `zen auth details`, `zen auth token`, `zen auth refresh`.
+    Per-service tokens: `zen auth details --service` / `zen auth token --service`.
 
     \b
     Examples:
-        1. Re-login with cached token or configured credentials:
+        1. Re-login with cache, configured credentials, or device code:
             zen login
         2. Login with OAuth device code (any browser, no localhost callback):
             zen login --device-code
@@ -204,7 +205,12 @@ def login(
         elif device_code:
             oauth_token = _do_device_login()
         else:
-            oauth_token = sglib.auth.login(force_refresh=refresh, verbose=verbose)
+            try:
+                oauth_token = sglib.auth.login(force_refresh=refresh, verbose=verbose)
+            except ctxp.CtxpException as e:
+                if not _is_missing_session(e):
+                    raise
+                oauth_token = _do_device_login()
     except Exception as e:
         oauth_token = None
         err = error_details(e)
@@ -234,7 +240,12 @@ def login(
         # Cache key is md5(csp config); re-save so orgId backfill does not orphan the entry.
         sglib.auth.save_auth_cache(csp, oauth_token)
 
-    return oauth_token["access_token"]
+    return None
+
+
+def _is_missing_session(err: BaseException) -> bool:
+    text = str(err)
+    return "Not logged in" in text or "Browser session expired" in text
 
 
 def _echo(msg: str) -> None:

zen_cli-0.1.5/src/zen_cli/cmds/network/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service.cockpit import network
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create a network infrastructure deployment from a JSON payload."""
+    return run_create("network", network.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/network/delete.py

@@ -0,0 +1,34 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service.cockpit import network
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+@cli.wait
+def delete(id: str, confirm: bool, org: str, wait: str) -> Any:
+    """Delete network infrastructure deployment by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("network", id)
+    ret = network.get(id, org_id)
+    if not ret:
+        click.echo(f"Network {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        label = ret.get("name") or ret.get("description") or id
+        click.confirm(f"Delete network {label} ({id})?", abort=True)
+
+    ret = network.delete(id, org_id)
+
+    if wait == "0":
+        return ret
+
+    network.wait_for_deleted(id, org_id, wait)

zen_cli-0.1.5/src/zen_cli/cmds/org/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service import org as org_svc
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create org details from a JSON payload."""
+    return run_create("org", org_svc.create, data_arg, json_arg, id_field="orgId")

zen_cli-0.1.5/src/zen_cli/cmds/pool/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service.cockpit import pool
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create a pool from a JSON payload."""
+    return run_create("pool", pool.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/provider/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service.cockpit import provider
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create a provider instance from a JSON payload."""
+    return run_create("provider", provider.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/provider/delete.py

@@ -0,0 +1,27 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service.cockpit import provider
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+def delete(id: str, confirm: bool, org: str) -> Any:
+    """Delete provider instance by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("provider", id)
+    ret = provider.get(id, org_id)
+    if not ret:
+        click.echo(f"Provider {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        click.confirm(f"Delete provider {ret.get('name', id)} ({id})?", abort=True)
+
+    return provider.delete(id, org_id)

zen_cli-0.1.5/src/zen_cli/cmds/sag/create.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import click
+
+from zen_cli.service.cockpit import sag
+from zen_cli.support.payload import payload_options, run_create
+
+
+@click.command()
+@payload_options
+def create(data_arg: str | None, json_arg: str | None) -> Any:
+    """Create a SAG deployment from a JSON payload."""
+    return run_create("sag", sag.create, data_arg, json_arg)

zen_cli-0.1.5/src/zen_cli/cmds/sag/delete.py

@@ -0,0 +1,34 @@
+from typing import Any
+
+import click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service.cockpit import sag
+
+
+@click.command()
+@click.argument("id", type=str, required=False)
+@cli.confirm
+@cli.org_id
+@cli.wait
+def delete(id: str, confirm: bool, org: str, wait: str) -> Any:
+    """Delete SAG deployment by ID"""
+
+    org_id = cli.get_org_id(org)
+    id = recent.require("sag", id)
+    ret = sag.get(id, org_id)
+    if not ret:
+        click.echo(f"SAG {id} not found; already deleted.", err=True)
+        return ""
+
+    if not confirm:
+        label = ret.get("name") or ret.get("region") or id
+        click.confirm(f"Delete SAG {label} ({id})?", abort=True)
+
+    ret = sag.delete(id, org_id)
+
+    if wait == "0":
+        return ret
+
+    sag.wait_for_deleted(id, org_id, wait)