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

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

@@ -1,13 +1,15 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.5.3.dev5
+Version: 0.5.3.dev7
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
+Requires-Dist: click>=8.0.0
 Requires-Dist: irepo-artifact==0.2.1
 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: urllib3>=1.26
 Requires-Dist: websockets>=13.0
 Provides-Extra: all
 Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5.dev3; extra == 'all'

{ap_client-0.5.3.dev5 → ap_client-0.5.3.dev7}/ap_client/irepo_sdk.py

@@ -1001,9 +1001,9 @@ def load_ossutil_repo() -> tuple[Any, dict]:
     cfg = get_config(verbose=_api._verbose_override, cluster=_api._cluster_override)
     cluster = _cluster_from_headers(cfg.headers)
     if not cluster:
-        raise ConfigurationError("Set --cluster / AP_CLUSTER before using ap ossutil")
+        raise ConfigurationError("Set --cluster / AP_CLUSTER before using ap oss")
     if not cfg.token_key:
-        raise ConfigurationError("Set AP_API_KEY before using ap ossutil")
+        raise ConfigurationError("Set AP_API_KEY before using ap oss")
     transport = Transport(cfg.base_url, cfg.token_key, env=_env_header(cfg.headers))
     if cfg.verbose:
         # STS material must stay redacted even when general HTTP redaction is disabled.

{ap_client-0.5.3.dev5 → ap_client-0.5.3.dev7}/ap_client/ossutil_commands.py

@@ -4,11 +4,11 @@ from __future__ import annotations
 
 import threading
 from pathlib import Path
-from typing import Optional
+from typing import Annotated, Optional
 
 import typer
 
-from .ossutil_io import OssBinding, OssFiles, OssUsageError, direction_for, safe_error
+from .ossutil_io import OssBinding, OssFiles, OssUsageError, safe_error
 
 ossutil_app = typer.Typer(
     help="OSS file operations within the server-configured storage prefix", no_args_is_help=True
@@ -16,7 +16,7 @@ ossutil_app = typer.Typer(
 
 
 def register(app: typer.Typer) -> None:
-    app.add_typer(ossutil_app, name="ossutil")
+    app.add_typer(ossutil_app, name="oss")
 
 
 def _files() -> OssFiles:
@@ -218,38 +218,67 @@ def oss_cat(
         _fail(exc)
 
 
-@ossutil_app.command("cp")
-def oss_cp(
-    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"),
-    jobs: int = typer.Option(3, "--jobs", "--job", "-j", min=1, max=10000),
-    parallel: int = typer.Option(4, "--parallel", min=1, max=10000),
-    bigfile_threshold: int = typer.Option(100 * 1024 * 1024, "--bigfile-threshold", min=0),
-    part_size: Optional[int] = typer.Option(None, "--part-size", min=1),
-    checkpoint_dir: Optional[Path] = typer.Option(None, "--checkpoint-dir"),
-    include: Optional[list[str]] = typer.Option(None, "--include"),
-    exclude: Optional[list[str]] = typer.Option(None, "--exclude"),
-    only_current_dir: bool = typer.Option(False, "--only-current-dir"),
-    disable_ignore_error: bool = typer.Option(False, "--disable-ignore-error"),
-    disable_crc64: bool = typer.Option(False, "--disable-crc64"),
-    disable_all_symlink: bool = typer.Option(False, "--disable-all-symlink"),
-    byte_range: Optional[str] = typer.Option(
-        None, "--range", help="Download bytes: START-END, START-, or -END"
-    ),
-    meta: Optional[str] = typer.Option(
-        None, "--meta", help="Object metadata: header:value#header:value"
-    ),
-    start_time: Optional[int] = typer.Option(None, "--start-time", min=0),
-    end_time: Optional[int] = typer.Option(None, "--end-time", min=0),
-    encoding_type: Optional[str] = typer.Option(None, "--encoding-type"),
-    payer: Optional[str] = typer.Option(None, "--payer"),
-    output_format: Optional[str] = typer.Option(None, "--output-format", "--format"),
-):
-    """Upload, download or copy objects. One operand must be a full oss:// URI.
-    Downloads require private-network access."""
+Recursive = Annotated[bool, typer.Option("--recursive", "-r")]
+Force = Annotated[bool, typer.Option("--force", "-f", help="Overwrite without confirmation")]
+Update = Annotated[bool, typer.Option("--update", "-u", help="Copy only missing or older targets")]
+Jobs = Annotated[int, typer.Option("--jobs", "--job", "-j", min=1, max=10000)]
+Parallel = Annotated[int, typer.Option("--parallel", min=1, max=10000)]
+BigFileThreshold = Annotated[int, typer.Option("--bigfile-threshold", min=0)]
+PartSize = Annotated[Optional[int], typer.Option("--part-size", min=1)]
+CheckpointDir = Annotated[Optional[Path], typer.Option("--checkpoint-dir")]
+Include = Annotated[Optional[list[str]], typer.Option("--include")]
+Exclude = Annotated[Optional[list[str]], typer.Option("--exclude")]
+OnlyCurrentDir = Annotated[bool, typer.Option("--only-current-dir")]
+DisableIgnoreError = Annotated[bool, typer.Option("--disable-ignore-error")]
+DisableCrc64 = Annotated[bool, typer.Option("--disable-crc64")]
+DisableAllSymlink = Annotated[bool, typer.Option("--disable-all-symlink")]
+ByteRange = Annotated[
+    Optional[str], typer.Option("--range", help="Download bytes: START-END, START-, or -END")
+]
+Meta = Annotated[
+    Optional[str], typer.Option("--meta", help="Object metadata: header:value#header:value")
+]
+StartTime = Annotated[Optional[int], typer.Option("--start-time", min=0)]
+EndTime = Annotated[Optional[int], typer.Option("--end-time", min=0)]
+EncodingType = Annotated[Optional[str], typer.Option("--encoding-type")]
+Payer = Annotated[Optional[str], typer.Option("--payer")]
+OutputFormat = Annotated[Optional[str], typer.Option("--output-format", "--format")]
+
+#: Operand forms that are always local paths. Everything else (including a bare
+#: relative path) addresses the repo-config prefix.
+_LOCAL_PREFIXES = ("./", "../", "/", "~")
+
+
+def _looks_local(value: str) -> bool:
+    return value in (".", "..", "-") or value.startswith(_LOCAL_PREFIXES)
+
+
+def _require_remote(value: str, argument: str) -> None:
+    if not value.startswith("oss://") and _looks_local(value):
+        raise OssUsageError(
+            f"{argument} must be an oss:// URI or a repo-relative path; "
+            "use get or put for local files"
+        )
+
+
+def _require_local(value: str, argument: str) -> None:
+    if value.startswith("oss://"):
+        raise OssUsageError(f"{argument} must be a local path; use cp for OSS-to-OSS copies")
+
+
+def _transfer(direction: str, src: str, dst: str, ctx: typer.Context) -> None:
+    options = ctx.params
+    recursive = bool(options.get("recursive"))
+    force = bool(options.get("force"))
+    update = bool(options.get("update"))
+    only_current_dir = bool(options.get("only_current_dir"))
+    disable_ignore_error = bool(options.get("disable_ignore_error"))
+    disable_crc64 = bool(options.get("disable_crc64"))
+    disable_all_symlink = bool(options.get("disable_all_symlink"))
+    byte_range = options.get("byte_range")
+    meta = options.get("meta")
+    start_time = options.get("start_time")
+    end_time = options.get("end_time")
     lock = threading.Lock()
 
     def progress(path, done, total):
@@ -275,12 +304,23 @@ def oss_cp(
                 typer.echo("Enter y or n", err=True)
 
     try:
-        fmt = _format(output_format)
+        fmt = _format(options.get("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)
+        if direction == "download":
+            _require_remote(src, "REMOTE")
+            _require_local(dst, "LOCAL")
+        elif direction == "upload":
+            _require_local(src, "LOCAL")
+            _require_remote(dst, "REMOTE")
+        else:
+            _require_remote(src, "SRC")
+            _require_remote(dst, "DST")
         files = _files()
-        _configure(files, encoding_type, payer)
+        from .irepo_sdk import _is_verbose
+
+        files.verbose = _is_verbose()
+        _configure(files, options.get("encoding_type"), options.get("payer"))
         files.disable_crc64 = disable_crc64
         files.disable_all_symlink = disable_all_symlink
         files.byte_range = None
@@ -309,20 +349,24 @@ def oss_cp(
                         "--meta requires standard content headers or x-oss-meta-* headers"
                     )
                 files.write_headers[key] = value
-        files.multipart_threshold, files.part_size = bigfile_threshold, part_size
+        files.multipart_threshold = options.get("bigfile_threshold", 100 * 1024 * 1024)
+        files.part_size = options.get("part_size")
+        checkpoint_dir = options.get("checkpoint_dir")
         if checkpoint_dir is not None:
-            files.state_dir = checkpoint_dir
+            # ctx.params carries the raw value; Typer only converts to Path in the callback.
+            files.state_dir = Path(checkpoint_dir)
         result = files.cp(
             src,
             dst,
+            direction=direction,
             recursive=recursive,
             overwrite=force,
-            jobs=jobs,
-            parallel=parallel,
+            jobs=options.get("jobs", 3),
+            parallel=options.get("parallel", 4),
             progress=progress,
             update=update,
-            include=tuple(include or ()),
-            exclude=tuple(exclude or ()),
+            include=tuple(options.get("include") or ()),
+            exclude=tuple(options.get("exclude") or ()),
             only_current_dir=only_current_dir,
             stop_on_error=disable_ignore_error,
             confirm=None if force or update else confirm,
@@ -335,3 +379,91 @@ def oss_cp(
     _emit(result, fmt)
     if result["failed_count"]:
         raise typer.Exit(1)
+
+
+@ossutil_app.command("get")
+def oss_get(
+    ctx: typer.Context,
+    remote: str = typer.Argument(..., help="Remote oss:// URI or repo-relative path"),
+    local: str = typer.Argument(".", help="Local file or directory to write"),
+    recursive: Recursive = False,
+    force: Force = False,
+    update: Update = False,
+    jobs: Jobs = 3,
+    parallel: Parallel = 4,
+    bigfile_threshold: BigFileThreshold = 100 * 1024 * 1024,
+    part_size: PartSize = None,
+    checkpoint_dir: CheckpointDir = None,
+    include: Include = None,
+    exclude: Exclude = None,
+    only_current_dir: OnlyCurrentDir = False,
+    disable_ignore_error: DisableIgnoreError = False,
+    disable_crc64: DisableCrc64 = False,
+    byte_range: ByteRange = None,
+    start_time: StartTime = None,
+    end_time: EndTime = None,
+    encoding_type: EncodingType = None,
+    payer: Payer = None,
+    output_format: OutputFormat = None,
+):
+    """Download objects to the local filesystem. Requires private-network access."""
+    _transfer("download", remote, local, ctx)
+
+
+@ossutil_app.command("put")
+def oss_put(
+    ctx: typer.Context,
+    local: str = typer.Argument(..., help="Local file or directory to upload"),
+    remote: str = typer.Argument(..., help="Remote oss:// URI or repo-relative path"),
+    recursive: Recursive = False,
+    force: Force = False,
+    update: Update = False,
+    jobs: Jobs = 3,
+    parallel: Parallel = 4,
+    bigfile_threshold: BigFileThreshold = 100 * 1024 * 1024,
+    part_size: PartSize = None,
+    checkpoint_dir: CheckpointDir = None,
+    include: Include = None,
+    exclude: Exclude = None,
+    only_current_dir: OnlyCurrentDir = False,
+    disable_ignore_error: DisableIgnoreError = False,
+    disable_crc64: DisableCrc64 = False,
+    disable_all_symlink: DisableAllSymlink = False,
+    meta: Meta = None,
+    start_time: StartTime = None,
+    end_time: EndTime = None,
+    encoding_type: EncodingType = None,
+    payer: Payer = None,
+    output_format: OutputFormat = None,
+):
+    """Upload a local file or directory to OSS."""
+    _transfer("upload", local, remote, ctx)
+
+
+@ossutil_app.command("cp")
+def oss_cp(
+    ctx: typer.Context,
+    src: str = typer.Argument(..., help="Remote oss:// URI or repo-relative path"),
+    dst: str = typer.Argument(..., help="Remote oss:// URI or repo-relative path"),
+    recursive: Recursive = False,
+    force: Force = False,
+    update: Update = False,
+    jobs: Jobs = 3,
+    parallel: Parallel = 4,
+    bigfile_threshold: BigFileThreshold = 100 * 1024 * 1024,
+    part_size: PartSize = None,
+    checkpoint_dir: CheckpointDir = None,
+    include: Include = None,
+    exclude: Exclude = None,
+    only_current_dir: OnlyCurrentDir = False,
+    disable_ignore_error: DisableIgnoreError = False,
+    disable_crc64: DisableCrc64 = False,
+    meta: Meta = None,
+    start_time: StartTime = None,
+    end_time: EndTime = None,
+    encoding_type: EncodingType = None,
+    payer: Payer = None,
+    output_format: OutputFormat = None,
+):
+    """Copy objects within OSS. Use get/put for local transfers."""
+    _transfer("copy", src, dst, ctx)

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

@@ -245,6 +245,9 @@ class _RoutingBucket:
 
 
 def safe_error(exc: Exception) -> str:
+    if isinstance(exc, ImportError):
+        # ImportError messages only name the missing module; nothing sensitive is included.
+        return f"{type(exc).__name__}: {exc}"
     if isinstance(exc, (OssUsageError, OssOperationError, OSError)):
         return str(exc)
     # oss2 exceptions may stringify signed requests and arbitrary response payloads.
@@ -274,6 +277,7 @@ class OssFiles:
         self.write_headers: dict[str, str] = {}
         self.byte_range = None
         self.disable_all_symlink = False
+        self.verbose = False
         if oss_module is None:
             from instance_repo.store.oss import _import_oss2
 
@@ -791,6 +795,7 @@ class OssFiles:
         src: str,
         dst: str,
         *,
+        direction: str | None = None,
         recursive: bool,
         overwrite: bool,
         jobs: int,
@@ -805,7 +810,12 @@ class OssFiles:
         start_time: int | None = None,
         end_time: int | None = None,
     ) -> dict:
-        direction = direction_for(src, dst)
+        if direction is None:
+            # Library convenience for direct callers; the CLI commands pass the
+            # direction explicitly so relative remote paths stay unambiguous.
+            direction = direction_for(src, dst)
+        elif direction not in ("upload", "download", "copy"):
+            raise OssUsageError("direction must be upload, download or copy")
         remote_src = self.resolve(src, directory=recursive) if direction != "upload" else None
         remote_dst = None
         if direction != "download":
@@ -991,6 +1001,14 @@ class OssFiles:
             iter(items()), transfer, jobs if recursive else 1, stop_on_error
         ):
             if error:
+                if self.verbose:
+                    # Frames only: exception text may embed signed URLs or STS material.
+                    import sys
+                    import traceback
+
+                    sys.stderr.write("Traceback (most recent call last):\n")
+                    sys.stderr.writelines(traceback.format_tb(error.__traceback__))
+                    sys.stderr.write(f"error: {safe_error(error)}\n")
                 failed.append({"path": name, "error": safe_error(error)})
             elif copied:
                 completed.append(name)

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

@@ -4,12 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.5.3.dev5"
+version = "0.5.3.dev7"
 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"
 dependencies = [
     "typer>=0.9.0",
+    "click>=8.0.0",
+    "urllib3>=1.26",
     "requests>=2.28.0",
     "rich>=13.0.0",
     "PyYAML>=6.0",