ap-client 0.6.0.dev2__tar.gz → 0.6.1.dev0__tar.gz

{ap_client-0.6.0.dev2 → ap_client-0.6.1.dev0}/PKG-INFO

@@ -1,18 +1,20 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.6.0.dev2
+Version: 0.6.1.dev0
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
+Requires-Dist: click>=8.0.0
 Requires-Dist: irepo-artifact==0.2.1
 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: urllib3>=1.26
 Requires-Dist: websockets>=13.0
 Provides-Extra: all
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.2; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0.dev3; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.2; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0.dev3; 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.6.0.dev2 → ap_client-0.6.1.dev0}/ap_client/api.py

@@ -1125,15 +1125,8 @@ class APIClient:
         benchmark: Optional[str] = None,
         experiment: Optional[str] = None,
         ak_ids: Optional[list[str]] = None,
-        priority: Optional[str] = None,
-        priority_weight: Optional[int] = None,
     ) -> dict:
-        """Create a group with optional scheduling defaults for its Jobs.
-
-        Omitted priority fields use the server defaults: medium and weight 0.
-        """
-        if priority is not None and priority not in {"high", "medium"}:
-            raise ValueError("priority must be one of high/medium")
+        """Create a group."""
         if ak_ids is not None and not isinstance(ak_ids, list):
             raise ValueError("ak_ids must be a list")
         references = list(ak_ids or [])
@@ -1171,10 +1164,6 @@ class APIClient:
             body["queue_id"] = effective_queue_id
         if max_concurrency is not None:
             body["max_concurrency"] = max_concurrency
-        if priority is not None:
-            body["priority"] = priority
-        if priority_weight is not None:
-            body["priority_weight"] = priority_weight
         if eval_config is not None:
             body["eval_config"] = eval_config
         if model_base_url_collection is not None:
@@ -1893,9 +1882,6 @@ class APIClient:
         meta_teacher_direction: Optional[str] = None,
         meta_train_stage: Optional[str] = None,
         benchmark: Optional[str] = None,
-        priority: Optional[str] = None,
-        priority_weight: Optional[int] = None,
-        priority_update_mode: Optional[str] = None,
     ) -> dict:
         """Update group properties.
 
@@ -1908,19 +1894,7 @@ class APIClient:
         ``meta_*`` 独立属性为部分更新（传了才改，不支持清除）；新服务端
         优先读属性，老服务端忽略属性——因此过渡期内同时也会将属性合并进
         tags 轨（双写）。
-
-        Priority changes update the Group defaults. The default existing mode
-        also updates all current Jobs, including PostProcess; incremental mode
-        changes only the defaults for future Jobs. Updating priority alone uses
-        weight 0; updating only weight preserves the current priority tier.
         """
-        if priority is not None and priority not in {"high", "medium"}:
-            raise ValueError("priority must be one of high/medium")
-        if priority_update_mode is not None:
-            if priority_update_mode not in {"existing", "incremental"}:
-                raise ValueError("priority_update_mode must be one of existing/incremental")
-            if priority is None and priority_weight is None:
-                raise ValueError("priority_update_mode requires priority or priority_weight")
         body: dict = {}
 
         if max_concurrency is not None:
@@ -1937,12 +1911,6 @@ class APIClient:
             body["scaffold"] = scaffold
         if benchmark is not None:
             body["benchmark"] = benchmark
-        if priority is not None:
-            body["priority"] = priority
-        if priority_weight is not None:
-            body["priority_weight"] = priority_weight
-        if priority_update_mode is not None:
-            body["priority_update_mode"] = priority_update_mode
         meta_attr_tags = _merge_meta_tags(
             None,
             meta_model=meta_model,

{ap_client-0.6.0.dev2 → ap_client-0.6.1.dev0}/ap_client/cli.py

@@ -25,6 +25,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.dfs_commands import register as _register_dfs_commands
 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
@@ -167,6 +168,7 @@ app.add_typer(checkpoint_app, name="checkpoint")
 # ap dataset version/split/access 嵌套在 dataset 下;instance/fs 是一等资源。
 _register_dataset_commands(dataset_app)
 _register_instance_commands(app)
+_register_dfs_commands(app)
 _register_fs_commands(app)
 _register_akpool_commands(app)
 
@@ -642,18 +644,7 @@ def _print_formatted(data: dict, output_format: str) -> None:
             import yaml
         except ImportError as exc:
             raise typer.BadParameter("--format yaml requires PyYAML to be installed") from exc
-
-        class LosslessDumper(yaml.SafeDumper):
-            pass
-
-        def represent_string(dumper, value):
-            # YAML normalizes literal NEL/line separators in unquoted scalars.
-            # Double quotes make the emitter escape them while keeping Chinese readable.
-            style = '"' if any(character in value for character in "\x85\u2028\u2029") else None
-            return dumper.represent_scalar("tag:yaml.org,2002:str", value, style=style)
-
-        LosslessDumper.add_representer(str, represent_string)
-        typer.echo(yaml.dump(data, Dumper=LosslessDumper, allow_unicode=True, sort_keys=False))
+        typer.echo(yaml.safe_dump(data, allow_unicode=True, sort_keys=False))
         return
     _print_json(data)
 
@@ -3230,12 +3221,12 @@ def job_create(
     priority: Optional[str] = typer.Option(
         None,
         "--priority",
-        help="Scheduling tier: high or medium. Omit both priority flags to inherit Group defaults; otherwise an omitted tier is medium",
+        help="Scheduling priority tier: high or medium (default: medium)",
     ),
     priority_weight: Optional[int] = typer.Option(
         None,
         "--priority-weight",
-        help="Priority weight, 0-10. Omit both priority flags to inherit Group defaults; otherwise an omitted weight is 0",
+        help="Fine-grained priority weight within tier, 0-10 (default: 0)",
     ),
     resource_mode: Optional[str] = typer.Option(
         None,
@@ -5468,18 +5459,6 @@ def group_create(
         min=1,
         help="Maximum concurrent jobs. Server default: 50.",
     ),
-    priority: Optional[str] = typer.Option(
-        None,
-        "--priority",
-        help="Default priority inherited by Jobs: high or medium (server default: medium)",
-    ),
-    priority_weight: Optional[int] = typer.Option(
-        None,
-        "--priority-weight",
-        min=0,
-        max=10,
-        help="Default priority weight inherited by Jobs, 0-10 (server default: 0)",
-    ),
     eval_config: Optional[str] = typer.Option(
         None, "--eval-config", help="Evaluation config (JSON)"
     ),
@@ -5592,8 +5571,6 @@ def group_create(
 ):
     """Create a Group."""
     output_format = _normalize_output_format(output_format)
-    if priority is not None and priority not in {"high", "medium"}:
-        raise typer.BadParameter("--priority must be one of high/medium")
     try:
         for reference in ak_id or []:
             validate_ak_id(reference)
@@ -5675,8 +5652,6 @@ def group_create(
             checkpoint=checkpoint_dict,
             benchmark=benchmark,
             experiment=experiment,
-            **({"priority": priority} if priority is not None else {}),
-            **({"priority_weight": priority_weight} if priority_weight is not None else {}),
         )
     except ManagedAKProtocolError as exc:
         _emit_error(str(exc))
@@ -5689,10 +5664,6 @@ def group_create(
             print(f"  ak_ids: {response_ak_ids(result)}")
         if result.get("queue_id") is not None:
             print(f"  queue_id: {result.get('queue_id')}")
-        if result.get("priority") is not None:
-            print(f"  priority: {result.get('priority')}")
-        if result.get("priority_weight") is not None:
-            print(f"  priority_weight: {result.get('priority_weight')}")
         if result.get("template") is not None:
             print(f"  template: {result.get('template')}")
         if result.get("agenthub_revision") is not None:
@@ -6119,40 +6090,14 @@ def group_update(
         "--meta-train-stage",
         help="Set meta_train_stage tag (options: ap meta-train-stage list)",
     ),
-    priority: Optional[str] = typer.Option(
-        None,
-        "--priority",
-        help="Group priority default: high or medium; --priority alone sets weight to 0",
-    ),
-    priority_weight: Optional[int] = typer.Option(
-        None,
-        "--priority-weight",
-        min=0,
-        max=10,
-        help="Group priority weight default, 0-10; weight alone preserves the current tier",
-    ),
-    priority_update_mode: Optional[str] = typer.Option(
-        None,
-        "--priority-update-mode",
-        help="existing updates defaults and all current Jobs (including PostProcess); incremental updates only defaults (server default: existing)",
-    ),
     output_format: str = typer.Option(
         None,
         "--format",
         help="Output format: plain/table/json/yaml (default: AP_FORMAT or command default)",
     ),
 ):
-    """Update Group properties and scheduling defaults inherited by Jobs."""
+    """Update Group properties."""
     output_format = _normalize_output_format(output_format)
-    if priority is not None and priority not in {"high", "medium"}:
-        raise typer.BadParameter("--priority must be one of high/medium")
-    if priority_update_mode is not None:
-        if priority_update_mode not in {"existing", "incremental"}:
-            raise typer.BadParameter("--priority-update-mode must be one of existing/incremental")
-        if priority is None and priority_weight is None:
-            raise typer.BadParameter(
-                "--priority-update-mode requires --priority or --priority-weight"
-            )
     eval_config_dict = _parse_json_object(eval_config, "--eval-config")
     model_base_url_collection_list = _parse_model_base_url_collection_option(
         model_base_url_collection, model_base_url_file
@@ -6189,8 +6134,6 @@ def group_update(
             scaffold,
             benchmark,
             tags_list,
-            priority,
-            priority_weight,
         )
     ):
         raise typer.BadParameter("At least one field must be provided to update")
@@ -6206,13 +6149,6 @@ def group_update(
         scaffold=scaffold,
         **({"benchmark": benchmark} if benchmark is not None else {}),
         **({"tags": tags_list} if tags_list is not None else {}),
-        **({"priority": priority} if priority is not None else {}),
-        **({"priority_weight": priority_weight} if priority_weight is not None else {}),
-        **(
-            {"priority_update_mode": priority_update_mode}
-            if priority_update_mode is not None
-            else {}
-        ),
     )
     if output_format == "plain":
         _print_group_action_plain(
@@ -6227,8 +6163,6 @@ def group_update(
                 "model",
                 "scaffold",
                 "benchmark",
-                "priority",
-                "priority_weight",
                 "updated_at",
             ],
         )

{ap_client-0.6.0.dev2 → ap_client-0.6.1.dev0}/ap_client/dataset_commands.py

@@ -123,7 +123,10 @@ _NO_BENCHMARK = "none"
 _FORMAT_HELP = "Output format: plain/table/json/yaml (default: AP_FORMAT or command default)"
 
 _METADATA_MODELS = ("version_first", "split_first")
-_VERSION_SPLIT_METADATA_MODEL = "version_first"
+# IR SDK >= 1.4.0.dev3 的业务入口固定 split_first：business_metadata_model 拒绝
+# version_first（仅保留给低层 legacy 读）。带 version 的 split 查询在两种模型下
+# 结果一致（实测），显式 split_first 与 SDK 归一值一致且新旧 SDK 均接受。
+_VERSION_SPLIT_METADATA_MODEL = "split_first"
 
 #: CLI **不替 SDK 决定元数据模型**:不下发 ``metadata_model``,由 SDK 按 profile 归一
 #: (当前为 ``split_first``)。
@@ -1186,9 +1189,26 @@ def dataset_get(
             "dataset_name": dataset,
             "registered": False,
         }
-        parts = dataset.split("/")
-        if len(parts) == 2 and all(parts):
-            rendered.update(dataset_l1=parts[0], dataset_l2=parts[1])
+        from .dataset_name import (
+            DatasetNameError,
+            DatasetNameUpgradeRequired,
+            parse_dataset_name,
+        )
+
+        try:
+            name = parse_dataset_name(dataset)
+        except DatasetNameUpgradeRequired as exc:
+            raise _fail(
+                f"Failed to query dataset {dataset}: {exc}",
+                "pip install 'ap-client[dataset]' --upgrade",
+                exit_code=2,
+            ) from exc
+        except DatasetNameError:
+            # 非规范名:不凭空发明 level 字段(与历史行为一致)。
+            pass
+        else:
+            rendered["dataset_l1"] = name.l1
+            rendered["dataset_l2"] = name.l2
     else:
         rendered = _registered_dict(detail)
     _emit_detail(rendered, output_format, order=_DATASET_DETAIL_ORDER, always=("status",))
@@ -1197,7 +1217,9 @@ def dataset_get(
 
 
 def dataset_create(
-    dataset: str = typer.Argument(..., help="Dataset name (e.g. alibaba/my-bench)"),
+    dataset: str = typer.Argument(
+        ..., help="Dataset name: L1 or L1/L2 (e.g. my-bench or alibaba/my-bench)"
+    ),
     benchmark: str = typer.Option(..., "--benchmark", help="Benchmark name or source_id"),
     description: Optional[str] = typer.Option(None, "--description", help="Dataset description"),
     visibility: str = typer.Option(
@@ -1216,20 +1238,32 @@ def dataset_create(
 
     from instance_repo.models import DatasetSeries
 
+    from .dataset_name import (
+        DatasetNameError,
+        DatasetNameUpgradeRequired,
+        parse_dataset_name,
+    )
     from .irepo_sdk import _reason
 
-    parts = dataset.split("/")
-    if len(parts) != 2 or not all(parts):
+    try:
+        name = parse_dataset_name(dataset)
+    except DatasetNameUpgradeRequired as exc:
+        raise _fail(
+            f"Failed to create dataset {dataset}: {exc}",
+            "pip install 'ap-client[dataset]' --upgrade",
+            exit_code=2,
+        ) from exc
+    except DatasetNameError:
         raise _fail(
-            f"Failed to create dataset {dataset}: the name must be two segments <team>/<name>",
-            "e.g. your-team/my-bench",
+            f"Failed to create dataset {dataset}: the name must be one segment (L1) "
+            "or two segments (L1/L2)",
+            "e.g. my-bench or your-team/my-bench",
             exit_code=2,
         )
-    l1, l2 = parts
     series = DatasetSeries(
         dataset_name=dataset,
-        dataset_l1=l1,
-        dataset_l2=l2,
+        dataset_l1=name.l1,
+        dataset_l2=name.l2,
         benchmark_id=benchmark_id,
         visibility=resolved_visibility,
         description=description or None,

ap_client-0.6.1.dev0/ap_client/dataset_name.py

@@ -0,0 +1,53 @@
+"""DatasetName 解析 Adapter:唯一入口委托给已安装的 InstanceRepo SDK。
+
+AP CLI 不维护第三套 dataset 名解析:``instance_repo.paths.DatasetName`` 是客户端
+路径契约的唯一事实源(L1 单段 ``A`` / 两段 ``A/B``,与 apiserver 的 namespace
+guard 及 conformance 契约对齐)。SDK 缺失或过旧(没有 ``DatasetName.parse``
+能力)时,给出明确的升级提示,不静默降级、不本地重写解析规则。
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+__all__ = [
+    "DatasetNameError",
+    "DatasetNameUpgradeRequired",
+    "parse_dataset_name",
+]
+
+#: SDK 缺失/无 DatasetName 能力时的升级提示(与 irepo_sdk 的 SdkMissing 同范式)。
+_UPGRADE_HINT = (
+    "The installed instance-repo SDK does not provide DatasetName parsing "
+    "(single-segment L1 dataset names need it).\n"
+    "Install it with: pip install 'ap-client[dataset]' --upgrade"
+)
+
+
+class DatasetNameUpgradeRequired(RuntimeError):
+    """已安装的 instance-repo SDK 缺少 DatasetName 能力,必须升级。"""
+
+
+class DatasetNameError(ValueError):
+    """Dataset 名不符合 IR DatasetName 契约(单段或两段、无非法段)。"""
+
+
+def parse_dataset_name(value: str) -> Any:
+    """Parse ``value`` through the installed IR ``DatasetName`` capability.
+
+    Returns the SDK ``DatasetName`` (``canonical`` / ``l1`` / ``l2`` /
+    ``segments`` / ``leaf``)。Raises :class:`DatasetNameUpgradeRequired` when the
+    installed SDK lacks the capability; raises :class:`DatasetNameError` when
+    the value is not a valid L1 or L1/L2 name.
+    """
+    try:
+        from instance_repo.paths import DatasetName
+    except ImportError as exc:
+        raise DatasetNameUpgradeRequired(_UPGRADE_HINT) from exc
+    parse = getattr(DatasetName, "parse", None)
+    if not callable(parse):
+        raise DatasetNameUpgradeRequired(_UPGRADE_HINT)
+    try:
+        return parse(value)
+    except Exception as exc:  # noqa: BLE001 - SDK 校验失败统一转成 CLI 契约
+        raise DatasetNameError(str(exc)) from exc

{ap_client-0.6.0.dev2 → ap_client-0.6.1.dev0}/ap_client/dataset_register.py

@@ -66,11 +66,25 @@ def _claim_without_workspace(
 
 
 def _create_owned_dataset(repo: Any, dataset: str, benchmark_id: str) -> dict:
-    parts = dataset.split("/")
-    if len(parts) != 2 or not all(parts):
+    from .dataset_name import (
+        DatasetNameError,
+        DatasetNameUpgradeRequired,
+        parse_dataset_name,
+    )
+
+    try:
+        name = parse_dataset_name(dataset)
+    except DatasetNameUpgradeRequired as exc:
+        raise datasets._fail(
+            f"Failed to create dataset {dataset}: {exc}",
+            "pip install 'ap-client[dataset]' --upgrade",
+            exit_code=2,
+        ) from exc
+    except DatasetNameError:
         raise datasets._fail(
-            f"Failed to create dataset {dataset}: the name must be two segments <team>/<name>",
-            "Use a dataset name such as your-team/my-bench",
+            f"Failed to create dataset {dataset}: the name must be one segment (L1) "
+            "or two segments (L1/L2)",
+            "Use a dataset name such as my-bench or your-team/my-bench",
             exit_code=2,
         )
 
@@ -78,8 +92,8 @@ def _create_owned_dataset(repo: Any, dataset: str, benchmark_id: str) -> dict:
 
     fields: dict[str, Any] = {
         "dataset_name": dataset,
-        "dataset_l1": parts[0],
-        "dataset_l2": parts[1],
+        "dataset_l1": name.l1,
+        "dataset_l2": name.l2,
         "visibility": "private",
     }
     if benchmark_id: