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

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

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

{ap_client-0.5.3.dev1 → ap_client-0.5.3.dev3}/ap_client/ossutil_commands.py

@@ -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)

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

@@ -265,7 +265,6 @@ class OssFiles:
         state_dir: Path | None = None,
     ):
         self.repo, self.binding = repo, binding
-        self._datasets: dict[str, str] = {}
         self.encoding_type = None
         self.payer = None
         self.disable_crc64 = False
@@ -285,41 +284,18 @@ 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, *, list_only: bool = False) -> str:
+    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) :]
-        parts = relative.rstrip("/").split("/") if relative else []
-        if not parts:
-            raise OssUsageError("Specify a path within a Dataset, for example a/b/")
-        candidates = ["/".join(parts[:2]), parts[0]] if len(parts) >= 2 else [parts[0]]
-        for name in dict.fromkeys(candidates):
-            namespace = self.binding.prefix + name + "/"
-            if not scope.startswith(namespace):
-                continue
-            if name in self._datasets:
-                return self._datasets[name]
-            try:
-                series = self.repo.datasets.get(name, fallback_to_oss=False)
-            except Exception as exc:
-                if getattr(exc, "biz_code", None) not in (92001, 94021):
-                    raise
-                continue
-            if getattr(series, "dataset_name", None) != name:
-                raise OssOperationError("Dataset metadata does not match the requested path")
-            self._datasets[name] = name
-            return name
-        if list_only and scope.startswith(self.binding.prefix + candidates[0] + "/"):
-            # The server owns discovery authorization for an unregistered namespace.
-            return candidates[0]
-        raise OssUsageError("OSS path does not identify a registered Dataset")
+        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, list_only=list_only),
+                dataset_name=self._dataset_for(scope),
                 permission=permission,
                 list_only=list_only,
             )
@@ -439,12 +415,15 @@ class OssFiles:
         self,
         remote: RemotePath,
         *,
-        recursive: bool = True,
+        recursive: bool = False,
         limit: int | None = None,
         marker: str = "",
         include: tuple[str, ...] = (),
         exclude: tuple[str, ...] = (),
     ) -> dict:
+        # A Dataset root is a directory even when the user omits its trailing slash.
+        if remote.path and not remote.path.endswith("/") and len(remote.path.split("/")) == 2:
+            remote = self.binding.resolve(remote.path, directory=True)
         if marker:
             marker = self.resolve(marker, prefix=True).key
             if not marker.startswith(remote.key):

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

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