zen-cli 0.1.7__tar.gz → 0.1.9__tar.gz

{zen_cli-0.1.7 → zen_cli-0.1.9}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.5
 Name: zen-cli
-Version: 0.1.7
-Summary: CLI for Zen Desktop Service. Designed for AI and Human.
+Version: 0.1.9
+Summary: CLI for Zen Cloud Service. Designed for AI and Human.
 Project-URL: Homepage, https://pypi.org/project/zen-cli/
 Author: zen-cli authors
 License-Expression: MIT
@@ -18,13 +18,14 @@ Requires-Dist: pyjwt
 Requires-Dist: python-dotenv
 Requires-Dist: pyyaml
 Requires-Dist: questionary
+Requires-Dist: rich-click>=1.8
 Requires-Dist: tabulate
 Requires-Dist: yumako
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'
-Requires-Dist: mypy; extra == 'dev'
+Requires-Dist: mypy==2.3.1; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: ruff==0.16.8; extra == 'dev'
 Provides-Extra: release
 Requires-Dist: build; extra == 'release'
 Requires-Dist: twine; extra == 'release'
@@ -32,43 +33,40 @@ Description-Content-Type: text/markdown
 
 # zen-cli
 
-[![PyPI](https://img.shields.io/pypi/v/zen-cli?logo=pypi&logoColor=white)](https://pypi.org/project/zen-cli/) [![Python](https://img.shields.io/badge/python-3.12%2B-3776AB?logo=python&logoColor=white)](https://www.python.org/downloads/) [![License: MIT](https://img.shields.io/badge/license-MIT-green)](LICENSE) [![PyPI downloads](https://img.shields.io/pypi/dm/zen-cli)](https://pypi.org/project/zen-cli/) [![Wheel](https://img.shields.io/pypi/wheel/zen-cli)](https://pypi.org/project/zen-cli/) [![OS](https://img.shields.io/badge/OS-macOS%20%7C%20Linux%20%7C%20Windows-informational)](https://pypi.org/project/zen-cli/) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![Checked with mypy](https://img.shields.io/badge/mypy-checked-2A6DB2)](https://mypy-lang.org/) [![Click](https://img.shields.io/badge/cli-Click%208-4584b6)](https://click.palletsprojects.com/) [![Hatch](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5)](https://github.com/pypa/hatch)
+[![PyPI](https://img.shields.io/pypi/v/zen-cli?logo=pypi&logoColor=white)](https://pypi.org/project/zen-cli/) [![Python](https://img.shields.io/badge/python-3.12%2B-3776AB?logo=python&logoColor=white)](https://www.python.org/downloads/) [![License: MIT](https://img.shields.io/badge/license-MIT-green)](LICENSE) [![PyPI downloads](https://img.shields.io/pypi/dm/zen-cli)](https://pypi.org/project/zen-cli/) [![Wheel](https://img.shields.io/pypi/wheel/zen-cli)](https://pypi.org/project/zen-cli/) [![OS](https://img.shields.io/badge/OS-macOS%20%7C%20Linux%20%7C%20Windows-informational)](https://pypi.org/project/zen-cli/) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![Checked with mypy](https://img.shields.io/badge/mypy-checked-2A6DB2)](https://mypy-lang.org/)
 
 面向 AI 和人的 Zen Cloud 命令行工具。
 
-## 目录
-
-- [试用](#试用)
-  - [前置条件](#前置条件)
-  - [安装](#安装)
-    - [Mac 与 Linux](#mac-与-linux)
-    - [Windows](#windows)
-  - [使用 CLI](#使用-cli)
-- [文档](#文档)
-- [许可证](#许可证)
-
 ## 试用
 
 ### 前置条件
 
 * Python 3.12 或更新版本
-* Pip
+* [uv](https://docs.astral.sh/uv/) 或 [pipx](https://pipx.pypa.io/)
 
 ### 安装
 
-#### Mac 与 Linux
+```text
+uv tool install zen-cli
+```
+
+或：
 
 ```text
-pip install zen-cli
+pipx install zen-cli
 ```
 
-#### Windows
+装完后若找不到 `zen`，跑 `uv tool update-shell` 或 `pipx ensurepath`，然后开一个新终端。Windows 同样适用。
+
+升级：
 
 ```text
-pip install zen-cli
+zen upgrade
+uv tool upgrade zen-cli
+pipx upgrade zen-cli
 ```
 
-如果安装 Python 时没有勾选 “Add python to PATH”，请把 Python 及其 `Scripts` 目录加入 PATH。
+`zen upgrade` 会按当前是 uv、pipx 还是普通环境选择对应方式。
 
 ### 使用 CLI
 

{zen_cli-0.1.7 → zen_cli-0.1.9}/README.md

@@ -1,42 +1,39 @@
 # zen-cli
 
-[![PyPI](https://img.shields.io/pypi/v/zen-cli?logo=pypi&logoColor=white)](https://pypi.org/project/zen-cli/) [![Python](https://img.shields.io/badge/python-3.12%2B-3776AB?logo=python&logoColor=white)](https://www.python.org/downloads/) [![License: MIT](https://img.shields.io/badge/license-MIT-green)](LICENSE) [![PyPI downloads](https://img.shields.io/pypi/dm/zen-cli)](https://pypi.org/project/zen-cli/) [![Wheel](https://img.shields.io/pypi/wheel/zen-cli)](https://pypi.org/project/zen-cli/) [![OS](https://img.shields.io/badge/OS-macOS%20%7C%20Linux%20%7C%20Windows-informational)](https://pypi.org/project/zen-cli/) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![Checked with mypy](https://img.shields.io/badge/mypy-checked-2A6DB2)](https://mypy-lang.org/) [![Click](https://img.shields.io/badge/cli-Click%208-4584b6)](https://click.palletsprojects.com/) [![Hatch](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5)](https://github.com/pypa/hatch)
+[![PyPI](https://img.shields.io/pypi/v/zen-cli?logo=pypi&logoColor=white)](https://pypi.org/project/zen-cli/) [![Python](https://img.shields.io/badge/python-3.12%2B-3776AB?logo=python&logoColor=white)](https://www.python.org/downloads/) [![License: MIT](https://img.shields.io/badge/license-MIT-green)](LICENSE) [![PyPI downloads](https://img.shields.io/pypi/dm/zen-cli)](https://pypi.org/project/zen-cli/) [![Wheel](https://img.shields.io/pypi/wheel/zen-cli)](https://pypi.org/project/zen-cli/) [![OS](https://img.shields.io/badge/OS-macOS%20%7C%20Linux%20%7C%20Windows-informational)](https://pypi.org/project/zen-cli/) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![Checked with mypy](https://img.shields.io/badge/mypy-checked-2A6DB2)](https://mypy-lang.org/)
 
 面向 AI 和人的 Zen Cloud 命令行工具。
 
-## 目录
-
-- [试用](#试用)
-  - [前置条件](#前置条件)
-  - [安装](#安装)
-    - [Mac 与 Linux](#mac-与-linux)
-    - [Windows](#windows)
-  - [使用 CLI](#使用-cli)
-- [文档](#文档)
-- [许可证](#许可证)
-
 ## 试用
 
 ### 前置条件
 
 * Python 3.12 或更新版本
-* Pip
+* [uv](https://docs.astral.sh/uv/) 或 [pipx](https://pipx.pypa.io/)
 
 ### 安装
 
-#### Mac 与 Linux
+```text
+uv tool install zen-cli
+```
+
+或：
 
 ```text
-pip install zen-cli
+pipx install zen-cli
 ```
 
-#### Windows
+装完后若找不到 `zen`，跑 `uv tool update-shell` 或 `pipx ensurepath`，然后开一个新终端。Windows 同样适用。
+
+升级：
 
 ```text
-pip install zen-cli
+zen upgrade
+uv tool upgrade zen-cli
+pipx upgrade zen-cli
 ```
 
-如果安装 Python 时没有勾选 “Add python to PATH”，请把 Python 及其 `Scripts` 目录加入 PATH。
+`zen upgrade` 会按当前是 uv、pipx 还是普通环境选择对应方式。
 
 ### 使用 CLI
 

{zen_cli-0.1.7 → zen_cli-0.1.9}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "zen-cli"
-version = "0.1.7"
-description = "CLI for Zen Desktop Service. Designed for AI and Human."
+version = "0.1.9"
+description = "CLI for Zen Cloud Service. Designed for AI and Human."
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -14,6 +14,7 @@ authors = [{ name = "zen-cli authors" }]
 dependencies = [
     "authlib",
     "click>=8.1",
+    "rich-click>=1.8",
     "coloredlogs",
     "httpx2",
     "mcp>=2",
@@ -28,7 +29,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["build", "pre-commit", "ruff", "mypy"]
+dev = ["build", "pre-commit", "ruff==0.16.8", "mypy==2.3.1"]
 release = ["build", "twine"]
 
 [project.scripts]
@@ -68,11 +69,12 @@ module = [
     "httpx2",
     "httpx2.*",
     "coloredlogs",
+    "tabulate",
 ]
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
-module = ["zen_cli.cmds", "zen_cli.cmds.*", "zen_cli.ctxp", "zen_cli.ctxp.*"]
+module = ["zen_cli", "zen_cli.cli", "zen_cli.cmds", "zen_cli.cmds.*", "zen_cli.ctxp", "zen_cli.ctxp.*"]
 disallow_untyped_decorators = false
 
 [[tool.mypy.overrides]]

zen_cli-0.1.9/src/zen_cli/__init__.py

@@ -0,0 +1 @@
+"""zen-cli package."""

{zen_cli-0.1.7 → zen_cli-0.1.9}/src/zen_cli/cli.py

@@ -4,7 +4,7 @@ import sys
 from pathlib import Path
 from typing import Any
 
-import click
+import rich_click as click
 from dotenv import load_dotenv
 from yumako import env
 
@@ -98,7 +98,7 @@ def _check_upgrade() -> None:
     "--mdc",
     type=str,
     required=False,
-    help=("MDC name from profile zds.mdcs (e.g. beijing, singapore). Default is the first zds.mdcs entry."),
+    help=("MDC name from profile zcs.mdcs (e.g. beijing, singapore). Default is the first zcs.mdcs entry."),
 )
 @click.option(
     "--check-upgrade/--no-check-upgrade",
@@ -174,6 +174,7 @@ def main() -> None:
     load_dotenv(".env")
     if not logger.color_enabled():
         CONTEXT_SETTINGS["color"] = False
+        CONTEXT_SETTINGS["rich_help_config"] = {"color_system": None, "force_terminal": False}
     if os.environ.get("_ZEN_COMPLETE"):
         ctxp.telemetry.disable()
     ctxp.init_cli(main_cli=cli, commands_dir=str(_COMMANDS_DIR))

{zen_cli-0.1.7 → zen_cli-0.1.9}/src/zen_cli/cmds/activity/get.py

@@ -1,20 +1,20 @@
-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 activity
-
-
-@click.command()
-@cli.org_id
-@click.argument("id", type=str, required=False)
-def get(org: str, id: str) -> Any:
-    """Get a system activity by ID. Without an argument, use the recent activity."""
-    id = recent.require("activity", id)
-    org_id = None if org == "all" else cli.get_org_id(org)
-    ret = activity.get(id, org_id=org_id)
-    if ret:
-        return ret
-    return "", 1
+from typing import Any
+
+import rich_click as click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service import activity
+
+
+@click.command()
+@cli.org_id
+@click.argument("id", type=str, required=False)
+def get(org: str, id: str) -> Any:
+    """Get a system activity by ID. Without an argument, use the recent activity."""
+    id = recent.require("activity", id)
+    org_id = None if org == "all" else cli.get_org_id(org)
+    ret = activity.get(id, org_id=org_id)
+    if ret:
+        return ret
+    return "", 1

{zen_cli-0.1.7 → zen_cli-0.1.9}/src/zen_cli/cmds/activity/list.py

@@ -1,138 +1,138 @@
-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 activity
-from zen_cli.support.activity import format_activity_table
-
-_RESOURCE_TYPES = [
-    "ORG",
-    "ORG_PREFERENCE",
-    "DATACENTER",
-    "POOL",
-    "ENTITLEMENT",
-    "VM",
-    "EDGE",
-    "SAG",
-    "TASK",
-    "PROVIDER_INSTANCE",
-    "NET_INFRA",
-    "EXPRESS_DEPLOYMENT",
-    "POOL_GROUP",
-    "IMAGE",
-    "SITE",
-    "SPEC",
-    "SESSION",
-    "VMAGENT",
-    "NOTIFICATION",
-]
-
-
-@click.command(name="list")
-@cli.org_id
-@click.option("--service-name", type=str, required=False, help="Filter by service name.")
-@click.option("--code", type=str, required=False, help="Filter by activity code.")
-@click.option("--trace-id", type=str, required=False, help="Filter by trace ID.")
-@click.option("--span-id", type=str, required=False, help="Filter by span ID.")
-@click.option("--resource-id", type=str, required=False, help="Filter by resource ID.")
-@click.option("--resource-name", type=str, required=False, help="Filter by resource name.")
-@click.option("--task-id", type=str, required=False, help="Filter by task ID.")
-@click.option("--parent-id", type=str, required=False, help="Filter by parent activity ID.")
-@click.option("--initiator", type=str, required=False, help="Filter by initiator.")
-@click.option(
-    "--initiator-type",
-    type=click.Choice(["SYSTEM", "OPS", "CUSTOMER_ADMIN", "USER"], case_sensitive=False),
-    required=False,
-    help="Filter by initiator type.",
-)
-@click.option(
-    "--resource-type",
-    type=click.Choice(_RESOURCE_TYPES, case_sensitive=False),
-    required=False,
-    help="Filter by resource type.",
-)
-@click.option(
-    "--severity",
-    type=click.Choice(["CRITICAL", "WARNING", "INFO", "TRIVIAL"], case_sensitive=False),
-    required=False,
-    help="Filter by severity.",
-)
-@click.option(
-    "--status",
-    type=click.Choice(
-        ["QUEUED", "START", "PROGRESS", "SUCCESS", "ERROR", "CANCELLED"],
-        case_sensitive=False,
-    ),
-    required=False,
-    help="Filter by status.",
-)
-@click.option(
-    "--timestamp-from",
-    type=str,
-    required=False,
-    help="Inclusive lower bound (ISO-8601).",
-)
-@click.option(
-    "--timestamp-to",
-    type=str,
-    required=False,
-    help="Inclusive upper bound (ISO-8601).",
-)
-@cli.sort
-@cli.limit
-@cli.formatter(format_activity_table)
-def list_activities(
-    org: str,
-    service_name: str,
-    code: str,
-    trace_id: str,
-    span_id: str,
-    resource_id: str,
-    resource_name: str,
-    task_id: str,
-    parent_id: str,
-    initiator: str,
-    initiator_type: str,
-    resource_type: str,
-    severity: str,
-    status: str,
-    timestamp_from: str,
-    timestamp_to: str,
-    sort: str,
-    limit: int,
-) -> Any:
-    """List system activities."""
-    org_id = None if org == "all" else cli.get_org_id(org)
-    if initiator_type:
-        initiator_type = initiator_type.upper()
-    if resource_type:
-        resource_type = resource_type.upper()
-    if severity:
-        severity = severity.upper()
-    if status:
-        status = status.upper()
-
-    ret = activity.list(
-        org_id=org_id,
-        service_name=service_name,
-        code=code,
-        trace_id=trace_id,
-        span_id=span_id,
-        resource_id=resource_id,
-        resource_name=resource_name,
-        task_id=task_id,
-        parent_id=parent_id,
-        initiator=initiator,
-        initiator_type=initiator_type,
-        resource_type=resource_type,
-        severity=severity,
-        status=status,
-        timestamp_from=timestamp_from,
-        timestamp_to=timestamp_to,
-        sort=sort,
-        limit=limit,
-    )
-    recent.helper.default_list(ret, "activity")
-    return ret
+from typing import Any
+
+import rich_click as click
+
+import zen_cli.sglib.cli_options as cli
+from zen_cli.ctxp import recent
+from zen_cli.service import activity
+from zen_cli.support.activity import format_activity_table
+
+_RESOURCE_TYPES = [
+    "ORG",
+    "ORG_PREFERENCE",
+    "DATACENTER",
+    "POOL",
+    "ENTITLEMENT",
+    "VM",
+    "EDGE",
+    "SAG",
+    "TASK",
+    "PROVIDER_INSTANCE",
+    "NET_INFRA",
+    "EXPRESS_DEPLOYMENT",
+    "POOL_GROUP",
+    "IMAGE",
+    "SITE",
+    "SPEC",
+    "SESSION",
+    "VMAGENT",
+    "NOTIFICATION",
+]
+
+
+@click.command(name="list")
+@cli.org_id
+@click.option("--service-name", type=str, required=False, help="Filter by service name.")
+@click.option("--code", type=str, required=False, help="Filter by activity code.")
+@click.option("--trace-id", type=str, required=False, help="Filter by trace ID.")
+@click.option("--span-id", type=str, required=False, help="Filter by span ID.")
+@click.option("--resource-id", type=str, required=False, help="Filter by resource ID.")
+@click.option("--resource-name", type=str, required=False, help="Filter by resource name.")
+@click.option("--task-id", type=str, required=False, help="Filter by task ID.")
+@click.option("--parent-id", type=str, required=False, help="Filter by parent activity ID.")
+@click.option("--initiator", type=str, required=False, help="Filter by initiator.")
+@click.option(
+    "--initiator-type",
+    type=click.Choice(["SYSTEM", "OPS", "CUSTOMER_ADMIN", "USER"], case_sensitive=False),
+    required=False,
+    help="Filter by initiator type.",
+)
+@click.option(
+    "--resource-type",
+    type=click.Choice(_RESOURCE_TYPES, case_sensitive=False),
+    required=False,
+    help="Filter by resource type.",
+)
+@click.option(
+    "--severity",
+    type=click.Choice(["CRITICAL", "WARNING", "INFO", "TRIVIAL"], case_sensitive=False),
+    required=False,
+    help="Filter by severity.",
+)
+@click.option(
+    "--status",
+    type=click.Choice(
+        ["QUEUED", "START", "PROGRESS", "SUCCESS", "ERROR", "CANCELLED"],
+        case_sensitive=False,
+    ),
+    required=False,
+    help="Filter by status.",
+)
+@click.option(
+    "--timestamp-from",
+    type=str,
+    required=False,
+    help="Inclusive lower bound (ISO-8601).",
+)
+@click.option(
+    "--timestamp-to",
+    type=str,
+    required=False,
+    help="Inclusive upper bound (ISO-8601).",
+)
+@cli.sort
+@cli.limit
+@cli.formatter(format_activity_table)
+def list_activities(
+    org: str,
+    service_name: str,
+    code: str,
+    trace_id: str,
+    span_id: str,
+    resource_id: str,
+    resource_name: str,
+    task_id: str,
+    parent_id: str,
+    initiator: str,
+    initiator_type: str,
+    resource_type: str,
+    severity: str,
+    status: str,
+    timestamp_from: str,
+    timestamp_to: str,
+    sort: str,
+    limit: int,
+) -> Any:
+    """List system activities."""
+    org_id = None if org == "all" else cli.get_org_id(org)
+    if initiator_type:
+        initiator_type = initiator_type.upper()
+    if resource_type:
+        resource_type = resource_type.upper()
+    if severity:
+        severity = severity.upper()
+    if status:
+        status = status.upper()
+
+    ret = activity.list(
+        org_id=org_id,
+        service_name=service_name,
+        code=code,
+        trace_id=trace_id,
+        span_id=span_id,
+        resource_id=resource_id,
+        resource_name=resource_name,
+        task_id=task_id,
+        parent_id=parent_id,
+        initiator=initiator,
+        initiator_type=initiator_type,
+        resource_type=resource_type,
+        severity=severity,
+        status=status,
+        timestamp_from=timestamp_from,
+        timestamp_to=timestamp_to,
+        sort=sort,
+        limit=limit,
+    )
+    recent.helper.default_list(ret, "activity")
+    return ret