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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.6.1.dev6
+Version: 0.6.1.dev8
 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.dev6; 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.0.dev6; 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.dev6 → ap_client-0.6.1.dev8}/ap_client/dataset_commands.py

@@ -2021,71 +2021,40 @@ def dataset_split_create(
             exit_code=2,
         )
 
-    detail = _fetch_version(
-        dataset,
-        resolved_version,
-        stage="split create precheck",
-        environment=environment,
-        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
-    )
-
-    existing = _split_names(detail)
-    if split in existing:
+    # 版本化创建走独立 Split API（POST /datasets/splits），与 split-first 服务端
+    # 契约对齐——旧 Version PATCH（splits 全量替换 / split_run_types）已被服务端
+    # 拒绝（"split-first Version group updates are not supported"）。
+    env = _environment(environment)
+    existing = _versioned_split(dataset, resolved_version, split, environment=environment)
+    if existing is not None:
         # 幂等:已存在同名 split(设计 §4.3)。
-        for record in _split_records(detail):
-            if str(record.get("name") or "") == split:
-                payload = dict(record)
-                payload.setdefault("dataset", dataset)
-                payload.setdefault("version", resolved_version)
-                payload["created"] = False
-                _emit_detail(payload, output_format)
-                return
-        _emit_detail(
-            {"dataset": dataset, "version": resolved_version, "split": split, "created": False},
-            output_format,
-        )
+        payload = dict(existing)
+        payload.setdefault("dataset", dataset)
+        payload.setdefault("version", resolved_version)
+        payload["created"] = False
+        _emit_detail(payload, output_format)
         return
 
-    # ① splits 全量 PATCH(现有 ∪ 新增)。
-    names = existing + [split]
-    _patch_version(
-        dataset,
-        resolved_version,
-        {"splits": names},
-        stage="split create",
-        environment=environment,
-        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
-    )
+    from .instance_commands import _sdk_read_kwargs
+    from .irepo_sdk import _reason
 
-    # ② run_type 只能第二次 PATCH:服务端 splits 与 split_run_types 互斥。
+    repo = _dataset_repo()
+    create_kwargs = _sdk_read_kwargs(repo.splits, "create", environment=env, metadata_model="")
     if resolved_run_type:
-        retry = (
-            f"ap dataset split update {split} --dataset {dataset} --run-type {resolved_run_type}"
-        )
-        if resolved_version:
-            retry += f" --version {resolved_version}"
-        _patch_version(
-            dataset,
-            resolved_version,
-            {"split_run_types": [{"name": split, "run_type": resolved_run_type}]},
-            stage=f"split {split} set run_type",
-            # 第一段 PATCH 已建出 split,失败后的恢复动作是补打 run_type,不是重跑 create。
-            fallback_hint=f"split {split} was created but run_type is not set; set it now: {retry}",
-            environment=environment,
-            metadata_model=_VERSION_SPLIT_METADATA_MODEL,
-        )
-
-    _emit_detail(
-        {
-            "dataset": dataset,
-            "version": resolved_version,
-            "split": split,
-            "run_type": resolved_run_type,
-            "splits": names,
-            "created": True,
-        },
-        output_format,
-    )
+        create_kwargs["run_type"] = resolved_run_type
+    try:
+        record = repo.splits.create(dataset, split, version=resolved_version, **create_kwargs)
+    except Exception as exc:  # noqa: BLE001 - 统一走设计 §5.1 的映射
+        raise _fail(
+            f"Failed to create split {split} of dataset {dataset} version {resolved_version}: {_reason(exc)}",
+            "Check the version name and write permission, then retry",
+        ) from exc
+    payload = _model_dict(record) if record is not None else {}
+    payload.setdefault("dataset", dataset)
+    payload.setdefault("version", resolved_version)
+    payload.setdefault("split", split)
+    payload["created"] = True
+    _emit_detail(payload, output_format)
 
 
 @dataset_split_app.command("update")
@@ -2165,31 +2134,48 @@ def dataset_split_update(
         )
         return
 
-    detail = _fetch_version(
-        dataset,
-        resolved_version,
-        stage="split update precheck",
-        environment=environment,
-        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
-    )
-
-    if split not in _split_names(detail):
-        known = ", ".join(_split_names(detail)) or "<none>"
-        hint = f"Create it first: ap dataset split create {split} --dataset {dataset} (existing: {known})"
+    # 版本化更新走独立 Split API（PATCH /datasets/splits/detail），预检用精确
+    # split 身份（splits.get with version）——旧实现查 Version 内嵌 splits 再
+    # PATCH Version，与独立 Split 记录不匹配，导致"已存在却报 not found"。
+    env = _environment(environment)
+    if env == "pre":
+        raise _fail(
+            f"Failed to update split {split} of dataset {dataset}: split records can only be changed in the online environment",
+            "PATCH on split records only supports online; drop --environment pre",
+            exit_code=2,
+        )
+    record = _versioned_split(dataset, resolved_version, split, environment=environment)
+    if record is None:
+        known = (
+            ", ".join(
+                _split_names_of(
+                    _versioned_splits(
+                        dataset, resolved_version, stage="split update precheck",
+                        environment=environment,
+                    )
+                )
+            )
+            or "<none>"
+        )
         raise _fail(
             f"dataset {dataset} version {_version_label(resolved_version)} split {split}: "
             f"update failed: not found",
-            hint,
+            f"Create it first: ap dataset split create {split} --dataset {dataset} "
+            f"--version {resolved_version} (existing: {known})",
         )
 
-    _patch_version(
-        dataset,
-        resolved_version,
-        {"split_run_types": [{"name": split, "run_type": resolved_run_type}]},
-        stage="split update",
-        environment=environment,
-        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
-    )
+    from .instance_commands import _sdk_read_kwargs
+    from .irepo_sdk import _reason
+
+    repo = _dataset_repo()
+    update_kwargs = _sdk_read_kwargs(repo.splits, "update", environment=env, metadata_model="")
+    try:
+        repo.splits.update(dataset, split, version=resolved_version, run_type=resolved_run_type, **update_kwargs)
+    except Exception as exc:  # noqa: BLE001 - 统一走设计 §5.1 的映射
+        raise _fail(
+            f"Failed to update split {split} of dataset {dataset} version {resolved_version}: {_reason(exc)}",
+            "Write permission on this dataset is required; check the split name and the online environment, then retry",
+        ) from exc
     _emit_detail(
         {
             "dataset": dataset,

{ap_client-0.6.1.dev6 → ap_client-0.6.1.dev8}/ap_client/ossutil_io.py

@@ -1120,12 +1120,17 @@ class OssFiles:
         bucket = self.bucket(remote.key, "writer")
         if self._mkdir_marker_exists(bucket, remote):
             return {"path": remote.path, "created": False}
-        info = bucket.get_bucket_info()
+        # 版本控制探测是尽力而为：旧构建的 dataset STS 缺 GetBucketInfo
+        # （AccessDenied 403），或桶开启/暂停版本控制时 forbid-overwrite 会被
+        # OSS 忽略。对 zero-byte 目录 marker 这两者都无害——重复 mkdir 至多
+        # 多出一个空 marker 版本，"非空 marker 拒绝"仍由上面的 HEAD 保证；
+        # 因此不再因无法确认版本状态而硬拒，写入保持 forbid-overwrite 尽力语义。
         try:
-            # OSS ignores forbid-overwrite when versioning is enabled or suspended.
-            if info.versioning_status not in (None, "", "Disabled"):
-                raise OssOperationError("Bucket versioning prevents atomic no-overwrite mkdir")
-        finally:
+            info = bucket.get_bucket_info()
+        except Exception as exc:
+            if getattr(exc, "code", None) != "AccessDenied":
+                raise
+        else:
             _close_result(info)
         try:
             result = bucket.put_object(remote.key, b"", headers={"x-oss-forbid-overwrite": "true"})

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

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