ap-client 0.5.1.dev5__tar.gz → 0.5.1.dev6__tar.gz

{ap_client-0.5.1.dev5 → ap_client-0.5.1.dev6}/PKG-INFO

@@ -1,17 +1,18 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.5.1.dev5
+Version: 0.5.1.dev6
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
+Requires-Dist: irepo-artifact==0.2.2
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests>=2.28.0
 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.3.2.dev5; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.1.4; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]==1.3.2.dev5; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.1.4; 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.5.1.dev5 → ap_client-0.5.1.dev6}/ap_client/akpool_commands.py

@@ -63,7 +63,9 @@ def _fmt(output_format: Optional[str]) -> str:
 def _check_time_range(value: str) -> str:
     normalized = str(value or "").strip().lower()
     if not _TIME_RANGE_RE.fullmatch(normalized):
-        raise typer.BadParameter(f"--time-range must be a duration like 30s/5m/1h, got {value!r}")
+        raise typer.BadParameter(
+            f"--time-range must be a duration like 30s/5m/1h, got {value!r}"
+        )
     return normalized
 
 

{ap_client-0.5.1.dev5 → ap_client-0.5.1.dev6}/ap_client/api.py

@@ -123,6 +123,14 @@ _UNSET: Any = object()
 # when aggregation runs later.
 EXTRA_AGG_OPS = ("avg", "sum")
 
+# Others 占位：apiserver 词表不返回，CLI 展示与 get_meta_model("Others") 兜底用。
+_OTHERS_MODEL = {
+    "name": "Others",
+    "series_name": "",
+    "source_id": "",
+    "series_id": "",
+}
+
 
 def _merge_meta_tags(
     tags: Optional[list],
@@ -968,19 +976,18 @@ class APIClient:
     # `dataset versions/instances`、`job create --dataset`)。
 
     def list_meta_models(self) -> dict:
-        """从 meta-model 标签目录获取可用模型，保留 list 的 items 响应形状。"""
-        items = self.get_meta_tags("meta-model").get("items") or []
-        return {
-            "items": [
-                {**item, "name": item["value"]}
-                for item in items
-                if item.get("value") and item.get("is_enabled", True)
-            ]
-        }
+        """模型词表（apiserver 权威源 GET /apis/v1/meta-models，返回 {items:[...]}）。"""
+        return self._get_central("/meta-models")
 
     def get_meta_model(self, name: str) -> dict:
-        """从启用的 meta-model 标签值中按 value 或 source_id 查找。"""
-        result = self.list_meta_models()
+        """单个模型详情（按 name 或 source_id 从 apiserver list 过滤；Others 返回占位）。
+
+        apiserver 没有单模型详情接口，客户端从 list 结果过滤；找不到 raise
+        APIError 404，与原 cluster AP /meta/models/{name} 行为一致。
+        """
+        if name == "Others":
+            return dict(_OTHERS_MODEL)
+        result = self._get_central("/meta-models")
         for item in result.get("items") or []:
             if item.get("name") == name or item.get("source_id") == name:
                 return item
@@ -1046,13 +1053,43 @@ class APIClient:
         return result
 
     def list_meta_job_types(self) -> dict:
-        """从 meta-job-type 标签目录获取启用的任务类型，不补本地展示值。"""
-        items = self.get_meta_tags("meta-job-type").get("items") or []
+        """任务类型词表（目录驱动：GET /apis/v1/meta-tags?key=meta-job-type）。
+
+        仅取目录中 ``is_enabled`` 的值（缺失按启用解析）+ 末尾 ``Others``
+        兜底行；``default`` 为 ``Eval-Eval``（在目录中时，否则空串）。
+        目录请求失败或为空 → 回退本地常量（Eval-Eval + Others，fail-open），
+        并在 stderr 打一行告警，词表降级可见但不阻塞命令。
+        """
+        error: Exception | None = None
+        try:
+            items = self.get_meta_tags("meta-job-type").get("items") or []
+        except Exception as exc:  # fail-open：目录不可用不阻塞词表命令
+            error = exc
+            items = []
+        if items:
+            options = []
+            for item in items:
+                value = str(item.get("value") or "").strip()
+                if value and item.get("is_enabled", True):
+                    options.append({"value": value})
+            if options:
+                default = "Eval-Eval" if any(o["value"] == "Eval-Eval" for o in options) else ""
+                return {
+                    "meta_job_type": {
+                        "default": default,
+                        "options": [*options, {"value": "Others"}],
+                    }
+                }
+        _write_stderr(
+            [
+                "warning: meta-job-type catalog unavailable or empty, "
+                f"falling back to local constants (reason={error or 'empty catalog'})"
+            ]
+        )
         return {
             "meta_job_type": {
-                "options": [
-                    item for item in items if item.get("value") and item.get("is_enabled", True)
-                ],
+                "default": "Eval-Eval",
+                "options": [{"value": "Eval-Eval"}, {"value": "Others"}],
             }
         }
 

{ap_client-0.5.1.dev5 → ap_client-0.5.1.dev6}/ap_client/cli.py

@@ -15,6 +15,7 @@ import typer
 from ap_client import __version__, get_client, get_config, tbb
 from ap_client.akpool_commands import register as _register_akpool_commands
 from ap_client.api import (
+    _OTHERS_MODEL,
     APIError,
     PaginationProtocolError,
     _is_sensitive_key,
@@ -25,7 +26,7 @@ from ap_client.api import (
 )
 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.exporter import export_group, export_job, export_jobs
 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.managed_ak import (
@@ -2688,22 +2689,23 @@ def meta_model_list(
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ):
-    """List enabled meta-model tag values."""
+    """List meta model options (apiserver data + Others as the last row)."""
     output_format = _normalize_output_format(output_format, keep_table=True)
     result = get_client().list_meta_models()
     items = result.get("items") or []
-    options = items
+    options = [*items, dict(_OTHERS_MODEL)]  # 末尾固定追加 Others 兜底手动输入
     if output_format in ("plain", "table"):
         rows = [
             {
                 "name": m.get("name") or "-",
-                "desc": m.get("desc_l1") or "-",
+                "series": m.get("series_name") or "-",
             }
             for m in options
         ]
-        _print_plain_table(rows, [("name", "name"), ("desc", "desc")])
+        _print_plain_table(rows, [("name", "name"), ("series", "series")])
     else:
-        # JSON/YAML 保持 {meta_model:{options}}；每项保留目录字段及 name 别名。
+        # json/yaml 包装成 {meta_model:{options}}（原 cluster AP 格式；
+        # default 已随 meta-models default 逻辑移除而下线）
         _print_formatted({"meta_model": {"options": options}}, output_format)
 
 
@@ -2794,20 +2796,21 @@ def meta_job_type_list(
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ):
-    """List enabled meta-job-type tag values."""
+    """List meta job type options (catalog-driven; falls back to Eval-Eval/Others)."""
     output_format = _normalize_output_format(output_format, keep_table=True)
     result = get_client().list_meta_job_types()
     info = result.get("meta_job_type") or {}
     options = info.get("options") or []
+    default = info.get("default") or ""
     if output_format in ("plain", "table"):
         rows = [
             {
                 "value": o.get("value") or "-",
-                "desc": o.get("desc_l1") or "-",
+                "default": "*" if o.get("value") and o.get("value") == default else "",
             }
             for o in options
         ]
-        _print_plain_table(rows, [("value", "value"), ("desc", "desc")])
+        _print_plain_table(rows, [("value", "value"), ("default", "default")])
     else:
         _print_formatted(result, output_format)
 
@@ -4876,10 +4879,47 @@ def job_artifacts(
         _print_formatted(results, output_format)
 
 
+def _validate_export_timeout(value: float) -> float:
+    import math
+
+    if not math.isfinite(value) or value <= 0:
+        raise typer.BadParameter("Timeout must be a finite number greater than zero")
+    return value
+
+
+def _export_channel_reporter(emit):
+    """Report completed Jobs, including callbacks from Group worker threads."""
+    from threading import Lock
+
+    from rich.text import Text
+
+    counts = {"oss": 0, "proxy": 0}
+    lock = Lock()
+
+    def report(job_id, status, channel):
+        with lock:
+            suffix = ""
+            if status == "downloaded" and channel in counts:
+                counts[channel] += 1
+                suffix = f"  channel={channel}"
+            emit(Text(f"{job_id}  {status}{suffix}"))
+
+    return report, counts
+
+
 @job_app.command("export")
 def job_export(
-    job_id: str = typer.Argument(..., help="Job ID"),
+    job_id: str = typer.Argument(..., help="Job ID or comma-separated Job IDs"),
     output: Optional[Path] = typer.Option(None, "--output", "-o", help="Export directory"),
+    workers: int = typer.Option(
+        1, "--workers", "-w", min=1, help="Number of concurrent export workers"
+    ),
+    timeout: float = typer.Option(
+        300,
+        "--timeout",
+        callback=_validate_export_timeout,
+        help="SDK request timeout in seconds, not the total export duration",
+    ),
     logs: bool = typer.Option(False, "--logs", help="Include container logs"),
     events: bool = typer.Option(False, "--events", help="Include events"),
     no_extract_artifacts: bool = typer.Option(
@@ -4889,17 +4929,50 @@ def job_export(
     ),
 ):
     """Export job artifacts to a local directory. Use --logs/--events to include logs and events."""
+    ids = list(dict.fromkeys(value.strip() for value in job_id.split(",")))
+    if not all(ids):
+        raise typer.BadParameter("Job IDs must not be empty", param_hint="job_id")
     client = get_client()
+    if len(ids) > 1:
+        report, channels = _export_channel_reporter(print)
+        dest, summary = export_jobs(
+            client,
+            ids,
+            output,
+            workers=workers,
+            result_callback=report,
+            timeout=timeout,
+            include_logs=logs,
+            include_events=events,
+            extract_artifacts=not no_extract_artifacts,
+        )
+        print(
+            f"Jobs exported: downloaded={summary.downloaded} "
+            f"skipped={summary.skipped} failed={len(summary.failures)}"
+        )
+        print(f"channels: oss={channels['oss']} proxy={channels['proxy']}")
+        print(f"  path: {dest}")
+        for failed_id, error in summary.failures.items():
+            print(f"[red]Failed job {failed_id}:[/] {error}")
+        if summary.failures:
+            raise typer.Exit(code=1)
+        return
+    job_id = ids[0]
+    result = {}
     dest = export_job(
         client,
         job_id,
         output,
+        result_callback=lambda jid, status, channel: result.update(status=status, channel=channel),
+        timeout=timeout,
         include_logs=logs,
         include_events=events,
         extract_artifacts=not no_extract_artifacts,
     )
     print(f"[green]Job exported:[/] {job_id}")
     print(f"  path: {dest}")
+    if result.get("channel") in {"oss", "proxy"} and result.get("status") == "downloaded":
+        print(f"  channel: {result['channel']}")
 
 
 @job_app.command("wait")
@@ -6374,6 +6447,12 @@ def group_export(
     workers: int = typer.Option(
         4, "--workers", "-w", min=1, help="Number of concurrent export workers"
     ),
+    timeout: float = typer.Option(
+        300,
+        "--timeout",
+        callback=_validate_export_timeout,
+        help="SDK request timeout in seconds, not the total export duration",
+    ),
     logs: bool = typer.Option(False, "--logs", help="Include container logs"),
     events: bool = typer.Option(False, "--events", help="Include events"),
     no_extract_artifacts: bool = typer.Option(
@@ -6434,12 +6513,15 @@ def group_export(
                 current_stage=current_stage,
             )
 
+        report, channels = _export_channel_reporter(progress.console.print)
         dest, summary = export_group(
             client,
             group_id,
             output,
             progress_callback=_on_progress,
             workers=workers,
+            result_callback=report,
+            timeout=timeout,
             include_logs=logs,
             include_events=events,
             extract_artifacts=not no_extract_artifacts,
@@ -6452,6 +6534,7 @@ def group_export(
         f"  [green]{summary.downloaded}[/] jobs downloaded, "
         f"[yellow]{summary.skipped}[/] jobs skipped (no artifact)"
     )
+    print(f"channels: oss={channels['oss']} proxy={channels['proxy']}")
     if summary.skipped_job_names:
         print(f"  Skipped: {', '.join(summary.skipped_job_names)}")
 

{ap_client-0.5.1.dev5 → ap_client-0.5.1.dev6}/ap_client/dataset_commands.py

@@ -50,15 +50,18 @@ def register(dataset_app: typer.Typer) -> None:
 
 
 def _register_dataset_commands(dataset_app: typer.Typer) -> None:
-    """挂载 dataset 级命令。"""
-    from .dataset_register import dataset_register
+    """挂载 dataset 级命令(``list`` / ``get`` / ``create`` / ``update`` / ``claim``)。
 
+    实现方式:把命令写成本模块的模块级函数,再在这里用
+    ``dataset_app.command("<name>")(<func>)`` 挂上去。``list`` 需要**替换**
+    ``cli.py`` 里现存的 ossdata 版本(设计 §4.1),挂载时用同名 ``"list"`` 覆盖,
+    并同步删掉 ``cli.py`` 中的旧实现。
+    """
     dataset_app.command("list")(dataset_list)
     dataset_app.command("get")(dataset_get)
     dataset_app.command("create")(dataset_create)
     dataset_app.command("update")(dataset_update)
     dataset_app.command("claim")(dataset_claim)
-    dataset_app.command("register")(dataset_register)
 
 
 # ---------------------------------------------------------------------------
@@ -83,7 +86,6 @@ _VERSION_COLUMNS: tuple[tuple[str, str], ...] = (
     ("splits", "SPLITS"),
     ("instances", "INSTANCES"),
     ("updated_at", "UPDATED_AT"),
-    ("registered", "REGISTERED"),
 )
 
 #: 上游 §8.2 的默认列(设计 §5)。
@@ -92,7 +94,6 @@ _SPLIT_COLUMNS: tuple[tuple[str, str], ...] = (
     ("run_type", "RUN_TYPE"),
     ("instances", "INSTANCES"),
     ("updated_at", "UPDATED_AT"),
-    ("registered", "REGISTERED"),
 )
 
 _ACCESS_COLUMNS: tuple[tuple[str, str], ...] = (
@@ -397,7 +398,6 @@ def _model_dict(record: Any) -> dict:
     ``{}`` / 缺省都不会出现在响应里),而 SDK 模型会把它们补成默认值;留着这些默认值会让
     JSON 凭空多出字段(迁移前是原样透出服务端响应,契约必须一致)。
 
-    ``registered`` 是显式注册状态，必须保留 ``false``。
     只清洗**顶层**:嵌套结构(如 version 详情里的 ``splits[].is_default``)按模型原样输出,
     服务端在那里确实是显式返回 ``false``。
     """
@@ -412,24 +412,13 @@ def _model_dict(record: Any) -> dict:
         return {}
     if not isinstance(payload, dict):
         return {}
-    registered = getattr(record, "registered", None)
-    if isinstance(registered, bool):
-        payload = {**payload, "registered": registered}
     return {
         key: value
         for key, value in payload.items()
-        if value is not None
-        and (key == "registered" or not (value is False or value == "" or value == [] or value == {}))
+        if not (value is None or value is False or value == "" or value == [] or value == {})
     }
 
 
-def _registered_dict(record: Any) -> dict:
-    """Preserve SDK registration state; older metadata-only SDK reads imply true."""
-    payload = _model_dict(record)
-    payload.setdefault("registered", True)
-    return payload
-
-
 def _api_biz_code(exc: BaseException) -> Optional[int]:
     """从 ``APIError`` 里取 apiserver 业务码(设计 §5.1),不 import 数值异常类。
 
@@ -825,7 +814,6 @@ def _version_row(record: dict) -> dict:
         "splits": splits,
         "instances": record.get("instance_count", ""),
         "updated_at": record.get("updated_at") or "",
-        "registered": record.get("registered", True),
     }
 
 
@@ -845,7 +833,6 @@ def _split_row(record: dict, detail: dict) -> dict:
         "run_type": record.get("run_type") or detail.get("run_type") or "",
         "instances": "" if instances is None else instances,
         "updated_at": record.get("updated_at") or detail.get("updated_at") or "",
-        "registered": record.get("registered", detail.get("registered", True)),
     }
 
 
@@ -1157,22 +1144,11 @@ def dataset_get(
     try:
         detail = repo.datasets.get_detail(dataset, **_env_kwargs(env))
     except Exception as exc:  # noqa: BLE001 - 统一走设计 §5.1 的映射
-        if _business_code(exc) not in (92001, 94021):
-            raise _fail(
-                f"Failed to query dataset {dataset}: {_reason(exc)}",
-                f"Check the dataset name: ap dataset list --query {dataset}",
-            ) from exc
-        detail = None
-    if detail is None:
-        l1, _, l2 = dataset.partition("/")
-        rendered = {
-            "dataset_name": dataset,
-            "dataset_l1": l1,
-            "dataset_l2": l2,
-            "registered": False,
-        }
-    else:
-        rendered = _registered_dict(detail)
+        raise _fail(
+            f"Failed to query dataset {dataset}: {_reason(exc)}",
+            f"Check the dataset name: ap dataset list --query {dataset}",
+        ) from exc
+    rendered = _model_dict(detail)
     _emit_detail(rendered, output_format, order=_DATASET_DETAIL_ORDER, always=("status",))
     if output_format not in ("json", "yaml"):
         _print_dataset_environments(repo, dataset, rendered)
@@ -1666,7 +1642,7 @@ def dataset_version_list(
             f"Check the dataset name: ap dataset list --query {dataset}",
         ) from exc
 
-    records = [_registered_dict(record) for record in (getattr(result, "items", None) or [])]
+    records = [_model_dict(record) for record in (getattr(result, "items", None) or [])]
     rows = [_version_row(record) for record in records]
     _emit(
         {"dataset": dataset, "versions": records, "pagination": _pagination_envelope(result)},
@@ -1687,7 +1663,7 @@ def dataset_version_get(
     output_format = _fmt(output_format)
     resolved = _version_value(version)
     detail = _fetch_version(dataset, resolved, stage="query", environment=environment)
-    _emit_detail(_registered_dict(detail), output_format, order=_VERSION_DETAIL_ORDER)
+    _emit_detail(detail, output_format, order=_VERSION_DETAIL_ORDER)
 
 
 @dataset_version_app.command("create")
@@ -1834,7 +1810,6 @@ def dataset_split_get(
                 payload = dict(record)
                 payload.setdefault("dataset", dataset)
                 payload.setdefault("version", resolved_version)
-                payload.setdefault("registered", detail.get("registered", True))
                 _emit_detail(payload, output_format)
                 return
         known = ", ".join(_split_names(detail)) or "<none>"
@@ -1844,7 +1819,6 @@ def dataset_split_get(
             payload = dict(record)
             payload.setdefault("dataset", dataset)
             payload.setdefault("version", "")
-            payload.setdefault("registered", True)
             _emit_detail(payload, output_format)
             return
         known = (