fix(client): fix broken resource ls cmd

client/starwhale/base/uri/project.py

@@ -1,13 +1,10 @@
-import os
 import urllib
 from typing import Any, Optional
 from functools import lru_cache
 
 import requests
 
-from starwhale.consts.env import SWEnv
 from starwhale.utils.retry import http_retry
-from starwhale.utils.config import SWCliConfigMixed
 from starwhale.base.uri.instance import Instance
 from starwhale.base.uri.exceptions import UriTooShortException
 
@@ -60,7 +57,11 @@ def __init__(
             self.id = (
                 self.name
                 if self.name.isdigit()
-                else str(get_remote_project_id(self.instance.url, self.name))
+                else str(
+                    get_remote_project_id(
+                        self.instance.url, self.instance.token, self.name
+                    )
+                )
             )
         else:
             self.id = self.name
@@ -112,15 +113,12 @@ def __eq__(self, other: object) -> bool:
 
 @lru_cache(maxsize=None)
 @http_retry
-def get_remote_project_id(instance_uri: str, project: str) -> Any:
+def get_remote_project_id(instance_uri: str, token: str, project: str) -> Any:
     resp = requests.get(
         urllib.parse.urljoin(instance_uri, f"/api/v1/project/{project}"),
         headers={
             "Content-Type": "application/json; charset=utf-8",
-            "Authorization": (
-                SWCliConfigMixed().get_sw_token(instance=instance_uri)
-                or os.getenv(SWEnv.instance_token, "")
-            ),
+            "Authorization": token,
         },
         timeout=60,
     )

client/starwhale/base/view.py

@@ -275,6 +275,7 @@ def print_table(
         custom_table: t.Optional[t.Dict[str, t.Any]] = None,
         allowed_keys: t.Optional[t.List[str]] = None,
     ) -> None:
+        custom_column = custom_column or {}
         default_attr = {
             "title": title,
             "box": box.SIMPLE,
@@ -295,6 +296,14 @@ def init_header(row: t.List[str]) -> None:
                 if custom_header and idx in custom_header:
                     extra = custom_header[idx]
                 table.add_column(snake_to_camel(field), **extra)
+            for custom_column_key in custom_column:
+                if custom_column_key not in row:
+                    table.add_column(
+                        snake_to_camel(custom_column_key),
+                        justify="left",
+                        style="cyan",
+                        no_wrap=True,
+                    )
 
         header_inited = False
         for row in data:
@@ -311,7 +320,9 @@ def init_header(row: t.List[str]) -> None:
                 if not is_renderable(col):
                     col = pretty.Pretty(col)
                 rendered_row.append(col)
-
+            for custom_column_key in custom_column:
+                if custom_column_key not in row:
+                    rendered_row.append(custom_column[custom_column_key](row))
             row_ext: t.Dict[str, t.Any] = {}
             if custom_row:
                 row_ext = custom_row(row) or {}

client/starwhale/core/dataset/view.py

@@ -344,7 +344,6 @@ def list(
         custom_column: t.Dict[str, t.Callable[[t.Any], str]] = {
             "tags": lambda x: ",".join(x),
             "size": lambda x: pretty_bytes(x),
-            "runtime": cls.place_holder_for_empty(),
             "rows": lambda x: x and str(x) or "",
         }
 

client/starwhale/core/model/view.py

@@ -37,6 +37,7 @@
 from starwhale.base.uri.resource import Resource, ResourceType
 from starwhale.core.runtime.model import StandaloneRuntime
 from starwhale.core.runtime.process import Process as RuntimeProcess
+from starwhale.base.client.models.models import ModelVo
 
 
 class ModelTermView(BaseTermView, TagViewMixin):
@@ -437,11 +438,26 @@ def list(
         _models, _pager = super().list(
             project_uri, fullname, show_removed, page, size, filters
         )
-        custom_column: t.Dict[str, t.Callable[[t.Any], str]] = {
-            "tags": lambda x: ",".join(x),
-            "size": lambda x: pretty_bytes(x),
-            "runtime": cls.place_holder_for_empty(""),
-        }
+        custom_column: t.Dict[str, t.Callable[[t.Any], str]] = dict()
+        if _models and isinstance(_models[0], ModelVo):
+            custom_column.update(
+                {
+                    "tags": lambda x: ",".join(
+                        [x["version"]["alias"]] + (x["version"]["tags"] or [])
+                    ),
+                    "size": lambda x: pretty_bytes(x["version"]["size"]),
+                    "owner": lambda x: x["name"],
+                    "version": lambda x: x["name"],
+                    "shared": lambda x: str(x["version"]["shared"]),
+                }
+            )
+        else:
+            custom_column.update(
+                {
+                    "tags": lambda x: ",".join(x),
+                    "size": lambda x: pretty_bytes(x or 0),
+                }
+            )
 
         cls.print_header(project_uri)
         cls.print_table("Model List", _models, custom_column=custom_column)

client/starwhale/core/runtime/view.py

@@ -440,6 +440,7 @@ def list(
                     "tags": [i.version.alias] + (i.version.tags or []),
                     "shared": i.version.shared != 0,
                     "image": i.version.image,
+                    "size": 0,
                     "created_at": CloudRequestMixed.fmt_timestamp(
                         i.version.created_time
                     ),

scripts/client_test/cli_exec.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+for ins in "local" "server"; do
+  swcli instance select $ins
+  for rc in "model" "runtime" "dataset"; do
+      swcli $rc ls
+      swcli -o json $rc ls
+  done
+done

scripts/client_test/cli_test.sh

@@ -29,3 +29,5 @@ bash "$SCRIPT_DIR"/update_controller_setting.sh
 for i in $@; do
     python3 "$SCRIPT_DIR"/cli_test.py --sw_repo_path "$REPO_PATH" --case $i --work_dir "$WORK_DIR" --server_url "$CONTROLLER_URL" || exit 1
 done
+
+. "$SCRIPT_DIR"/cli_exec.sh