ap-client 0.6.1.dev13__tar.gz → 0.7.0__tar.gz

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.6.1.dev13
+Version: 0.7.0
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
-Requires-Dist: irepo-artifact==0.2.2
+Requires-Dist: irepo-artifact==0.2.4
 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: websockets>=13.0
 Provides-Extra: all
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.1.dev0; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.1.dev0; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.0; 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.dev13 → ap_client-0.7.0}/ap_client/cli.py

@@ -955,6 +955,25 @@ def _print_job_get_plain(job: dict) -> None:
         ]
     )
 
+    bindings = job.get("ak_bindings") or []
+    rows = [
+        {**parameter, "ak_id": binding["ak_id"]}
+        for binding in bindings
+        for parameter in binding.get("parameters", [])
+    ]
+    if "ak_bindings.parameters" in (job.get("restricted_fields") or []):
+        typer.echo("\nManaged AK parameters: content access required")
+    elif rows:
+        typer.echo("\nManaged AK parameters")
+        for row in rows:
+            typer.echo(f"  {row['parameter']}: {row['value']} -> {row['ak_id']}")
+        if any("parameters" not in binding for binding in bindings):
+            typer.echo("  Some historical parameter mappings are unavailable")
+    elif response_ak_ids(job):
+        typer.echo("\nManaged AK parameters: historical mapping unavailable")
+    elif "ak_bindings" in job:
+        typer.echo("\nManaged AK parameters\n  No managed AK used")
+
     meta_pairs = [
         ("meta_model", job.get("meta_model")),
         ("meta_job_type", job.get("meta_job_type")),

ap_client-0.7.0/ap_client/dataset_name.py

@@ -0,0 +1,104 @@
+"""DatasetName 解析 Adapter:唯一入口委托给已安装的 InstanceRepo SDK。
+
+AP CLI 不维护第三套 dataset 名解析:``instance_repo.paths.DatasetName`` 是客户端
+路径契约的唯一事实源(单段 ``A`` / 两段 ``A/B`` / 多段树形 ``A/B/C``,与
+apiserver 的 namespace guard 及 conformance 契约对齐)。SDK 缺失或过旧(没有
+``DatasetName.parse`` 能力)时,给出明确的升级提示,不静默降级、不本地重写解析规则。
+"""
+
+from __future__ import annotations
+
+import re
+import unicodedata
+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"
+)
+
+#: 多段(3+)名能力的首个 SDK 版本。旧 SDK(如 1.4.0)有 parse 但只认 1-2 段,
+#: 对多段名会抛"one or two canonical segments"——此时应提示升级而非报名称非法。
+_MULTI_LEVEL_SDK_VERSION = (1, 4, 1)
+
+
+def _sdk_supports_multi_level() -> bool:
+    """已安装 instance-repo 是否支持多段数据集名(>= 1.4.1)。版本不可读时保守视为不支持。"""
+    try:
+        from importlib.metadata import version
+
+        installed = version("instance-repo")
+    except Exception:  # noqa: BLE001 - 元数据缺失与旧 SDK 同等对待
+        return False
+    match = re.match(r"(\d+)\.(\d+)\.(\d+)", str(installed))
+    if not match:
+        return False
+    return tuple(int(part) for part in match.groups()) >= _MULTI_LEVEL_SDK_VERSION
+
+
+def _is_structurally_valid_multi_level(value: str) -> bool:
+    """值是否为"新 SDK 会接受"的 3+ 段名——即每个段都合法。
+
+    旧 SDK 对非法名(空段 a//b、非法字符 a*b)与多段名报同一文案,不能只按
+    段数判断:升级 SDK 也修不好空段/非法字符,必须保留原始校验错误。
+    这里保守复刻 SDK 的非法段规则作为 gate,只放行结构上合法的多段名。
+    """
+    parts = value.split("/")
+    if len(parts) < 3 or any(not part for part in parts):
+        return False
+    for part in parts:
+        if (
+            part in {".", ".."}
+            or "\\" in part
+            or "*" in part
+            or "?" in part
+            or any(unicodedata.category(char) == "Cc" for char in part)
+        ):
+            return False
+    return True
+
+
+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 (包括只认 1-2 段的旧 SDK 拒绝多段名);
+    raises :class:`DatasetNameError` when the value is not a valid 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 契约
+        # 旧 SDK(1.4.0 及更早)只认 1-2 段:结构上合法的多段名被拒时给出
+        # 升级提示。非法名(空段/非法字符)无论新旧 SDK 都拒绝,保留原始
+        # 校验错误为 DatasetNameError——升级修不好这类名称。
+        if (
+            isinstance(value, str)
+            and _is_structurally_valid_multi_level(value)
+            and not _sdk_supports_multi_level()
+        ):
+            raise DatasetNameUpgradeRequired(_UPGRADE_HINT) from exc
+        raise DatasetNameError(str(exc)) from exc

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/ap_client/dfs_commands.py

@@ -272,13 +272,16 @@ def _fail(exc: Exception) -> None:
     if isinstance(exc, SdkMissing):
         typer.echo(str(exc), err=True)
         raise typer.Exit(2) from exc
-    message = str(exc) if isinstance(exc, ConfigurationError) else safe_error(exc)
+    input_errors = (OssUsageError, ConfigurationError, typer.BadParameter)
+    message = (
+        str(exc) if isinstance(exc, (ConfigurationError, typer.BadParameter)) else safe_error(exc)
+    )
     typer.echo("error: " + _display(message), err=True)
     if getattr(exc, "biz_code", None):
         typer.echo(f"hint: Check the Dataset access grant (API code {exc.biz_code})", err=True)
     elif getattr(exc, "code", None) == "AccessDenied":
         typer.echo("hint: Check the Dataset reader/writer grant for this operation", err=True)
-    raise typer.Exit(2 if isinstance(exc, (OssUsageError, ConfigurationError)) else 1) from exc
+    raise typer.Exit(2 if isinstance(exc, input_errors) else 1) from exc
 
 
 @dfs_app.command("ls")

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/ap_client/instance_commands.py

@@ -709,7 +709,7 @@ def instance_push(
     prune: bool = typer.Option(
         False,
         "--prune",
-        help="After delivery, remove remote metadata absent from the supplied cases; OSS files remain",
+        help="Disabled: SDK safe pruning is unavailable; delete obsolete metadata explicitly",
     ),
     yes: bool = typer.Option(
         False,
@@ -1018,7 +1018,7 @@ def instance_pull(
     if private_endpoint_reachable is False:
         raise _fail(
             f"Failed to pull instance {instance}: the private OSS endpoint is unreachable from this network",
-            "instance pull does not support public download",
+            "instance pull does not support public download; run inside an AP dev cluster / ROCK VPC",
         )
 
     # SDK 的 swe/custom 下载会先往输出目录写 <id>.json 与 .probe 中间文件,再由

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/ap_client/instance_options.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import inspect
 import json
-from importlib import metadata
 from pathlib import Path
 from typing import Any
 
@@ -75,14 +74,10 @@ def upload_hashes(records: list[dict], supplied: dict[str, str], skip: bool) ->
 
 
 def require_working_prune() -> None:
-    try:
-        version = metadata.version("instance-repo")
-    except metadata.PackageNotFoundError:
-        return
-    if version in {"1.3.5.dev1", "1.3.5.dev2"}:
-        raise ValueError(
-            f"instance-repo {version} cannot complete --prune; upgrade to a fixed SDK before uploading"
-        )
+    raise ValueError(
+        "--prune is disabled before uploading: instance-repo does not support safe pruning. "
+        "Upload without --prune; review and delete obsolete instance metadata explicitly."
+    )
 
 
 def progress_callback(completed: int, total: int, result: Any) -> None:

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/ap_client/irepo_sdk.py

@@ -946,7 +946,7 @@ def load_repo(
             if request_timeout is not None:
                 transport.timeout = request_timeout
             kwargs["transport"] = transport
-    elif request_timeout is not None and "transport" in supported:
+    if request_timeout is not None and "transport" in supported and "transport" not in kwargs:
         # Inject a pre-configured Transport so the custom timeout is effective
         # from the very first HTTP call inside Repo.__init__ / _bind_dataset_profile.
         try:
@@ -1161,7 +1161,7 @@ _BIZ_CODE_RULES: dict[int, tuple[str, int]] = {
 # 字符串 ``code`` → (hint, 退出码)。SDK 的 ``InstanceRepoError.code``。
 _CODE_RULES: dict[str, tuple[str, int]] = {
     "E_PRIVATE_NETWORK_REQUIRED": (
-        "This operation requires private-network access; run inside an intranet environment",
+        "This operation requires private-network access; run inside an AP dev cluster / ROCK VPC",
         1,
     ),
     "E_DIGEST_MISMATCH": ("Content digest check failed; pull or repack the instance again", 1),
@@ -1195,7 +1195,9 @@ _CODE_RULES: dict[str, tuple[str, int]] = {
 }
 
 #: 无法归类时的兜底文案。
-_FALLBACK_HINT = "Rerun with -v/--verbose for the full traceback"
+_FALLBACK_HINT = (
+    "Rerun with -v/--verbose for the full traceback; contact the Agent Platform on-call if needed"
+)
 
 # 数据面寻址字段:``/apis/v1/repo-config`` 在当前 apiserver 里不存在(设计 §8.3),SDK 的
 # 自动发现是 best-effort、构造期不抛错,真正用到某字段时才由 ``bootstrap.require`` 抛

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/ap_client/ossutil_io.py

@@ -7,6 +7,7 @@ import hashlib
 import json
 import os
 import re
+import stat
 import tempfile
 import time
 import unicodedata
@@ -300,9 +301,9 @@ class OssFiles:
 
         凭据请求携带 ``dataset_name``:普通调用方在控制面按它走 dataset RBAC(旧 prod
         构建也要求显式上下文)。ans:// 路径是 dataset 相对的,dataset 名就是最长前缀
-        (两段 L1/L2 优先,单段 L1 兜底);由于 ``A``(L1)与 ``A/B`` 可能同时是合法布局,
+        (任意深度的最长已注册前缀优先);由于 ``A``(L1)与 ``A/B`` 可能同时是合法布局,
         这里以**注册表为准**:候选按"最长优先"查注册,第一个命中者胜出;都未注册时退回
-        最长候选(系统白名单/平台管理员的 raw 路径与服务端的 list-only 发现都会校验
+        原有最多两段上下文(系统身份的 raw 路径与服务端的 list-only 发现都会校验
         claimed 命名空间,写操作仍由服务端拒绝)。结果按相对路径缓存,一次命令内多次
         签发只查一次。
         """
@@ -322,18 +323,16 @@ class OssFiles:
         segments = [segment for segment in relative.split("/") if segment]
         if not segments:
             return None
-        candidates = (
-            ["/".join(segments[:2]), segments[0]] if len(segments) >= 2 else [segments[0]]
-        )
+        # Validate each segment with the SDK. Older SDKs only parse one or two
+        # levels at a time; that limit must not truncate registry lookup paths.
         valid: list[str] = []
-        for candidate in candidates:
+        for index, segment in enumerate(segments):
             try:
-                parse_dataset_name(candidate)
+                parse_dataset_name(segment)
             except DatasetNameError:
-                # 段本身合法(``_relative`` 已挡空/./..、反斜杠、通配与控制字符),
-                # 这里只是防御 SDK 契约收紧;候选不合法就跳过,不整条失败。
-                continue
-            valid.append(candidate)
+                break
+            valid.append("/".join(segments[: index + 1]))
+        valid.reverse()
         if not valid:
             return None
         for candidate in valid:
@@ -344,8 +343,9 @@ class OssFiles:
                     raise
                 continue
             return candidate
-        # 无任何注册命中:退回最长候选,list-only 发现与写操作的授权判定交给服务端。
-        return valid[0]
+        # 未注册路径的 list-only 发现与写操作仍由服务端授权。
+        # Preserve the legacy raw-OSS discovery namespace when none is registered.
+        return valid[-2] if len(valid) >= 2 else valid[0]
 
     def _credentials(self, scope: str, permission: str, list_only: bool) -> dict:
         kwargs: dict[str, Any] = {}
@@ -559,7 +559,10 @@ class OssFiles:
     def cat(self, remote: RemotePath, output: Any) -> None:
         result = self.bucket(remote.key, "reader", private_only=True).get_object(remote.key)
         try:
-            while data := result.read(1024 * 1024):
+            from .ossutil_hash import _stored_content_stream
+
+            stream = _stored_content_stream(result)
+            while data := stream.read(1024 * 1024):
                 output.write(data)
         finally:
             result.resp.response.close()
@@ -654,11 +657,25 @@ class OssFiles:
             if target.exists() and not overwrite:
                 raise OssOperationError(f"Local target already exists: {target}; use --force")
             suffix = hashlib.sha256((remote.bucket + remote.key).encode()).hexdigest()[:16]
-            partial = target.with_name(f".ap-{target.name}-{suffix}.part")
-            for path in (partial, Path(str(partial) + ".tmp")):
-                fd = os.open(path, os.O_CREAT | os.O_WRONLY | getattr(os, "O_NOFOLLOW", 0), 0o600)
+            # oss2 creates random .tmp-* siblings, so protect their directory
+            # throughout the download, including interruptions and retries.
+            staging = target.with_name(f".ap-{target.name}-{suffix}.download")
+            staging.mkdir(mode=0o700, exist_ok=True)
+            directory_fd = os.open(
+                staging, os.O_RDONLY | os.O_DIRECTORY | getattr(os, "O_NOFOLLOW", 0)
+            )
+            try:
+                if os.fstat(directory_fd).st_uid != os.getuid():
+                    raise OssOperationError("Download staging directory must belong to this user")
+                os.fchmod(directory_fd, 0o700)
+            finally:
+                os.close(directory_fd)
+            partial = staging / "content.part"
+            fd = os.open(partial, os.O_CREAT | os.O_WRONLY | getattr(os, "O_NOFOLLOW", 0), 0o600)
+            try:
+                os.fchmod(fd, 0o600)
+            finally:
                 os.close(fd)
-                path.chmod(0o600)
             if self.byte_range is not None:
                 result = bucket.get_object(
                     remote.key,
@@ -682,13 +699,20 @@ class OssFiles:
                     part_size=self.part_size,
                     progress_callback=self._progress(remote.path, progress),
                 )
+            fd = os.open(partial, os.O_RDONLY | getattr(os, "O_NOFOLLOW", 0))
+            try:
+                if not stat.S_ISREG(os.fstat(fd).st_mode):
+                    raise OssOperationError("Download staging content must be a regular file")
+                os.fchmod(fd, 0o600)
+            finally:
+                os.close(fd)
             self._check_local_path(target)
             if overwrite:
                 os.replace(partial, target)
             else:
                 os.link(partial, target)
                 partial.unlink()
-            Path(str(partial) + ".tmp").unlink(missing_ok=True)
+            staging.rmdir()
 
     @staticmethod
     def _check_local_path(path: Path) -> None:

{ap_client-0.6.1.dev13 → ap_client-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.6.1.dev13"
+version = "0.7.0"
 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"
@@ -14,15 +14,15 @@ dependencies = [
     "rich>=13.0.0",
     "PyYAML>=6.0",
     "websockets>=13.0",
-    "irepo-artifact==0.2.2",
+    "irepo-artifact==0.2.4",
 ]
 
 [project.optional-dependencies]
 dataset = [
-    "instance-repo[oss]>=1.4.1.dev0,<2.0.0",
+    "instance-repo[oss]>=1.4.0,<2.0.0",
 ]
 all = [
-    "instance-repo[oss]>=1.4.1.dev0,<2.0.0",
+    "instance-repo[oss]>=1.4.0,<2.0.0",
 ]
 
 [project.scripts]

ap_client-0.6.1.dev13/ap_client/dataset_name.py

@@ -1,53 +0,0 @@
-"""DatasetName 解析 Adapter:唯一入口委托给已安装的 InstanceRepo SDK。
-
-AP CLI 不维护第三套 dataset 名解析:``instance_repo.paths.DatasetName`` 是客户端
-路径契约的唯一事实源(单段 ``A`` / 两段 ``A/B`` / 多段树形 ``A/B/C``,与
-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