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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.3.1.dev2
+Version: 0.3.2.dev1
 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]>=0.7.0; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]>=1.1.0; extra == 'dataset'
+Requires-Dist: instance-repo[oss]>=0.7.0; 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.dev2 → ap_client-0.3.2.dev1}/ap_client/api.py

@@ -294,25 +294,6 @@ def _secret_ws_params(workspace_id: Optional[str]) -> Optional[dict]:
     return {"workspace_id": workspace_id} if workspace_id else None
 
 
-def _split_paged(payload: Any) -> tuple[list[dict], dict]:
-    """Split a ``PagedSuccess`` envelope into ``(records, pagination)``.
-
-    ``PagedSuccess`` is ``{code,message,data:[...],pagination:{total,page,page_size}}``.
-    A bare list (or a null ``data``) yields an empty pagination dict so callers
-    can render results without probing the response shape.
-    """
-    if isinstance(payload, list):
-        return [item for item in payload if isinstance(item, dict)], {}
-    if not isinstance(payload, dict):
-        return [], {}
-    records = payload.get("data")
-    pagination = payload.get("pagination")
-    return (
-        [item for item in (records or []) if isinstance(item, dict)],
-        pagination if isinstance(pagination, dict) else {},
-    )
-
-
 class APIClient:
     """Agent Platform API client."""
 
@@ -733,35 +714,8 @@ class APIClient:
         return self._get(f"/templates/{quote(name)}", params=params)
 
     def list_benchmarks(self) -> list:
-        """List all benchmarks from the central registry, preserving legacy IDs."""
-        benchmarks = []
-        page = 1
-        page_size = 200
-        # 与 CLI dataset list 的自动翻页同口径:100 页上限,防分页异常导致死循环。
-        max_pages = 100
-        while page <= max_pages:
-            payload = self._get(
-                "/apis/v1/benchmarks", params={"page": page, "page_size": page_size}
-            )
-            records, pagination = _split_paged(payload)
-            for record in records:
-                item = dict(record)
-                if "source_id" in item:
-                    item.setdefault("id", item["source_id"])
-                benchmarks.append(item)
-            if not records or not pagination:
-                break
-            try:
-                total = int(pagination.get("total"))
-            except (TypeError, ValueError):
-                total = None
-            if total is not None:
-                if len(benchmarks) >= total:
-                    break
-            elif len(records) < page_size:
-                break
-            page += 1
-        return benchmarks
+        """List all active benchmarks from the local benchmark registry."""
+        return self._get("/benchmarks")
 
     def get_benchmark(self, name: str) -> dict:
         """Get a single benchmark by exact name."""
@@ -896,16 +850,7 @@ class APIClient:
             "instance_ids": all_instance_ids,
         }
 
-    # ==================== Dataset series (apiserver dataset domain) ====================
-    #
-    # 这一节对接 Go apiserver 的 dataset 领域(/apis/v1/datasets/...),与上面
-    # ossdata 目录的 /api/datasets 路由完全无关。
-    #
-    # **dataset 领域的控制面读写全部在 InstanceRepo SDK 上**(见
-    # docs/ap-cli-dataset-refactor-design.md §9.5):迁移期加进这里的 registry 方法、
-    # 以及最后三条"push 前检查 + publish-status"的旧读,都已随迁移删除。
-    # 本文件现在只服务旧 ossdata 路径(`dataset list --legacy`、弃用的
-    # `dataset versions/instances`、`job create --dataset`)。
+    # ==================== Meta operations ====================
 
     def list_meta_models(self) -> dict:
         """模型词表（apiserver 权威源 GET /apis/v1/meta-models，返回 {items:[...]}）。"""

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

@@ -24,10 +24,8 @@ from ap_client.api import (
     set_verbose_override,
 )
 from ap_client.config import ENV_VAR_SPECS, ConfigurationError, _parse_bool, normalize_output_format
-from ap_client.dataset_commands import register as _register_dataset_commands
 from ap_client.exporter import export_group, export_job
-from ap_client.fs_commands import register as _register_fs_commands
-from ap_client.instance_commands import register as _register_instance_commands
+from ap_client.irepo_commands import register as _register_dataset_repo
 from ap_client.managed_ak import (
     ManagedAKProtocolError,
     require_managed_ak_ack,
@@ -155,11 +153,8 @@ app.add_typer(meta_job_type_app, name="meta-job-type")
 app.add_typer(benchmark_app, name="benchmark")
 app.add_typer(checkpoint_app, name="checkpoint")
 
-# Dataset 领域(见 docs/ap-cli-dataset-refactor-design.md):
-# ap dataset version/split/access 嵌套在 dataset 下;instance/fs 是一等资源。
-_register_dataset_commands(dataset_app)
-_register_instance_commands(app)
-_register_fs_commands(app)
+# ap dataset repo:透传 instance_repo CLI(见 ap_client/irepo_commands.py)
+_register_dataset_repo(dataset_app)
 
 _PAI_RUNTIME_ENV_TAGS: tuple[tuple[str, str], ...] = (
     ("DLC_JOB_ID", "dlc_job_id"),
@@ -815,45 +810,26 @@ 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, or pretty-printed across
-    multiple lines when the one-liner would not fit. Falls back to JSON for
+    dict/list fields are shown as compact one-liners. Falls back to JSON for
     non-dict payloads.
     """
     if not isinstance(data, dict):
         _print_json(data)
         return
-    rows: list[tuple[str, str]] = []
+    scalar_rows: list[tuple[str, Any]] = []
+    nested_rows: list[tuple[str, Any]] = []
     for key, value in data.items():
         if isinstance(value, (dict, list)):
-            rows.append((key, _format_nested_detail(value)))
+            nested_rows.append((key, value))
         elif key == "image" and isinstance(value, str):
-            rows.append((key, _shorten_image(value)))
-        elif value is None:
-            continue
+            scalar_rows.append((key, _shorten_image(value)))
         else:
-            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}")
+            scalar_rows.append((key, value))
+    _print_key_values(scalar_rows + nested_rows, skip_empty=False)
 
 
 def _print_template_get_plain(t: dict) -> None:
@@ -963,7 +939,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, *, max_len: int = _PLAIN_VALUE_PREVIEW) -> str:
+def _format_plain_value(value: Any) -> str:
     if value is None:
         return ""
     if isinstance(value, (dict, list)):
@@ -971,9 +947,9 @@ def _format_plain_value(value: Any, *, max_len: int = _PLAIN_VALUE_PREVIEW) -> s
     else:
         text = str(value)
     text = text.replace("\r", "\\r").replace("\n", "\\n")
-    if not max_len or len(text) <= max_len:
+    if len(text) <= _PLAIN_VALUE_PREVIEW:
         return text
-    return f"{text[: max_len - 3]}..."
+    return f"{text[: _PLAIN_VALUE_PREVIEW - 3]}..."
 
 
 def _print_key_values(rows: list[tuple[str, Any]], *, skip_empty: bool = True) -> None:
@@ -2092,17 +2068,24 @@ def template_fetch(
 
 # ==================== Dataset operations ====================
 
-# 设计 §6 / 上游 §13.2:`ap dataset versions` 与 `ap dataset instances` 行为保持不变
-# (仍打 ossdata 路由,`ap job create` 的配套流程依赖它们),只追加固定弃用文案。
-# 文案**只写 stderr**——JSON/YAML 的 stdout 必须仍可被 json.loads 直接消费。
-_DATASET_VERSIONS_DEPRECATION = (
-    "Warning: `ap dataset versions` is deprecated.\n"
-    "Use `ap dataset version list --dataset <dataset>` instead."
-)
-_DATASET_INSTANCES_DEPRECATION = (
-    "Warning: `ap dataset instances` is deprecated.\n"
-    "Use `ap instance list --dataset <dataset> --split <split> [--version <version>]` instead."
-)
+
+@dataset_app.command("list")
+def dataset_list(
+    search: Optional[str] = typer.Argument(None, help="Search keyword"),
+    output_format: str = typer.Option(
+        None,
+        "--format",
+        help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
+    ),
+):
+    """List all datasets."""
+    output_format = _normalize_output_format(output_format, keep_table=True)
+    client = get_client()
+    result = client.list_all_datasets(search)
+    if output_format == "table":
+        _print_records_table(result)
+    else:
+        _print_formatted(result, output_format)
 
 
 @dataset_app.command("versions")
@@ -2114,9 +2097,8 @@ def dataset_versions(
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ):
-    """List dataset versions (deprecated: use 'ap dataset version list')."""
+    """List dataset versions."""
     output_format = _normalize_output_format(output_format, keep_table=True)
-    _emit_progress(_DATASET_VERSIONS_DEPRECATION)
     client = get_client()
     versions = client.list_dataset_versions(dataset)
     if output_format == "table":
@@ -2136,9 +2118,8 @@ def dataset_instances(
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ):
-    """List dataset instances (deprecated: use 'ap instance list')."""
+    """List dataset instances."""
     output_format = _normalize_output_format(output_format, keep_table=True)
-    _emit_progress(_DATASET_INSTANCES_DEPRECATION)
     client = get_client()
     result = client.list_all_dataset_instances(dataset_version)
     if output_format == "table":
@@ -4931,7 +4912,7 @@ def benchmark_list(
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ):
-    """List benchmarks from the central benchmark registry."""
+    """List benchmarks from the local benchmark registry."""
     output_format = _normalize_output_format(output_format, keep_table=True)
     client = get_client()
     result = client.list_benchmarks()

ap_client-0.3.2.dev1/ap_client/irepo_commands.py

@@ -0,0 +1,131 @@
+"""``ap dataset repo`` — InstanceRepo CLI 的原样透传入口。
+
+设计见 docs/ap-cli-irepo-integration-design.md:``repo`` 之后的原始参数
+原样交给 ``instance_repo.cli.cli_main``,参数解析、help 文本、错误码、
+退出码全部来自 irepo 自身。irepo 发版新增/修改命令时本模块无需改动,
+升级 instance-repo 包即可。
+
+Typer/Click 会在生成 ``ctx.args`` 前消费第一个 ``--`` 分隔符,因此
+透传前从原始 argv 把它恢复回去,保证 ``ap dataset repo validate -- -foo``
+这类"路径以 ``-`` 开头"的用法与原生 irepo 行为一致。
+
+instance-repo 以带 OSS extra 的公网 PyPI 包作为 ap-client 的 dataset 可选依赖。
+这里采用懒加载,使未安装 extra 时其它 ap 子命令仍可正常使用,并给出
+明确的安装提示。
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+
+import typer
+
+_REPO_HELP = (
+    "Dataset repository operations. Arguments match the native InstanceRepo CLI exactly; "
+    "run 'ap dataset repo <cmd> --help' for details"
+)
+
+_INSTALL_HINT = (
+    "ap dataset repo requires Dataset authoring support, which is not installed in "
+    "this environment.\n"
+    "Install it with: pip install 'ap-client[dataset]'"
+)
+
+_AP_TOKEN_ENV_NAMES = ("AP_API_KEY", "AP_API_KEYS", "AP_TOKEN_KEY")
+
+
+def _inject_irepo_env() -> None:
+    """把 ap 的连接/认证配置翻译成 irepo 的环境变量。
+
+    注入语义均为 setdefault——用户显式设置的 irepo 变量(INSTANCEREPO_*、
+    IR_*)优先,ap 只兜底:
+
+    - ``IR_API_ENV`` ← ap 的 ``Env`` 头(由 --cluster / AP_CLUSTER 推导,
+      或 AP_HEADERS 显式指定)。无条件注入:irepo 的 api_env 注册表会据此
+      解析控制面 URL 和 Env 头,与 ap 自身的网关路由保持一致。
+    - ``INSTANCEREPO_API_BASE`` ← ap 解析后的 base_url。instance-repo 0.7
+      不再内置控制面地址,因此默认、自定义和 local 地址都必须注入。
+    - ``INSTANCEREPO_TOKEN`` ← ap 解析出的单个 API Key。
+    """
+    from ap_client import api as _api
+    from ap_client.config import Config, ConfigurationError
+
+    try:
+        cfg = Config.from_env(cluster=_api._cluster_override)
+        token = cfg.token_key
+    except ConfigurationError:
+        # token 不合法(如服务端用的逗号分隔 AP_API_KEYS)不影响连接注入:
+        # 掩掉 token 变量重新解析,本次仅跳过 INSTANCEREPO_TOKEN 注入。
+        masked = {name: os.environ.pop(name) for name in _AP_TOKEN_ENV_NAMES if name in os.environ}
+        try:
+            cfg = Config.from_env(cluster=_api._cluster_override)
+        finally:
+            os.environ.update(masked)
+        token = None
+
+    env_header = next((v for k, v in cfg.headers.items() if k.lower() == "env"), None)
+    if env_header:
+        os.environ.setdefault("IR_API_ENV", env_header)
+    os.environ.setdefault("INSTANCEREPO_API_BASE", cfg.base_url)
+    if token:
+        os.environ.setdefault("INSTANCEREPO_TOKEN", token)
+
+
+def _restore_double_dash(args: list[str]) -> list[str]:
+    """把被 Click 消费的 ``--`` 分隔符插回透传参数。
+
+    Click 生成 ``ctx.args`` 前会消费第一个 ``--``,于是
+    ``ap dataset repo validate -- -foo`` 实际只透传 ``["validate", "-foo"]``,
+    irepo 的 argparse 会把 ``-foo`` 识别成选项而报缺 ``dir`` 参数
+    (退出码 2);原生 irepo 则靠 ``--`` 把它解析为位置参数。
+
+    恢复依据:Click 消费 ``--`` 后,其后的原始 token 会原样落在
+    ``ctx.args`` 尾部。据此从 ``sys.argv`` 找回 ``--`` 的位置并插回;
+    从左到右尝试每个 ``--``,尾部对不上的(``--`` 与 irepo 无关的
+    病态输入)跳过,全部对不上时原样返回,不改变既有行为。
+    """
+    for idx, token in enumerate(sys.argv):
+        if token != "--":
+            continue
+        tail = sys.argv[idx + 1 :]
+        if not tail:
+            return [*args, "--"]
+        if len(tail) <= len(args) and args[-len(tail) :] == tail:
+            split = len(args) - len(tail)
+            return [*args[:split], "--", *args[split:]]
+    return args
+
+
+def dataset_repo_passthrough(ctx: typer.Context) -> None:
+    """把 ``ap dataset repo`` 之后的参数原样透传给 instance_repo CLI。"""
+    try:
+        from instance_repo.cli import cli_main
+    except ImportError:
+        typer.echo(_INSTALL_HINT, err=True)
+        raise typer.Exit(code=2) from None
+
+    _inject_irepo_env()
+    try:
+        rc = cli_main(_restore_double_dash(list(ctx.args)))
+    except SystemExit as exc:
+        # argparse 的 --help / 参数错误以 SystemExit(int) 抛出,原样透传退出码;
+        # irepo 自身也会 raise SystemExit(str)(如 ref 段数错误),按 CPython
+        # 语义把消息打到 stderr、退出码 1,与原生 irepo 行为逐字节对齐。
+        if isinstance(exc.code, int):
+            raise typer.Exit(code=exc.code) from None
+        if exc.code:
+            typer.echo(str(exc.code), err=True)
+        raise typer.Exit(code=1) from None
+    if rc:
+        raise typer.Exit(code=rc)
+
+
+def register(app: typer.Typer) -> None:
+    """把 InstanceRepo 透传命令挂到 ``ap dataset`` 下。"""
+    app.command(
+        "repo",
+        help=_REPO_HELP,
+        context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+        add_help_option=False,  # --help 留给 InstanceRepo 的 argparse 处理
+    )(dataset_repo_passthrough)

{ap_client-0.3.1.dev2 → ap_client-0.3.2.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.3.1.dev2"
+version = "0.3.2.dev1"
 description = "Agent Platform API Client & CLI"
 readme = { text = "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.", content-type = "text/markdown" }
 requires-python = ">=3.10"
@@ -18,10 +18,10 @@ dependencies = [
 
 [project.optional-dependencies]
 dataset = [
-    "instance-repo[oss]>=1.1.0",
+    "instance-repo[oss]>=0.7.0",
 ]
 all = [
-    "instance-repo[oss]>=1.1.0",
+    "instance-repo[oss]>=0.7.0",
 ]
 
 [project.scripts]