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

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

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

@@ -283,6 +283,36 @@ def _ensure_next_token_honored(response: dict, *, next_token: Optional[str], end
         )
 
 
+def _openapi_supports_instance_range(document: Any) -> bool:
+    """Check the actual POST /jobs JSON request schema, failing closed on unknown shapes."""
+
+    def resolve(node: Any) -> dict:
+        seen = set()
+        while isinstance(node, dict) and "$ref" in node:
+            ref = node["$ref"]
+            if not isinstance(ref, str) or not ref.startswith("#/") or ref in seen:
+                return {}
+            seen.add(ref)
+            node = document
+            for part in ref[2:].split("/"):
+                if not isinstance(node, dict):
+                    return {}
+                node = node.get(part.replace("~1", "/").replace("~0", "~"))
+        return node if isinstance(node, dict) else {}
+
+    try:
+        path = resolve(document["paths"]["/jobs"])
+        body = resolve(path["post"]["requestBody"])
+        schema = resolve(body["content"]["application/json"]["schema"])
+        properties = schema["properties"]
+    except (KeyError, TypeError):
+        return False
+    if not isinstance(properties, dict) or "instance_range" not in properties:
+        return False
+    field = resolve(properties["instance_range"])
+    return bool(field) and field.get("readOnly") is not True
+
+
 def _secret_ws_params(workspace_id: Optional[str]) -> Optional[dict]:
     """Build the ``?workspace_id=`` query for name-addressed secret endpoints.
 
@@ -477,6 +507,28 @@ class APIClient:
         """Send a GET request."""
         return self._request("GET", path, params=params, timeout=timeout)
 
+    def ensure_profile_range_supported(self, timeout: TimeoutType = None) -> None:
+        """Check the target cluster before sending a profile range request.
+
+        Do not cache this across submissions: the server may have been rolled back.
+        Use the normal authenticated, cluster-scoped request path.
+        """
+        try:
+            document = self._get(
+                "/openapi.json", timeout=timeout if timeout is not None else (10, 30)
+            )
+        except APIError as exc:
+            raise ValueError(
+                "Cannot verify server support for --profile --range via /openapi.json; "
+                f"no jobs were submitted. Check AP_BASE_URL, AP_CLUSTER and server access. {exc}"
+            ) from exc
+        if not _openapi_supports_instance_range(document):
+            raise ValueError(
+                "Cannot confirm server support for --profile --range: /openapi.json must "
+                "declare instance_range in the POST /jobs JSON request schema. "
+                "No jobs were submitted. Upgrade the target server before using --range."
+            )
+
     def _post(self, path: str, data: Any, timeout: TimeoutType = None) -> Any:
         """Send a POST request."""
         from .managed_ak import parameter_ak_ids, require_parameter_ak_ack
@@ -1097,6 +1149,7 @@ class APIClient:
         benchmark: Optional[str] = None,
         experiment: Optional[str] = None,
         ak_id: Optional[str] = None,
+        instance_range: Optional[str] = None,
     ) -> dict:
         """Create a job."""
         body = self.build_create_job_body(
@@ -1134,6 +1187,7 @@ class APIClient:
             batch_size=batch_size,
             trials=trials,
             resource_profile_id=resource_profile_id,
+            instance_range=instance_range,
             meta_model=meta_model,
             meta_job_type=meta_job_type,
             upstream_platform=upstream_platform,
@@ -1205,6 +1259,7 @@ class APIClient:
         benchmark: Optional[str] = None,
         experiment: Optional[str] = None,
         ak_id: Optional[str] = None,
+        instance_range: Optional[str] = None,
     ) -> dict:
         """Build the /jobs request body for job creation."""
         _validate_credential_source_selection(
@@ -1298,6 +1353,8 @@ class APIClient:
             body["profile_version"] = profile_version
         if instances is not None:
             body["instances"] = instances
+        if instance_range is not None:
+            body["instance_range"] = instance_range
         if dataset is not None:
             body["dataset"] = dataset
         if batch_size is not None:
@@ -2635,6 +2692,8 @@ class APIClient:
         spec: dict,
         description: str = "",
         account_pool: Optional[str] = None,
+        metadata: Optional[dict] = None,
+        tags: Optional[list[str]] = None,
     ) -> dict:
         """Create a new submission profile."""
         body: dict = {"name": name, "spec": spec}
@@ -2642,6 +2701,10 @@ class APIClient:
             body["description"] = description
         if account_pool is not None:
             body["account_pool"] = account_pool
+        if metadata is not None:
+            body["metadata"] = metadata
+        if tags is not None:
+            body["tags"] = tags
         return self._post(self._PROFILES_BASE, body)
 
     def list_profiles(
@@ -2649,6 +2712,11 @@ class APIClient:
         *,
         keyword: Optional[str] = None,
         template: Optional[str] = None,
+        dataset: Optional[str] = None,
+        scaffold: Optional[str] = None,
+        owner: Optional[str] = None,
+        profile_ids: Optional[list[str]] = None,
+        tags: Optional[list[str]] = None,
         show_all: bool = False,
         page: int = 1,
         page_size: int = 20,
@@ -2658,6 +2726,12 @@ class APIClient:
         Args:
             keyword: Filter by name keyword.
             template: Filter by template name.
+            dataset: Filter by metadata dataset using a case-insensitive substring match.
+            scaffold: Filter by metadata scaffold using a case-insensitive substring match.
+            owner: Filter by an explicit owner ID instead of the current caller.
+            profile_ids: Filter by profile IDs (maximum 100; mutually exclusive
+                with ``keyword``).
+            tags: Filter by profile tags using AND semantics (maximum 10).
             show_all: If False (default), return only profiles owned by the
                 current caller — the owner filter is resolved client-side
                 via the configured API key, mirroring how the web console
@@ -2667,21 +2741,40 @@ class APIClient:
             page_size: Number of items per page.
 
         Raises:
-            ConfigurationError: When no API key is configured. Listing
-                profiles always requires authentication, regardless of
-                ``show_all``. Also raised when ``show_all`` is False but
-                the API key cannot be resolved to a user_id.
+            ConfigurationError: When the default Mine view needs an API key
+                but none is configured, or the key cannot be resolved.
+            ValueError: When mutually exclusive filters are combined.
         """
-        if not self.config.token_key:
-            raise ConfigurationError(
-                "Cannot list profiles without authentication. Set AP_API_KEY environment variable."
-            )
+        if keyword and profile_ids:
+            raise ValueError("profile_ids and keyword are mutually exclusive")
+        if owner and show_all:
+            raise ValueError("owner and show_all are mutually exclusive")
+        if profile_ids and len(profile_ids) > 100:
+            raise ValueError("profile_ids accepts at most 100 values")
+        if tags and len(tags) > 10:
+            raise ValueError("tags accepts at most 10 values")
+
         params: dict = {"page": page, "page_size": page_size}
         if keyword:
             params["keyword"] = keyword
         if template:
             params["template"] = template
-        if not show_all:
+        if dataset:
+            params["dataset"] = dataset
+        if scaffold:
+            params["scaffold"] = scaffold
+        if profile_ids:
+            params["profile_ids"] = ",".join(profile_ids)
+        if tags:
+            params["tags"] = ",".join(tags)
+        if owner:
+            params["owner"] = owner
+        elif not show_all:
+            if not self.config.token_key:
+                raise ConfigurationError(
+                    "Cannot list own profiles without authentication. "
+                    "Set AP_API_KEY environment variable or use --all."
+                )
             try:
                 owner_id = self._resolve_self_user_id()
             except APIError as exc:
@@ -2697,6 +2790,27 @@ class APIClient:
             params["owner"] = owner_id
         return self._get(self._PROFILES_BASE, params=params)
 
+    def list_profile_tags(
+        self,
+        *,
+        query: Optional[str] = None,
+        limit: Optional[int] = None,
+    ) -> dict:
+        """List distinct tags for SDK consumers building tag selectors or completion UIs."""
+        params: dict = {}
+        if query:
+            params["q"] = query
+        if limit is not None:
+            params["limit"] = limit
+        return self._get(f"{self._PROFILES_BASE}/tags", params=params)
+
+    def replace_profile_tags(self, profile_id: str, tags: list[str]) -> dict:
+        """Replace all tags on a submission profile; an empty list clears them."""
+        return self._put(
+            f"{self._PROFILES_BASE}/{quote(profile_id)}/tags",
+            {"tags": tags},
+        )
+
     def get_profile(self, id_or_name: str, *, version: Optional[int] = None) -> dict:
         """Get a submission profile by ID or name.
 
@@ -2713,6 +2827,7 @@ class APIClient:
         spec: dict,
         description: str = "",
         account_pool: Optional[str] = None,
+        metadata: Optional[dict] = None,
     ) -> dict:
         """Update a submission profile, preserving an omitted default Pool."""
         body: dict = {"name": name, "spec": spec}
@@ -2720,6 +2835,8 @@ class APIClient:
             body["description"] = description
         if account_pool is not None:
             body["account_pool"] = account_pool
+        if metadata is not None:
+            body["metadata"] = metadata
         return self._put(f"{self._PROFILES_BASE}/{quote(profile_id)}", body)
 
     def delete_profile(self, profile_id: str) -> dict:

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

@@ -141,7 +141,7 @@ app.add_typer(config_app, name="config")
 app.add_typer(template_app, name="template")
 app.add_typer(dataset_app, name="dataset")
 app.add_typer(job_app, name="job")
-app.add_typer(job_tbb_app, name="job-tbb")
+job_app.add_typer(job_tbb_app, name="tbb")
 app.add_typer(group_app, name="group")
 app.add_typer(plan_app, name="plan")
 app.add_typer(datasource_app, name="datasource")
@@ -844,8 +844,6 @@ def _print_detail(data: object) -> None:
             rows.append((key, _format_nested_detail(value)))
         elif key == "image" and isinstance(value, str):
             rows.append((key, _shorten_image(value)))
-        elif value is None:
-            continue
         else:
             rows.append((key, _format_plain_value(value, max_len=0)))
     width = max((len(label) for label, _text in rows), default=0)
@@ -2443,7 +2441,7 @@ def job_tbb_list(
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ) -> None:
-    """List pipeline jobs created by ap job-tbb run."""
+    """List pipeline jobs created by ap job tbb run."""
     output_format = _normalize_output_format(output_format, keep_table=True)
     selected_columns = (
         _parse_columns_option(columns) if output_format in {"plain", "table"} else None
@@ -2823,7 +2821,8 @@ def job_create(
         "--range",
         help=(
             "Select a positional subset of instance IDs. Supports END, START,END, "
-            "START,END,STEP. Also accepts START:END[:STEP] and range(START, END, STEP)"
+            "START,END,STEP. Also accepts START:END[:STEP] and range(START, END, STEP). "
+            "With --profile, the server slices instances before trials expansion"
         ),
     ),
     exclude_instance_ids: Optional[str] = typer.Option(
@@ -3280,9 +3279,12 @@ def job_create(
                 "--profile is incompatible with --params-list (profile expands params server-side)"
             )
             raise typer.Exit(1)
-        if instance_range:
-            _emit_error("--profile is incompatible with --range")
-            raise typer.Exit(1)
+        if instance_range is not None:
+            try:
+                _parse_instance_range(instance_range)
+            except ValueError as exc:
+                _emit_error(str(exc))
+                raise typer.Exit(1)
         if exclude_instance_ids:
             _emit_error("--profile is incompatible with --exclude-instance-ids")
             raise typer.Exit(1)
@@ -3298,7 +3300,7 @@ def job_create(
 
             suite_name = f"{template or 'profile'}-sp-{profile}-{_dt.now().strftime('%m%d-%H%M')}"
 
-        # Parse instances from -i (simple comma split, no range/exclude expansion)
+        # Parse IDs only; Profile range selection happens on the server.
         instances_list: Optional[list[str]] = None
         if instance_id:
             try:
@@ -3339,6 +3341,7 @@ def job_create(
             **({"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,
             batch_size=batch_size,
             trials=trials,
@@ -3354,6 +3357,13 @@ def job_create(
             _print_formatted(body, "json" if output_format == "plain" else output_format)
             return
 
+        if instance_range is not None:
+            try:
+                client.ensure_profile_range_supported(timeout=timeout)
+            except (ValueError, ConfigurationError) as exc:
+                _emit_error(str(exc))
+                raise typer.Exit(1) from None
+
         if dry_run:
             _emit_dry_run_warnings(dry_run_warnings)
             body["dry_run"] = True
@@ -3373,7 +3383,7 @@ def job_create(
                 agenthub_ref=agenthub_ref,
                 instance_id=instance_id,
                 dataset=dataset,
-                instance_range=None,
+                instance_range=instance_range,
                 exclude_instance_ids=None,
                 params=params,
                 params_list_input=None,
@@ -3448,6 +3458,7 @@ def job_create(
                     **({"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,
                     batch_size=batch_size,
                     trials=trials,

{ap_client-0.3.2.dev0 → ap_client-0.4.0.dev0}/ap_client/dataset_commands.py

@@ -1909,8 +1909,9 @@ def dataset_split_update(
     resolved_run_type = _check_choice(run_type, _RUN_TYPES, "--run-type")
 
     if not resolved_version:
-        # 无版本空间改 run_type 走 recordsvc 的 split 记录(PATCH /datasets/splits/detail),
-        # 服务端**显式** pre 会 400;缺省不下发(SDK 不带该参数 → 服务端按 online 处理)。
+        # 无版本空间改 run_type 走 recordsvc 的 split 记录(PATCH /datasets/splits/detail):
+        # 写端点仅限 online——SDK 1.1.2 起派生/显式 pre 都会前置 SchemaError 拒绝,
+        # 不再出现"存在性检查读 pre、写入默默落 online"的读写环境撕裂。
         env = _environment(environment)
         if env == "pre":
             raise _fail(

{ap_client-0.3.2.dev0 → ap_client-0.4.0.dev0}/ap_client/instance_commands.py

@@ -24,6 +24,7 @@ from __future__ import annotations
 
 import inspect
 import shutil
+import tempfile
 from pathlib import Path
 from typing import Any, List, Optional
 
@@ -256,7 +257,7 @@ def _sdk_read_kwargs(sdk_obj: Any, method: str, *, environment: str, metadata_mo
     if dropped:
         raise _fail(
             f"已安装的 instance-repo 不支持按调用指定 {'/'.join(dropped)}",
-            "升级到 instance-repo 1.1.0 及以上后重试",
+            "升级到 instance-repo 1.1.2 及以上后重试",
             exit_code=2,
         )
     return kwargs
@@ -714,20 +715,37 @@ def instance_pull(
             "instance pull 不支持公网下载;请在 AP dev cluster / ROCK VPC 内执行",
         )
 
+    # SDK 的 swe/custom 下载会先往输出目录写 <id>.json 与 .probe 中间文件,再由
+    # _place_under_target 搬进 <id>/——把用户目录直接交给它,未加 --overwrite 也会
+    # 覆盖目标同级的同名文件。先落到独立临时目录,归一后再整体搬入最终目标。
+    staging = Path(tempfile.mkdtemp(prefix=f"ap-pull-{instance}-"))
     try:
+        try:
+            written = repo.instances.pull(dataset, resolved, instance, staging, split)
+        except Exception as exc:  # noqa: BLE001
+            sdk_error_exit(exc, what=f"instance {instance}", stage="拉取")
+        staged = _place_under_target(Path(str(written)), staging / instance)
         root.mkdir(parents=True, exist_ok=True)
-        written = repo.instances.pull(dataset, resolved, instance, root, split)
-    except Exception as exc:  # noqa: BLE001
-        sdk_error_exit(exc, what=f"instance {instance}", stage="拉取")
-
-    written = _place_under_target(Path(str(written)), target)
+        if target.exists():
+            if not overwrite:
+                raise _fail(
+                    f"instance {instance} 拉取目标 {target} 已存在",
+                    "换一个 --output/-o 目录,或加 --overwrite 允许覆盖",
+                )
+            if target.is_dir():
+                shutil.rmtree(target)
+            else:
+                target.unlink()
+        shutil.move(str(staging / instance), str(target))
+    finally:
+        shutil.rmtree(staging, ignore_errors=True)
     payload = {
         "instance": instance,
         "dataset": dataset,
         "version": resolved,
         "split": split,
         "output": str(target),
-        "content": str(written),
+        "content": str(target / staged.name),
     }
     _emit_detail(payload, output_format)
 

{ap_client-0.3.2.dev0 → ap_client-0.4.0.dev0}/ap_client/irepo_sdk.py

@@ -308,7 +308,7 @@ _BIZ_CODE_RULES: dict[int, tuple[str, int]] = {
     ),
     94018: ("当前角色只读,写操作需要 writer 角色;让 admin 执行 ap dataset access grant", 1),
     94019: ("dataset 标识冲突：检查 --dataset 的取值是否与已有 dataset 重名", 1),
-    94020: ("请求未带 dataset 标识(SDK 过旧),升级：pip install -U 'instance-repo[oss]>=1.1.0'", 1),
+    94020: ("请求未带 dataset 标识(SDK 过旧),升级：pip install -U 'instance-repo[oss]>=1.1.2'", 1),
     94021: ("该 dataset 不存在,先执行：ap dataset create <dataset> --benchmark <b>", 1),
     94022: (
         "无该用户存储空间的授权,让空间主人执行：ap fs access grant --user <你的工号> --role reader",
@@ -330,7 +330,7 @@ _CODE_RULES: dict[str, tuple[str, int]] = {
     "E_DIGEST_MISMATCH": ("内容校验失败,重新拉取或重新打包该 instance 后再试", 1),
     "E_IMMUTABLE": ("已发布的版本不可修改,创建新版本再操作", 1),
     "E_FORBIDDEN": ("当前身份无权执行该操作,确认 AP_API_KEY 与 dataset 角色", 1),
-    "E_OWNER_REF_MISSING": ("缺少上游来源引用,升级：pip install -U 'instance-repo[oss]>=1.1.0'", 1),
+    "E_OWNER_REF_MISSING": ("缺少上游来源引用,升级：pip install -U 'instance-repo[oss]>=1.1.2'", 1),
     "E_LAYOUT": ("instance 目录结构不合规,先执行 ap instance validate <path> 定位问题", 1),
     "E_SCHEMA": ("instance 元数据不符合 schema,先执行 ap instance validate <path> 定位问题", 1),
     "E_CRED_EXPIRED": ("临时凭据已过期,重试该命令即可重新换取", 1),

{ap_client-0.3.2.dev0 → ap_client-0.4.0.dev0}/ap_client/profile_commands.py

@@ -105,6 +105,25 @@ def _load_spec(
     return data
 
 
+def _load_metadata(metadata_inline: Optional[str]) -> Optional[dict]:
+    """Parse the currently supported explicit profile metadata override."""
+    if metadata_inline is None:
+        return None
+    try:
+        data = json.loads(metadata_inline)
+    except json.JSONDecodeError as exc:
+        raise typer.BadParameter(f"Invalid JSON in --metadata: {exc}") from exc
+    if not isinstance(data, dict):
+        raise typer.BadParameter("Metadata must be a JSON object")
+    unsupported_keys = set(data) - {"scaffold"}
+    if unsupported_keys:
+        raise typer.BadParameter(
+            "--metadata only supports the scaffold key; "
+            "dataset and split are derived from the profile spec"
+        )
+    return data
+
+
 # Name constraint — single source of truth shared by help text, CLI
 # validation, and error messages.  Server-side ValidateProfileName
 # enforces the same rule; keep in sync when changing.
@@ -284,6 +303,14 @@ def profile_create(
         "--account-pool",
         help="Default Account Pool ID used when a submission does not override it",
     ),
+    metadata_inline: Optional[str] = typer.Option(
+        None,
+        "--metadata",
+        help="Profile metadata override as JSON (currently only scaffold; dataset/split are derived)",
+    ),
+    tags: Optional[list[str]] = typer.Option(
+        None, "--tag", help="Initial profile tag (repeatable)"
+    ),
     output_format: str = typer.Option(
         None,
         "--format",
@@ -299,12 +326,15 @@ def profile_create(
         raise typer.Exit(1)
     output_format = _normalize_output_format(output_format)
     spec = _load_spec(file, spec_inline)
+    metadata = _load_metadata(metadata_inline)
     client = get_client()
     result = client.create_profile(
         name=name,
         spec=spec,
         description=description,
         account_pool=account_pool,
+        metadata=metadata,
+        tags=tags,
     )
     if output_format == "plain":
         print("[green]Profile created:[/]")
@@ -313,10 +343,54 @@ def profile_create(
         _print_formatted(result, output_format)
 
 
+@profile_app.command("set-tags")
+def profile_set_tags(
+    identifier: str = typer.Argument(..., help="Profile ID or name"),
+    tags: Optional[list[str]] = typer.Option(
+        None, "--tag", help="Replacement profile tag (repeatable)"
+    ),
+    clear: bool = typer.Option(False, "--clear", help="Clear all profile tags"),
+    output_format: str = typer.Option(
+        None,
+        "--format",
+        help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
+    ),
+):
+    """Replace all tags on a submission profile."""
+    if bool(tags) == clear:
+        raise typer.BadParameter("exactly one of --tag or --clear is required")
+    output_format = _normalize_output_format(output_format)
+    client = get_client()
+    replacement = [] if clear else tags or []
+    result = client.replace_profile_tags(identifier, replacement)
+    if output_format == "plain":
+        payload = result.get("data", result) if isinstance(result, dict) else {}
+        effective_tags = (
+            payload.get("tags", replacement) if isinstance(payload, dict) else replacement
+        )
+        shown = ", ".join(effective_tags) if effective_tags else "(cleared)"
+        print(f"[green]Profile tags updated:[/] {identifier} -> {shown}")
+    else:
+        _print_formatted(result, output_format)
+
+
 @profile_app.command("list")
 def profile_list(
     keyword: Optional[str] = typer.Option(None, "--keyword", "-k", help="Filter by name keyword"),
     template: Optional[str] = typer.Option(None, "--template", "-t", help="Filter by template"),
+    dataset: Optional[str] = typer.Option(
+        None, "--dataset", help="Filter by metadata dataset (case-insensitive substring)"
+    ),
+    scaffold: Optional[str] = typer.Option(
+        None, "--scaffold", help="Filter by metadata scaffold (case-insensitive substring)"
+    ),
+    owner: Optional[str] = typer.Option(None, "--owner", help="Filter by owner ID"),
+    profile_ids: Optional[list[str]] = typer.Option(
+        None, "--profile-id", help="Filter by profile ID (repeatable; max 100)"
+    ),
+    tags: Optional[list[str]] = typer.Option(
+        None, "--tag", help="Filter by tag (repeatable; max 10; combined with AND)"
+    ),
     all_profiles: bool = typer.Option(
         False, "--all", "-a", help="Show all profiles (not just own)"
     ),
@@ -329,11 +403,24 @@ def profile_list(
     ),
 ):
     """List submission profiles (default: own profiles only)."""
+    if keyword and profile_ids:
+        raise typer.BadParameter("--profile-id and --keyword are mutually exclusive")
+    if owner and all_profiles:
+        raise typer.BadParameter("--owner and --all are mutually exclusive")
+    if profile_ids and len(profile_ids) > 100:
+        raise typer.BadParameter("--profile-id accepts at most 100 values")
+    if tags and len(tags) > 10:
+        raise typer.BadParameter("--tag accepts at most 10 values")
     output_format = _normalize_output_format(output_format)
     client = get_client()
     result = client.list_profiles(
         keyword=keyword,
         template=template,
+        dataset=dataset,
+        scaffold=scaffold,
+        owner=owner,
+        profile_ids=profile_ids,
+        tags=tags,
         show_all=all_profiles,
         page=page,
         page_size=page_size,
@@ -377,6 +464,11 @@ def profile_update(
         "--account-pool",
         help="Set the default Account Pool ID; pass an empty value to clear it",
     ),
+    metadata_inline: Optional[str] = typer.Option(
+        None,
+        "--metadata",
+        help="Profile metadata override as JSON (currently only scaffold; dataset/split are derived)",
+    ),
     output_format: str = typer.Option(
         None,
         "--format",
@@ -391,6 +483,7 @@ def profile_update(
     """
     output_format = _normalize_output_format(output_format)
     spec = _load_spec(file, spec_inline)
+    metadata = _load_metadata(metadata_inline)
 
     # Get current profile to fill in unchanged fields (name is preserved
     # verbatim so that the server's `name` required-field validation
@@ -400,6 +493,7 @@ def profile_update(
 
     final_description = description if description is not None else current.get("description", "")
     final_account_pool = account_pool if account_pool is not None else current.get("account_pool")
+    final_metadata = metadata if metadata is not None else current.get("metadata")
 
     result = client.update_profile(
         profile_id=current.get("profile_id") or current.get("id") or identifier,
@@ -407,6 +501,7 @@ def profile_update(
         spec=spec,
         description=final_description,
         account_pool=final_account_pool,
+        metadata=final_metadata,
     )
     if output_format == "plain":
         print("[green]Profile updated:[/]")
@@ -422,7 +517,7 @@ def profile_delete(
 ):
     """Delete a submission profile."""
     if not yes:
-        typer.confirm(f"Permanently delete profile '{identifier}'?", abort=True)
+        typer.confirm(f"Delete profile '{identifier}'?", abort=True)
     client = get_client()
     try:
         client.delete_profile(identifier)

{ap_client-0.3.2.dev0 → ap_client-0.4.0.dev0}/ap_client/tbb.py

@@ -71,7 +71,7 @@ def merge_tbb_tags(command: str, user_tags: Sequence[str] | None) -> list[str]:
         if not value:
             continue
         if value.startswith("tbb-pipeline:"):
-            raise TBBProtocolError("tbb-pipeline:* is reserved by ap job-tbb")
+            raise TBBProtocolError("tbb-pipeline:* is reserved by ap job tbb")
         if value in seen:
             continue
         merged.append(value)

{ap_client-0.3.2.dev0 → ap_client-0.4.0.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.3.2.dev0"
+version = "0.4.0.dev0"
 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]>=1.1.2,<2.0.0",
 ]
 all = [
-    "instance-repo[oss]>=1.1.0",
+    "instance-repo[oss]>=1.1.2,<2.0.0",
 ]
 
 [project.scripts]