ap-client 0.4.0.dev0__tar.gz → 0.4.2.dev0__tar.gz

{ap_client-0.4.0.dev0 → ap_client-0.4.2.dev0}/PKG-INFO

@@ -1,8 +1,9 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.4.0.dev0
+Version: 0.4.2.dev0
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
+Requires-Dist: irepo-artifact==0.1.2
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: rich>=13.0.0

ap_client-0.4.2.dev0/ap_client/akpool_commands.py

@@ -0,0 +1,179 @@
+"""``ap akpool`` 命令族 —— Account Pool(托管 AK)观测操作。
+
+* ``akpool rpm get`` → apiserver ``GET /apis/v1/model-api-keys/rpm-usage``
+  (中心侧,走 ``APIClient._get_central``),按 AK + 模型查询当前 RPM 用量与上限。
+
+AK 的两种指定方式互斥且必填其一:``--ak-id``(uak-xxx,仅平台托管 AK)或
+``--masked-ak``(掩码后 6 位,未托管 AK 走这条路)。服务端同口径(都缺或都给 →
+400),CLI 侧先拦一道,不发请求。``--time-range`` 是 Go duration 风格
+(``30s``/``5m``/``1h``);显式 ``--from``/``--to``(RFC3339)时覆盖
+``--time-range``。
+
+响应是嵌套结构(无信封):``usage.current_rpm``/``usage.sampled_at``、
+``rpm.limit``/``rpm.limit_state``/``rpm.synced_at``、``usage_status``、
+``time_range``、``ak_id``/``masked_api_key``/``model_id``。json/yaml 原样透传;
+plain/table 摊平成单行 key=value 展示。
+"""
+
+from __future__ import annotations
+
+import re
+from typing import Any, Optional
+
+import typer
+from ap_client import get_client
+
+__all__ = ["akpool_app", "register"]
+
+akpool_app = typer.Typer(help="Account Pool operations (managed API keys)")
+rpm_app = typer.Typer(help="Account Pool RPM usage operations")
+
+akpool_app.add_typer(rpm_app, name="rpm")
+
+
+def register(app: typer.Typer) -> None:
+    """把 ``akpool`` 挂到 ``ap`` 根命令上。"""
+    app.add_typer(akpool_app, name="akpool")
+
+
+_FORMAT_HELP = "Output format: plain/table/json/yaml (default: AP_FORMAT or command default)"
+_TIME_RANGE_HELP = "Lookback window for the RPM reading (Go duration, e.g. 30s/5m/1h)"
+_ISO_TIME_HELP = "RFC3339 timestamp, e.g. 2026-09-21T12:00:00+08:00"
+
+_TIME_RANGE_RE = re.compile(r"^\d+[smh]$")
+
+#: plain/table 输出的字段顺序,取值自嵌套响应(见 _flatten_rpm)。
+_RPM_KEYS = (
+    "current_rpm",
+    "rpm_limit",
+    "model",
+    "sampled_at",
+    "time_range",
+    "ak_id",
+    "usage_status",
+)
+
+
+def _fmt(output_format: Optional[str]) -> str:
+    from .cli import _normalize_output_format
+
+    return _normalize_output_format(output_format, keep_table=True)
+
+
+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}")
+    return normalized
+
+
+def _flatten_rpm(payload: dict) -> dict:
+    """把嵌套的 rpm-usage 响应摊平成 plain/table 展示用的扁平 dict。
+
+    null 值渲染为 ``-``(如未托管 AK 的 ``ak_id``、未知限额的 ``rpm.limit``)。
+    """
+    rpm = payload.get("rpm")
+    usage = payload.get("usage")
+    flat = {
+        "current_rpm": usage.get("current_rpm") if isinstance(usage, dict) else None,
+        "rpm_limit": rpm.get("limit") if isinstance(rpm, dict) else None,
+        "model": payload.get("model_id"),
+        "sampled_at": usage.get("sampled_at") if isinstance(usage, dict) else None,
+        "time_range": payload.get("time_range"),
+        "ak_id": payload.get("ak_id"),
+        "usage_status": payload.get("usage_status"),
+    }
+    return {key: (value if value is not None else "-") for key, value in flat.items()}
+
+
+def _emit_rpm(payload: Any, output_format: str) -> None:
+    from .cli import _print_formatted, _print_rich_table
+
+    if not isinstance(payload, dict):
+        payload = {"value": payload}
+    if output_format in ("json", "yaml"):
+        _print_formatted(payload, output_format)
+        return
+    flat = _flatten_rpm(payload)
+    keys = [key for key in _RPM_KEYS if key in flat]
+    keys += [key for key in flat if key not in keys]
+    if output_format == "table":
+        _print_rich_table([flat], [(key, key) for key in keys])
+        return
+    _print_rpm_plain(payload)
+
+
+def _print_rpm_plain(payload: dict) -> None:
+    """plain 输出：标题行(usage_status) + 对齐 key/value，与 _print_job_get_plain 同风格。
+
+    current_rpm 在限额已知时附利用率百分比；rpm_limit 未知/不限时展示 limit_state。
+    ak_id / masked_api_key 为 null(未托管 AK)时整行省略。
+    """
+    from .cli import _print_key_values
+
+    rpm = payload.get("rpm")
+    usage = payload.get("usage")
+    rpm = rpm if isinstance(rpm, dict) else {}
+    usage = usage if isinstance(usage, dict) else {}
+
+    current = usage.get("current_rpm")
+    limit = rpm.get("limit")
+    limit_state = rpm.get("limit_state") or "unknown"
+
+    if isinstance(current, (int, float)) and isinstance(limit, (int, float)) and limit > 0:
+        current_text = f"{current} ({current / limit * 100:.1f}% of limit)"
+    else:
+        current_text = current
+    limit_text = f"{limit} ({limit_state})" if limit is not None else limit_state
+
+    typer.echo(f"AK RPM Usage ({payload.get('usage_status') or 'unknown'})")
+    _print_key_values(
+        [
+            ("current_rpm", current_text),
+            ("rpm_limit", limit_text),
+            ("model", payload.get("model_id")),
+            ("ak_id", payload.get("ak_id")),
+            ("masked_api_key", payload.get("masked_api_key")),
+            ("sampled_at", usage.get("sampled_at")),
+            ("time_range", payload.get("time_range")),
+        ]
+    )
+
+
+@rpm_app.command("get")
+def rpm_get(
+    ak_id: Optional[str] = typer.Option(
+        None, "--ak-id", help="Managed AK ID (uak-xxx); mutually exclusive with --masked-ak"
+    ),
+    masked_ak: Optional[str] = typer.Option(
+        None, "--masked-ak", help="Last 6 characters of the AK; mutually exclusive with --ak-id"
+    ),
+    model: str = typer.Option(..., "--model", help="Model the RPM reading applies to"),
+    time_range: str = typer.Option("5m", "--time-range", help=_TIME_RANGE_HELP),
+    from_time: Optional[str] = typer.Option(
+        None, "--from", help=f"Window start ({_ISO_TIME_HELP}); overrides --time-range"
+    ),
+    to_time: Optional[str] = typer.Option(
+        None, "--to", help=f"Window end ({_ISO_TIME_HELP}); overrides --time-range"
+    ),
+    output_format: str = typer.Option(None, "--format", help=_FORMAT_HELP),
+):
+    """Show the current RPM usage and limit of a managed AK for one model."""
+    resolved_ak_id = (ak_id or "").strip()
+    resolved_masked_ak = (masked_ak or "").strip()
+    if bool(resolved_ak_id) == bool(resolved_masked_ak):
+        raise typer.BadParameter("exactly one of --ak-id or --masked-ak is required")
+    if not model.strip():
+        raise typer.BadParameter("--model must not be empty")
+    normalized_range = _check_time_range(time_range)
+    output_format = _fmt(output_format)
+
+    result = get_client().get_akpool_rpm(
+        model=model.strip(),
+        ak_id=resolved_ak_id or None,
+        masked_ak=resolved_masked_ak or None,
+        time_range=normalized_range,
+        from_time=from_time,
+        to_time=to_time,
+    )
+    _emit_rpm(result, output_format)

{ap_client-0.4.0.dev0 → ap_client-0.4.2.dev0}/ap_client/api.py

@@ -9,7 +9,7 @@ import sys
 import time
 import uuid
 from email.utils import parsedate_to_datetime
-from typing import Any, Optional, Union
+from typing import Any, Literal, Optional, Union
 from urllib.parse import parse_qsl, quote, urlencode, urlsplit, urlunsplit
 
 import requests
@@ -995,6 +995,42 @@ class APIClient:
             }
         }
 
+    # ==================== Account Pool operations ====================
+
+    def get_akpool_rpm(
+        self,
+        *,
+        model: str,
+        ak_id: Optional[str] = None,
+        masked_ak: Optional[str] = None,
+        time_range: Optional[str] = None,
+        from_time: Optional[str] = None,
+        to_time: Optional[str] = None,
+        timeout: TimeoutType = None,
+    ) -> dict:
+        """查询托管 AK 在指定模型上的当前 RPM 用量与上限（GET /apis/v1/model-api-keys/rpm-usage）。
+
+        ``ak_id``(uak-xxx) 与 ``masked_ak``(掩码后 6 位) 二选一，都缺或都给
+        服务端返回 400；``from_time``/``to_time``(RFC3339) 显式指定时覆盖
+        ``time_range``(Go duration，如 5m/1h，服务端默认 5m)。
+        响应为嵌套结构：``usage.current_rpm``/``usage.sampled_at``、
+        ``rpm.limit``/``rpm.limit_state``/``rpm.synced_at``、``usage_status``；
+        查未托管 AK 时 ``ak_id`` 为 null。
+        """
+        validate_ak_id(ak_id)
+        params: dict = {"model": model}
+        if ak_id is not None:
+            params["ak_id"] = ak_id
+        if masked_ak is not None:
+            params["masked_ak"] = masked_ak
+        if time_range is not None:
+            params["time_range"] = time_range
+        if from_time is not None:
+            params["from"] = from_time
+        if to_time is not None:
+            params["to"] = to_time
+        return self._get_central("/model-api-keys/rpm-usage", params=params, timeout=timeout)
+
     # ==================== Job operations ====================
 
     def create_group(
@@ -1150,6 +1186,7 @@ class APIClient:
         experiment: Optional[str] = None,
         ak_id: Optional[str] = None,
         instance_range: Optional[str] = None,
+        profile: Optional[str] = None,
     ) -> dict:
         """Create a job."""
         body = self.build_create_job_body(
@@ -1180,6 +1217,7 @@ class APIClient:
             credential_type=credential_type,
             account_pool=account_pool,
             eval_config=eval_config,
+            profile=profile,
             profile_id=profile_id,
             profile_version=profile_version,
             instances=instances,
@@ -1260,16 +1298,19 @@ class APIClient:
         experiment: Optional[str] = None,
         ak_id: Optional[str] = None,
         instance_range: Optional[str] = None,
+        profile: Optional[str] = None,
     ) -> dict:
         """Build the /jobs request body for job creation."""
+        if profile is not None and (profile_id is not None or profile_version is not None):
+            raise ValueError("profile cannot be combined with profile_id or profile_version")
         _validate_credential_source_selection(
             account_pool=account_pool,
             credential_type=credential_type,
             params=params,
             params_list=params_list,
         )
-        if not template and not profile_id:
-            raise ValueError("Either template or profile_id is required")
+        if not template and not profile_id and profile is None:
+            raise ValueError("Either template, profile or profile_id is required")
         validate_ak_selection(ak_id, params, params_list, overrides)
         body: dict = {}
         if template is not None:
@@ -1347,6 +1388,8 @@ class APIClient:
             body["eval_config"] = eval_config
 
         # Profile mode fields
+        if profile is not None:
+            body["profile"] = profile
         if profile_id is not None:
             body["profile_id"] = profile_id
         if profile_version is not None:
@@ -2212,8 +2255,14 @@ class APIClient:
         next_token: Optional[str] = None,
         pagination: Optional[str] = None,
         include_total: bool = True,
+        download_mode: Optional[Literal["oss", "proxy", "both"]] = None,
     ) -> dict:
-        """Get one page of artifact download links for a group."""
+        """Get one page of archive links.
+
+        Omit download_mode for the server default and legacy response. Explicit
+        oss/proxy/both modes add a downloads mapping to each artifact; both can
+        return only one successful provider. This method does not download files.
+        """
         params: dict[str, object] = {"skip": skip, "limit": limit}
         if include_post_process:
             params["include_post_process"] = True
@@ -2223,19 +2272,28 @@ class APIClient:
             params["pagination"] = pagination
         if not include_total:
             params["include_total"] = False
+        if download_mode is not None:
+            params["download_mode"] = download_mode
         endpoint = f"/groups/{quote(group_id)}/artifacts"
         response = self._get(endpoint, params=params)
         _ensure_next_token_honored(response, next_token=next_token, endpoint=endpoint)
         return response
 
-    def get_group_artifacts(self, group_id: str, include_post_process: bool = False) -> dict:
-        """Get artifact download links for a group."""
+    def get_group_artifacts(
+        self,
+        group_id: str,
+        include_post_process: bool = False,
+        *,
+        download_mode: Optional[Literal["oss", "proxy", "both"]] = None,
+    ) -> dict:
+        """Collect all archive-link pages, preserving download_mode on every page."""
         next_token: str | None = None
         skip = 0
         mode: str | None = None
         artifacts: list[dict] = []
         last_page: dict | None = None
 
+        download_options = {"download_mode": download_mode} if download_mode is not None else {}
         while True:
             page = self.get_group_artifacts_page(
                 group_id,
@@ -2245,6 +2303,7 @@ class APIClient:
                 next_token=next_token,
                 pagination="cursor" if mode in {None, "cursor"} else None,
                 include_total=False,
+                **download_options,
             )
             last_page = page
             page_artifacts = page.get("artifacts") or []
@@ -2278,9 +2337,17 @@ class APIClient:
         )
         return result
 
-    def get_job_artifacts(self, job_ids: list) -> list:
-        """Get artifact download links for one or more jobs."""
-        return self._post("/jobs/artifacts", {"job_ids": job_ids})
+    def get_job_artifacts(
+        self,
+        job_ids: list,
+        *,
+        download_mode: Optional[Literal["oss", "proxy", "both"]] = None,
+    ) -> list:
+        """Get archive links; explicit modes also return typed ``downloads`` entries."""
+        body = {"job_ids": job_ids}
+        if download_mode is not None:
+            body["download_mode"] = download_mode
+        return self._post("/jobs/artifacts", body)
 
     def get_job_artifacts_manifest(
         self,

{ap_client-0.4.0.dev0 → ap_client-0.4.2.dev0}/ap_client/cli.py

@@ -13,6 +13,7 @@ from urllib.parse import quote
 
 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,
@@ -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 (
@@ -160,6 +161,7 @@ app.add_typer(checkpoint_app, name="checkpoint")
 _register_dataset_commands(dataset_app)
 _register_instance_commands(app)
 _register_fs_commands(app)
+_register_akpool_commands(app)
 
 _PAI_RUNTIME_ENV_TAGS: tuple[tuple[str, str], ...] = (
     ("DLC_JOB_ID", "dlc_job_id"),
@@ -263,7 +265,7 @@ def _build_job_create_retry_command(
         args.append(template)
     if ak_id is not None:
         args.extend(["--ak-id", ak_id])
-    if profile:
+    if profile is not None:
         args.extend(["--profile", profile])
     if resource_profile_id:
         args.extend(["--resource-profile", resource_profile_id])
@@ -563,6 +565,27 @@ def _require_resource_profile_ack(result: dict, resource_profile_id: Optional[st
     raise typer.Exit(1)
 
 
+def _require_profile_ack(result: dict, profile: str) -> None:
+    """Detect servers that silently ignored the Profile reference (even in dry-run)."""
+    profile_id = result.get("profile_id")
+    version = result.get("profile_version")
+    if isinstance(profile_id, str) and profile_id.strip() and type(version) is int and version > 0:
+        return
+    identifiers = {key: result[key] for key in ("job_id", "group_id") if result.get(key)}
+    jobs = result.get("jobs")
+    if isinstance(jobs, list):
+        identifiers["job_ids"] = [
+            job["job_id"] for job in jobs if isinstance(job, dict) and job.get("job_id")
+        ]
+    _emit_error(
+        f"server did not return a resolved profile_id and profile_version for {profile!r}. "
+        "Deploy an AP server supporting profile references before using this CLI. "
+        "Jobs may already have been created, even with --dry-run; check the returned IDs "
+        f"before retrying: {json.dumps(identifiers)}. No legacy-field retry was sent."
+    )
+    raise typer.Exit(1)
+
+
 def _select_instance_ids(
     instance_ids: list[str],
     instance_range: Optional[str],
@@ -3030,7 +3053,7 @@ def job_create(
     profile: Optional[str] = typer.Option(
         None,
         "--profile",
-        help="Profile ID or name; triggers profile mode (server-side dataset expansion)",
+        help="Profile ID or name with optional :latest, :verified, :release (no fallback), or :vN; resolved server-side",
     ),
     resource_profile_id: Optional[str] = typer.Option(
         None,
@@ -3240,39 +3263,19 @@ def job_create(
             raise typer.Exit(1)
 
     # Reject --trials when not in profile mode (profile-only override)
-    if trials is not None and not profile:
+    if trials is not None and profile is None:
         _emit_error("--trials is only supported with --profile")
         raise typer.Exit(1)
 
     # Reject --eval-config when not in profile mode (use 'ap group create/update --eval-config' instead)
-    if eval_config is not None and not profile:
+    if eval_config is not None and profile is None:
         _emit_error(
             "--eval-config is only supported with --profile. Use 'ap group create --eval-config' or 'ap group update --eval-config' instead."
         )
         raise typer.Exit(1)
 
     # Profile mode: early branch
-    if profile:
-        # Parse profile:version syntax (e.g. "sweagent-swe:v3" or "sweagent-swe:3")
-        # Also supports :verified suffix (e.g. "sweagent-swe:verified") which stays
-        # in profile_id and is interpreted server-side.
-        profile_version_req: Optional[int] = None
-        if ":" in profile:
-            _, suffix = profile.rsplit(":", 1)
-            if suffix.lower() == "verified":
-                # Keep :verified in the profile string — server parses it from profile_id
-                pass
-            else:
-                profile, version_str = profile.rsplit(":", 1)
-                version_str = version_str.lstrip("v")
-                try:
-                    profile_version_req = int(version_str)
-                except ValueError:
-                    _emit_error(
-                        f"Invalid profile version: '{version_str}' (expected integer or 'verified', e.g. --profile myprofile:v3 or --profile myprofile:verified)"
-                    )
-                    raise typer.Exit(1)
-
+    if profile is not None:
         # Mutual exclusion checks
         if params_list_input:
             _emit_error(
@@ -3298,7 +3301,7 @@ def job_create(
         if not suite_name and not group_id:
             from datetime import datetime as _dt
 
-            suite_name = f"{template or 'profile'}-sp-{profile}-{_dt.now().strftime('%m%d-%H%M')}"
+            suite_name = f"{template or 'profile'}-sp-{profile.replace(':', '-')}-{_dt.now().strftime('%m%d-%H%M')}"
 
         # Parse IDs only; Profile range selection happens on the server.
         instances_list: Optional[list[str]] = None
@@ -3336,10 +3339,9 @@ def job_create(
             credential_type=credential_type,
             account_pool=account_pool,
             eval_config=eval_config_dict,
-            profile_id=profile,
+            profile=profile,
             resource_profile_id=resource_profile_id,
             **({"ak_id": ak_id} if ak_id is not None else {}),
-            profile_version=profile_version_req,
             instances=instances_list,
             instance_range=instance_range,
             dataset=dataset,
@@ -3373,6 +3375,7 @@ def job_create(
             except ManagedAKProtocolError as exc:
                 _emit_error(str(exc))
                 raise typer.Exit(1) from None
+            _require_profile_ack(result, profile)
             _print_formatted(result, "json" if output_format == "plain" else output_format)
             return
 
@@ -3453,10 +3456,9 @@ def job_create(
                     credential_type=credential_type,
                     account_pool=account_pool,
                     eval_config=eval_config_dict,
-                    profile_id=profile,
+                    profile=profile,
                     resource_profile_id=resource_profile_id,
                     **({"ak_id": ak_id} if ak_id is not None else {}),
-                    profile_version=profile_version_req,
                     instances=instances_list,
                     instance_range=instance_range,
                     dataset=dataset,
@@ -3479,6 +3481,8 @@ def job_create(
             emit_profile_retry_hint_once()
             raise
 
+        _require_profile_ack(result, profile)
+
         # Use idempotency_key returned by server (may differ when auto-generated server-side)
         effective_idem_key = result.get("idempotency_key") or submission_idempotency_key
 
@@ -3491,6 +3495,8 @@ def job_create(
             print(f"  profile: {profile}")
             if ak_id is not None:
                 print(f"  ak_ids: {response_ak_ids(result)}")
+            print(f"  profile_id: {result['profile_id']}")
+            print(f"  profile_version: {result['profile_version']}")
             if resource_profile_id is not None:
                 print(f"  resource_profile_id: {resource_profile_id}")
             print(f"  group_id: {result.get('group_id')}")
@@ -4665,10 +4671,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(
@@ -4678,17 +4721,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")
@@ -6136,6 +6212,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(
@@ -6196,12 +6278,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,
@@ -6214,6 +6299,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)}")