ap-client 0.5.3.dev3__tar.gz → 0.5.3.dev5__tar.gz

{ap_client-0.5.3.dev3 → ap_client-0.5.3.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.5.3.dev3
+Version: 0.5.3.dev5
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
 Requires-Dist: irepo-artifact==0.2.1
@@ -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.3.5.dev2; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5.dev3; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5.dev2; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5.dev3; 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.5.3.dev3 → ap_client-0.5.3.dev5}/ap_client/ossutil_commands.py

@@ -8,7 +8,7 @@ from typing import Optional
 
 import typer
 
-from .ossutil_io import OssBinding, OssFiles, OssUsageError, safe_error
+from .ossutil_io import OssBinding, OssFiles, OssUsageError, direction_for, safe_error
 
 ossutil_app = typer.Typer(
     help="OSS file operations within the server-configured storage prefix", no_args_is_help=True
@@ -220,11 +220,8 @@ def oss_cat(
 
 @ossutil_app.command("cp")
 def oss_cp(
-    src: str = typer.Argument(..., help="Local path, full OSS URI or remote relative path"),
-    dst: str = typer.Argument(..., help="Local path, full OSS URI or remote relative path"),
-    direction: Optional[str] = typer.Option(
-        None, "--direction", help="AP extension for two relative paths: upload/download/copy"
-    ),
+    src: str = typer.Argument(..., help="Local path or full oss:// URI"),
+    dst: str = typer.Argument(..., help="Local path or full oss:// URI"),
     recursive: bool = typer.Option(False, "--recursive", "-r"),
     force: bool = typer.Option(False, "--force", "-f", help="Overwrite without confirmation"),
     update: bool = typer.Option(False, "--update", "-u", help="Copy only missing or older targets"),
@@ -251,7 +248,8 @@ def oss_cp(
     payer: Optional[str] = typer.Option(None, "--payer"),
     output_format: Optional[str] = typer.Option(None, "--output-format", "--format"),
 ):
-    """Upload, download or copy objects. Downloads require private-network access."""
+    """Upload, download or copy objects. One operand must be a full oss:// URI.
+    Downloads require private-network access."""
     lock = threading.Lock()
 
     def progress(path, done, total):
@@ -280,6 +278,7 @@ def oss_cp(
         fmt = _format(output_format)
         if start_time is not None and end_time is not None and start_time > end_time:
             raise OssUsageError("--start-time cannot be later than --end-time")
+        direction_for(src, dst)
         files = _files()
         _configure(files, encoding_type, payer)
         files.disable_crc64 = disable_crc64
@@ -316,7 +315,6 @@ def oss_cp(
         result = files.cp(
             src,
             dst,
-            direction=direction,
             recursive=recursive,
             overwrite=force,
             jobs=jobs,

{ap_client-0.5.3.dev3 → ap_client-0.5.3.dev5}/ap_client/ossutil_io.py

@@ -140,17 +140,18 @@ class RemotePath:
     path: str
 
 
-def direction_for(src: str, dst: str, direction: str | None) -> str:
+def direction_for(src: str, dst: str) -> str:
+    """Infer cp direction the way ossutil does: at least one operand is an OSS URI."""
     remote_src, remote_dst = src.startswith("oss://"), dst.startswith("oss://")
-    if direction is None:
-        if not remote_src and not remote_dst:
-            raise OssUsageError("Relative cp paths require --direction upload, download or copy")
-        direction = "copy" if remote_src and remote_dst else "download" if remote_src else "upload"
-    if direction not in ("upload", "download", "copy"):
-        raise OssUsageError("--direction must be upload, download or copy")
-    if direction == "upload" and remote_src or direction == "download" and remote_dst:
-        raise OssUsageError("The local cp operand cannot be an OSS URI")
-    return direction
+    if remote_src and remote_dst:
+        return "copy"
+    if remote_src:
+        return "download"
+    if remote_dst:
+        return "upload"
+    raise OssUsageError(
+        "cp requires at least one operand starting with oss://; paths without it are local"
+    )
 
 
 def matches(path: str, include: tuple[str, ...], exclude: tuple[str, ...]) -> bool:
@@ -284,20 +285,14 @@ class OssFiles:
     def resolve(self, value: str, **kwargs) -> RemotePath:
         return self.binding.resolve(value, encoding_type=self.encoding_type, **kwargs)
 
-    def _dataset_for(self, scope: str) -> str | None:
-        if not scope.startswith(self.binding.prefix):
-            raise OssUsageError("OSS path is outside repo-config prefix")
-        relative = scope[len(self.binding.prefix) :].rstrip("/")
-        return "/".join(relative.split("/")[:2]) if relative else None
-
     def _credentials(self, scope: str, permission: str, list_only: bool) -> dict:
         cred = dict(
             self.repo.transport.get_oss_credentials(
                 self.binding.bucket,
                 scope,
-                dataset_name=self._dataset_for(scope),
                 permission=permission,
                 list_only=list_only,
+                dataset_source="oss",
             )
         )
         # The SDK treats OSS_REGION as optional; repo-config supplies the signing region.
@@ -796,7 +791,6 @@ class OssFiles:
         src: str,
         dst: str,
         *,
-        direction: str | None,
         recursive: bool,
         overwrite: bool,
         jobs: int,
@@ -811,7 +805,7 @@ class OssFiles:
         start_time: int | None = None,
         end_time: int | None = None,
     ) -> dict:
-        direction = direction_for(src, dst, direction)
+        direction = direction_for(src, dst)
         remote_src = self.resolve(src, directory=recursive) if direction != "upload" else None
         remote_dst = None
         if direction != "download":

{ap_client-0.5.3.dev3 → ap_client-0.5.3.dev5}/ap_client/repo_read_guard.py

@@ -20,7 +20,7 @@ def oss_fallback_kwargs(repo: Any, client: Any, method: str, environment: str) -
     discovery. auto follows the bound store. Bind missing SDK discovery provenance.
     """
     profile = getattr(repo, "profile", None)
-    # instance-repo 1.3.5.dev2 reads _p in Dataset discovery without binding it
+    # instance-repo 1.3.5.dev2+ reads _p in Dataset discovery without binding it
     # during construction. Supply the actual Repo profile before that check.
     if callable(getattr(client, "_discovery_env_match", None)) and not hasattr(client, "_p"):
         client._p = profile

{ap_client-0.5.3.dev3 → ap_client-0.5.3.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.5.3.dev3"
+version = "0.5.3.dev5"
 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.3.5.dev2,<2.0.0",
+    "instance-repo[oss]>=1.3.5.dev3,<2.0.0",
 ]
 all = [
-    "instance-repo[oss]>=1.3.5.dev2,<2.0.0",
+    "instance-repo[oss]>=1.3.5.dev3,<2.0.0",
 ]
 
 [project.scripts]