ap-client 0.5.3.dev2__tar.gz → 0.5.3.dev4__tar.gz

{ap_client-0.5.3.dev2 → ap_client-0.5.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.5.3.dev2
+Version: 0.5.3.dev4
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
 Requires-Dist: irepo-artifact==0.2.1

{ap_client-0.5.3.dev2 → ap_client-0.5.3.dev4}/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
@@ -42,16 +42,62 @@ def _format(value: Optional[str]) -> str:
     return _normalize_output_format(value, keep_table=True)
 
 
-def _emit(value: dict, output_format: str, *, short: bool = False) -> None:
+def _tree(entries: list[dict], root: str) -> None:
+    from rich.console import Console
+    from rich.text import Text
+    from rich.tree import Tree
+
+    base = root.rstrip("/") + "/" if root else ""
+    if entries and not all(row["path"].startswith(base) for row in entries):
+        base = root.rsplit("/", 1)[0] + "/" if "/" in root else ""
+    tree = Tree(Text(base or "./", style="bold cyan"), guide_style="dim")
+    nodes: dict = {}
+    for row in entries:
+        relative = row["path"][len(base) :] if row["path"].startswith(base) else row["path"]
+        if not relative.rstrip("/"):
+            continue
+        parts = relative.rstrip("/").split("/")
+        children = nodes
+        for index, part in enumerate(parts):
+            directory = (
+                index < len(parts) - 1 or row["type"] == "directory" or row["path"].endswith("/")
+            )
+            key = (part, directory)
+            node = children.setdefault(key, {"children": {}})
+            if index == len(parts) - 1:
+                node["size"] = row.get("size")
+            children = node["children"]
+
+    def add(parent, children):
+        for (name, directory), node in sorted(
+            children.items(), key=lambda item: (not item[0][1], item[0][0].casefold(), item[0][0])
+        ):
+            label = Text(name + ("/" if directory else ""), style="bold blue" if directory else "")
+            if not directory and node.get("size") is not None:
+                size = float(node["size"])
+                unit = "B"
+                for unit in ("B", "KiB", "MiB", "GiB", "TiB"):
+                    if size < 1024 or unit == "TiB":
+                        break
+                    size /= 1024
+                label.append(f"  {int(size) if unit == 'B' else f'{size:.1f}'} {unit}", style="dim")
+            add(parent.add(label), node["children"])
+
+    add(tree, nodes)
+    Console().print(tree)
+
+
+def _emit(value: dict, output_format: str, *, short: bool = False, root: str = "") -> None:
     if output_format in ("json", "yaml"):
         from .cli import _print_formatted
 
         _print_formatted(value, output_format)
     elif "entries" in value:
-        for row in value["entries"]:
-            typer.echo(
-                row["path"] if short else f"{row['path']}\t{row.get('size', '-')}\t{row['type']}"
-            )
+        if short:
+            for row in value["entries"]:
+                typer.echo(row["path"])
+        else:
+            _tree(value["entries"], root)
         if value["is_truncated"]:
             typer.echo(
                 "Listing truncated; continue with --marker " + value["next_marker"], err=True
@@ -88,6 +134,7 @@ def _fail(exc: Exception) -> None:
 def oss_ls(
     path: str = typer.Argument(..., help="Full oss:// URI or prefix relative to repo-config"),
     directory: bool = typer.Option(False, "--directory", "-d", help="List only the current level"),
+    recursive: bool = typer.Option(False, "--recursive", "-r", help="Expand all directory levels"),
     short: bool = typer.Option(False, "--short-format", "-s", help="Print only paths"),
     limited_num: Optional[int] = typer.Option(None, "--limited-num", min=1),
     marker: str = typer.Option("", "--marker", help="Resume after this OSS URI or relative path"),
@@ -97,15 +144,20 @@ def oss_ls(
     payer: Optional[str] = typer.Option(None, "--payer"),
     output_format: Optional[str] = typer.Option(None, "--output-format", "--format"),
 ):
-    """List matching objects recursively; use -d for one directory level."""
+    """Show one directory level as a tree; use -r to expand all levels."""
     try:
         fmt = _format(output_format)
+        if recursive and directory:
+            raise OssUsageError("Use either --recursive or --directory")
         files = _files()
         _configure(files, encoding_type, payer)
+        remote = (
+            files.resolve(path, prefix=True) if recursive else files.resolve(path, directory=True)
+        )
         _emit(
             files.list(
-                files.resolve(path, prefix=True),
-                recursive=not directory,
+                remote,
+                recursive=recursive,
                 limit=limited_num,
                 marker=marker,
                 include=tuple(include or ()),
@@ -113,6 +165,7 @@ def oss_ls(
             ),
             fmt,
             short=short,
+            root=remote.path,
         )
     except Exception as exc:
         _fail(exc)
@@ -167,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"),
@@ -198,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):
@@ -227,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
@@ -263,7 +315,6 @@ def oss_cp(
         result = files.cp(
             src,
             dst,
-            direction=direction,
             recursive=recursive,
             overwrite=force,
             jobs=jobs,

{ap_client-0.5.3.dev2 → ap_client-0.5.3.dev4}/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:
@@ -415,7 +416,7 @@ class OssFiles:
         self,
         remote: RemotePath,
         *,
-        recursive: bool = True,
+        recursive: bool = False,
         limit: int | None = None,
         marker: str = "",
         include: tuple[str, ...] = (),
@@ -796,7 +797,6 @@ class OssFiles:
         src: str,
         dst: str,
         *,
-        direction: str | None,
         recursive: bool,
         overwrite: bool,
         jobs: int,
@@ -811,7 +811,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.dev2 → ap_client-0.5.3.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ap-client"
-version = "0.5.3.dev2"
+version = "0.5.3.dev4"
 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"