ap-client 0.6.1.dev4__tar.gz → 0.6.1.dev6__tar.gz

{ap_client-0.6.1.dev4 → ap_client-0.6.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.6.1.dev4
+Version: 0.6.1.dev6
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
 Requires-Dist: irepo-artifact==0.2.2
@@ -10,9 +10,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]<2.0.0,>=1.4.0.dev4; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0.dev6; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0.dev4; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0.dev6; 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.1.dev4 → ap_client-0.6.1.dev6}/ap_client/dataset_commands.py

@@ -795,12 +795,12 @@ def _split_names(detail: dict) -> list[str]:
     return names
 
 
-def _dataset_repo() -> "Repo":
+def _dataset_repo(*, request_timeout: float | None = None) -> "Repo":
     """dataset 写路径统一走 InstanceRepo SDK;未装 ``dataset`` extra 时退出 2。"""
     from .irepo_sdk import SdkMissing, load_repo
 
     try:
-        return load_repo()
+        return load_repo(request_timeout=request_timeout)
     except SdkMissing as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(2) from exc

{ap_client-0.6.1.dev4 → ap_client-0.6.1.dev6}/ap_client/dataset_register.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import json
 import math
+import os
 import sys
 from typing import Any, List, Optional
 from urllib.parse import quote
@@ -33,6 +34,42 @@ def _emit_preview_stderr(payload: dict, output_format: str) -> None:
     typer.echo(json.dumps(payload, ensure_ascii=False, indent=2), err=True)
 
 
+def _parse_request_timeout() -> float:
+    """Read ``AP_REQUEST_TIMEOUT`` from the environment, falling back to 30 s.
+
+    Empty, missing, or non-numeric values all resolve to the default rather
+    than raising ``ValueError`` at import time (which would break ``ap --help``).
+    """
+    raw = os.environ.get("AP_REQUEST_TIMEOUT", "").strip()
+    if not raw:
+        return 30.0
+    try:
+        value = float(raw)
+    except (TypeError, ValueError):
+        return 30.0
+    return value if math.isfinite(value) and value > 0 else 30.0
+
+
+def _set_sdk_request_timeout(repo: Any, timeout: float) -> None:
+    """Override the IR SDK per-request HTTP timeout on the shared Transport.
+
+    All sub-clients (``datasets``, ``versions``, ``instances``) share
+    ``repo.transport``, so a single assignment covers every control-plane
+    call the register command makes (preview and submission alike).
+    Falls back to setting the attribute on each sub-client's ``_t`` when the
+    ``transport`` attribute is absent (older SDK shapes).
+    """
+    transport = getattr(repo, "transport", None)
+    if transport is not None and hasattr(transport, "timeout"):
+        transport.timeout = timeout
+        return
+    for name in ("datasets", "versions", "instances", "images"):
+        client = getattr(repo, name, None)
+        t = getattr(client, "_t", None)
+        if t is not None and hasattr(t, "timeout"):
+            t.timeout = timeout
+
+
 def _confirm(dataset: str, *, yes: bool) -> None:
     if yes:
         return
@@ -220,6 +257,13 @@ def dataset_register(
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip the registration confirmation"),
     wait: bool = typer.Option(False, "--wait", help="Wait for the ingest task to finish"),
     timeout: float = typer.Option(1800.0, "--timeout", help="Local wait timeout in seconds"),
+    request_timeout: float = typer.Option(
+        _parse_request_timeout(),
+        "--request-timeout",
+        help="Per-request HTTP timeout in seconds for control-plane calls "
+        "(env: AP_REQUEST_TIMEOUT, default: 30). "
+        "Increase for datasets with many objects where the preview scan takes longer.",
+    ),
     output_format: Optional[str] = typer.Option(None, "--format", help=datasets._FORMAT_HELP),
     owner: Optional[str] = typer.Option(
         None, "--owner", help="Ensure ownership before ingest; the only supported value is @me"
@@ -273,7 +317,17 @@ def dataset_register(
         )
 
     env = datasets._environment(environment)
-    repo = datasets._dataset_repo()
+    repo = datasets._dataset_repo(request_timeout=request_timeout)
+    # Override the IR SDK per-request HTTP timeout. All sub-clients
+    # (datasets, versions, instances) share repo.transport, so one
+    # assignment covers preview and submission alike.
+    if not math.isfinite(request_timeout) or request_timeout <= 0:
+        raise datasets._fail(
+            "--request-timeout must be a positive finite number",
+            "Pass a positive number of seconds",
+            exit_code=2,
+        )
+    _set_sdk_request_timeout(repo, request_timeout)
     datasets._check_storage_side(repo, env)
     ingest = getattr(getattr(repo, "versions", None), "ingest", None)
     if not callable(ingest):

{ap_client-0.6.1.dev4 → ap_client-0.6.1.dev6}/ap_client/dfs_commands.py

@@ -32,12 +32,34 @@ def register(app: typer.Typer) -> None:
     app.add_typer(dfs_app, name="dfs")
 
 
+_DFS_ACCESS_DENIED_CODES = frozenset({94016, 94018, 10002})
+
+
 def _files() -> OssFiles:
     from .cli import app
     from .irepo_sdk import load_ossutil_repo
 
     app.pretty_exceptions_show_locals = False
-    repo, config = load_ossutil_repo()
+    try:
+        repo, config = load_ossutil_repo()
+    except Exception as exc:
+        biz_code = getattr(exc, "biz_code", None)
+        status = getattr(exc, "status", None) or getattr(exc, "status_code", None)
+        msg = str(exc).lower()
+        is_forbidden = (
+            biz_code in _DFS_ACCESS_DENIED_CODES
+            or status == 403
+            or "forbidden" in msg
+            or "permission" in msg
+            or "not allowed" in msg
+        )
+        if is_forbidden:
+            typer.echo(
+                "ap dfs is currently available to platform admins and allow-listed users only.",
+                err=True,
+            )
+            raise typer.Exit(1) from exc
+        raise
     return OssFiles(repo, OssBinding.from_payload(config))
 
 

{ap_client-0.6.1.dev4 → ap_client-0.6.1.dev6}/ap_client/irepo_sdk.py

@@ -884,6 +884,7 @@ def load_repo(
     cluster: str | None = None,
     storage_env: str | None = None,
     environment: str | None = None,
+    request_timeout: float | None = None,
 ) -> "Repo":
     """按 AP ``Config`` 构造 ``instance_repo.Repo``。
 
@@ -942,7 +943,21 @@ def load_repo(
     if cfg.verbose and "transport" in supported:
         transport = _verbose_sdk_transport(cfg, api_env)
         if transport is not None:
+            if request_timeout is not None:
+                transport.timeout = request_timeout
             kwargs["transport"] = transport
+    elif request_timeout is not None and "transport" in supported:
+        # Inject a pre-configured Transport so the custom timeout is effective
+        # from the very first HTTP call inside Repo.__init__ / _bind_dataset_profile.
+        try:
+            from instance_repo.transport import Transport as _Transport
+        except ImportError:
+            _Transport = None
+        if _Transport is not None:
+            kwargs["transport"] = _Transport(
+                cfg.base_url, cfg.token_key or "", env=api_env,
+                timeout=request_timeout,
+            )
 
     if "api_base" not in supported or "cluster" not in supported:
         # 0.8.x 兼容路径:构造参数缺位,只能退回环境变量契约。

{ap_client-0.6.1.dev4 → ap_client-0.6.1.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.6.1.dev4"
+version = "0.6.1.dev6"
 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"
@@ -19,10 +19,10 @@ dependencies = [
 
 [project.optional-dependencies]
 dataset = [
-    "instance-repo[oss]>=1.4.0.dev4,<2.0.0",
+    "instance-repo[oss]>=1.4.0.dev6,<2.0.0",
 ]
 all = [
-    "instance-repo[oss]>=1.4.0.dev4,<2.0.0",
+    "instance-repo[oss]>=1.4.0.dev6,<2.0.0",
 ]
 
 [project.scripts]