ap-client 0.4.1__tar.gz → 0.4.2.dev0__tar.gz

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

@@ -1,8 +1,9 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.4.1
+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.1 → 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
@@ -1186,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(
@@ -1216,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,
@@ -1296,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:
@@ -1383,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:
@@ -2248,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
@@ -2259,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,
@@ -2281,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 []
@@ -2314,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.1 → ap_client-0.4.2.dev0}/ap_client/cli.py

@@ -26,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 (
@@ -265,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])
@@ -565,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],
@@ -3032,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,
@@ -3242,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(
@@ -3300,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
@@ -3338,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,
@@ -3375,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
 
@@ -3455,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,
@@ -3481,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
 
@@ -3493,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')}")
@@ -4667,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(
@@ -4680,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")
@@ -6138,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(
@@ -6198,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,
@@ -6216,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)}")