ap-client 0.2.1__tar.gz → 0.3.0.dev0__tar.gz

{ap_client-0.2.1 → ap_client-0.3.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.2.1
+Version: 0.3.0.dev0
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
 Requires-Dist: pyyaml>=6.0

{ap_client-0.2.1 → ap_client-0.3.0.dev0}/ap_client/api.py

@@ -991,6 +991,7 @@ class APIClient:
         runner: Optional[str] = None,
         runner_options: Optional[dict] = None,
         idempotency_key: Optional[str] = None,
+        max_failure_retries: int = 0,
         # ─── Scheduling hints ─────────────────────────────────────────
         priority: Optional[str] = None,
         priority_weight: Optional[int] = None,
@@ -1043,6 +1044,7 @@ class APIClient:
             runner=runner,
             runner_options=runner_options,
             idempotency_key=idempotency_key,
+            max_failure_retries=max_failure_retries,
             priority=priority,
             priority_weight=priority_weight,
             resource_mode=resource_mode,
@@ -1093,6 +1095,7 @@ class APIClient:
         runner: Optional[str] = None,
         runner_options: Optional[dict] = None,
         idempotency_key: Optional[str] = None,
+        max_failure_retries: int = 0,
         # ─── Scheduling hints ─────────────────────────────────────────
         priority: Optional[str] = None,
         priority_weight: Optional[int] = None,
@@ -1179,6 +1182,8 @@ class APIClient:
             body["runner_options"] = runner_options
         if idempotency_key is not None:
             body["idempotency_key"] = idempotency_key
+        if max_failure_retries:
+            body["max_failure_retries"] = max_failure_retries
 
         # Scheduling hints
         if priority is not None:

{ap_client-0.2.1 → ap_client-0.3.0.dev0}/ap_client/cli.py

@@ -205,6 +205,7 @@ def _build_job_create_retry_command(
     concurrency: Optional[int],
     batch_size: int,
     trials: Optional[int] = None,
+    max_failure_retries: int = 0,
     wait: bool,
     wait_interval: float,
     wait_timeout: Optional[float],
@@ -256,6 +257,8 @@ def _build_job_create_retry_command(
         args.extend(["--batch-size", str(batch_size)])
     if trials is not None:
         args.extend(["--trials", str(trials)])
+    if max_failure_retries:
+        args.extend(["--max-failure-retries", str(max_failure_retries)])
     if wait:
         args.append("--wait")
         if wait_interval != 5.0:
@@ -924,7 +927,10 @@ def _print_params_plain(params: Any, masked_params: list) -> None:
     rows: list[tuple[str, Any]] = []
     for key, value in params.items():
         display_value = _format_plain_value(value)
-        if str(key) in masked_paths and value == "***":
+        # 直接信任 masked_params 路径：服务端掩码形态已扩展为保留首尾（如
+        # sk-***890 / ****），不能再按值严格等于 "***" 判断，否则形态变化后
+        # (masked) 标识静默丢失
+        if str(key) in masked_paths:
             display_value = f"{display_value} (masked)"
         rows.append((str(key), display_value))
     _print_key_values(rows, skip_empty=False)
@@ -1078,6 +1084,7 @@ def _idempotency_item_key(
     queue: Optional[str],
     account_pool: Optional[str],
     resource_profile_id: Optional[str] = None,
+    max_failure_retries: int = 0,
 ) -> str:
     # Client-supplied item keys are authoritative; server hashing is only a
     # fallback for non-CLI callers, so this payload intentionally need not
@@ -1097,6 +1104,8 @@ def _idempotency_item_key(
     }
     if resource_profile_id is not None:
         payload_data["resource_profile_id"] = resource_profile_id
+    if max_failure_retries:
+        payload_data["max_failure_retries"] = max_failure_retries
     payload = json.dumps(
         payload_data,
         sort_keys=True,
@@ -2886,6 +2895,12 @@ def job_create(
         "--idempotency-key",
         help="UUID4 key for retrying the same logical submission; providing one enables idempotency",
     ),
+    max_failure_retries: int = typer.Option(
+        0,
+        "--max-failure-retries",
+        min=0,
+        help="Maximum automatic retries after each Job fails (default: 0)",
+    ),
     dry_run: bool = typer.Option(
         False,
         "--dry-run",
@@ -3227,6 +3242,7 @@ def job_create(
             runner=runner,
             runner_options=runner_options_dict,
             idempotency_key=submission_idempotency_key,
+            max_failure_retries=max_failure_retries,
             group_id=group_id,
             model_base_url_collection=model_base_url_collection_list,
             group_post_process=group_post_process_dict,
@@ -3281,6 +3297,7 @@ def job_create(
                 concurrency=concurrency,
                 batch_size=batch_size,
                 trials=trials,
+                max_failure_retries=max_failure_retries,
                 wait=wait,
                 wait_interval=wait_interval,
                 wait_timeout=wait_timeout,
@@ -3328,6 +3345,7 @@ def job_create(
                     runner=runner,
                     runner_options=runner_options_dict,
                     idempotency_key=submission_idempotency_key,
+                    max_failure_retries=max_failure_retries,
                     group_id=group_id,
                     model_base_url_collection=model_base_url_collection_list,
                     priority=priority,
@@ -3521,6 +3539,7 @@ def job_create(
             overrides=overrides,
             concurrency=concurrency,
             batch_size=batch_size,
+            max_failure_retries=max_failure_retries,
             wait=wait,
             wait_interval=wait_interval,
             wait_timeout=wait_timeout,
@@ -3630,6 +3649,7 @@ def job_create(
                         queue=queue,
                         account_pool=account_pool,
                         resource_profile_id=resource_profile_id,
+                        max_failure_retries=max_failure_retries,
                     )
                 batch.append(item)
             return batch
@@ -3653,6 +3673,7 @@ def job_create(
                 enable_otel_tracing=enable_otel_tracing,
                 runner=runner,
                 runner_options=runner_options_dict,
+                max_failure_retries=max_failure_retries,
                 priority=priority,
                 priority_weight=priority_weight,
                 resource_mode=resource_mode,
@@ -3694,6 +3715,7 @@ def job_create(
                         runner=runner,
                         runner_options=runner_options_dict,
                         idempotency_key=submission_idempotency_key,
+                        max_failure_retries=max_failure_retries,
                         priority=priority,
                         priority_weight=priority_weight,
                         resource_mode=resource_mode,
@@ -3749,6 +3771,7 @@ def job_create(
                         runner=runner,
                         runner_options=runner_options_dict,
                         idempotency_key=submission_idempotency_key,
+                        max_failure_retries=max_failure_retries,
                         priority=priority,
                         priority_weight=priority_weight,
                         resource_mode=resource_mode,
@@ -3843,6 +3866,7 @@ def job_create(
                 enable_otel_tracing=enable_otel_tracing,
                 runner=runner,
                 runner_options=runner_options_dict,
+                max_failure_retries=max_failure_retries,
                 priority=priority,
                 priority_weight=priority_weight,
                 resource_mode=resource_mode,
@@ -3878,6 +3902,7 @@ def job_create(
                 runner=runner,
                 runner_options=runner_options_dict,
                 idempotency_key=submission_idempotency_key,
+                max_failure_retries=max_failure_retries,
                 priority=priority,
                 priority_weight=priority_weight,
                 resource_mode=resource_mode,
@@ -3923,6 +3948,7 @@ def job_create(
                     runner=runner,
                     runner_options=runner_options_dict,
                     idempotency_key=submission_idempotency_key,
+                    max_failure_retries=max_failure_retries,
                     priority=priority,
                     priority_weight=priority_weight,
                     resource_mode=resource_mode,

{ap_client-0.2.1 → ap_client-0.3.0.dev0}/ap_client/profile_commands.py

@@ -164,7 +164,7 @@ def _print_profile_plain(profile: dict) -> None:
     if not isinstance(spec, dict):
         return
 
-    # Submission control fields (underscore-prefixed and well-known scalars)
+    # Submission control fields (underscore-prefixed and well-known spec fields)
     submission_keys = (
         ("_submit_mode", "Submit Mode"),
         ("_dataset_key", "Dataset Key"),
@@ -172,6 +172,7 @@ def _print_profile_plain(profile: dict) -> None:
         ("batch_size", "Batch Size"),
         ("trials", "Trials"),
         ("trials_mode", "Trials Mode"),
+        ("job_tags", "Job Tags"),
         ("agenthub_revision", "Agenthub Revision"),
     )
     submission_rows = [

{ap_client-0.2.1 → ap_client-0.3.0.dev0}/ap_client/waiter.py

@@ -49,7 +49,7 @@ def wait_for_job(
                 continue
             raise
         _print_job_status(job, printer)
-        if job.get("status") in TERMINAL_JOB_STATUSES:
+        if job.get("status") in TERMINAL_JOB_STATUSES and not job.get("retry_pending", False):
             return job
         _sleep_until_next_poll(interval, deadline, "job", job_id, timeout)
 

{ap_client-0.2.1 → ap_client-0.3.0.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.2.1"
+version = "0.3.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"