ap-client 0.5.3.dev9__tar.gz → 0.6.0__tar.gz

{ap_client-0.5.3.dev9 → ap_client-0.6.0}/PKG-INFO

@@ -1,20 +1,18 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.5.3.dev9
+Version: 0.6.0
 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: 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: urllib3>=1.26
 Requires-Dist: websockets>=13.0
 Provides-Extra: all
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5.dev4; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.4; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5.dev4; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.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.3.dev9 → ap_client-0.6.0}/ap_client/api.py

@@ -1125,8 +1125,15 @@ 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."""
+        """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")
         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 [])
@@ -1164,6 +1171,10 @@ 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:
@@ -1882,6 +1893,9 @@ 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.
 
@@ -1894,7 +1908,19 @@ 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:
@@ -1911,6 +1937,12 @@ 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.5.3.dev9 → ap_client-0.6.0}/ap_client/cli.py

@@ -35,7 +35,6 @@ from ap_client.managed_ak import (
     validate_ak_id,
     validate_ak_selection,
 )
-from ap_client.ossutil_commands import register as _register_ossutil_commands
 from ap_client.profile_commands import profile_app
 from ap_client.waiter import (
     WaitTimeoutError,
@@ -168,7 +167,6 @@ 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_ossutil_commands(app)
 _register_fs_commands(app)
 _register_akpool_commands(app)
 
@@ -644,7 +642,18 @@ 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
-        typer.echo(yaml.safe_dump(data, allow_unicode=True, sort_keys=False))
+
+        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))
         return
     _print_json(data)
 
@@ -3221,12 +3230,12 @@ def job_create(
     priority: Optional[str] = typer.Option(
         None,
         "--priority",
-        help="Scheduling priority tier: high or medium (default: medium)",
+        help="Scheduling tier: high or medium. Omit both priority flags to inherit Group defaults; otherwise an omitted tier is medium",
     ),
     priority_weight: Optional[int] = typer.Option(
         None,
         "--priority-weight",
-        help="Fine-grained priority weight within tier, 0-10 (default: 0)",
+        help="Priority weight, 0-10. Omit both priority flags to inherit Group defaults; otherwise an omitted weight is 0",
     ),
     resource_mode: Optional[str] = typer.Option(
         None,
@@ -5459,6 +5468,18 @@ 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)"
     ),
@@ -5571,6 +5592,8 @@ 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)
@@ -5652,6 +5675,8 @@ 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))
@@ -5664,6 +5689,10 @@ 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:
@@ -6090,14 +6119,40 @@ 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."""
+    """Update Group properties and scheduling defaults inherited by Jobs."""
     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
@@ -6134,6 +6189,8 @@ def group_update(
             scaffold,
             benchmark,
             tags_list,
+            priority,
+            priority_weight,
         )
     ):
         raise typer.BadParameter("At least one field must be provided to update")
@@ -6149,6 +6206,13 @@ 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(
@@ -6163,6 +6227,8 @@ def group_update(
                 "model",
                 "scaffold",
                 "benchmark",
+                "priority",
+                "priority_weight",
                 "updated_at",
             ],
         )