Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enhance(client): sort model/runtime/dataset history list by created_at field #3127

Merged
merged 2 commits into from
Jan 16, 2024
Merged

enhance(client): sort model/runtime/dataset history list by created_at field #3127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd6587
sort model/runtime/dataset history output
tianweidut Jan 16, 2024
98b6055
remove useless code
tianweidut Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 1 addition & 73 deletions client/starwhale/base/view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,82 +185,10 @@ def _print_history(
)
return history

@staticmethod
def _print_list(
_bundles: t.Dict[str, t.Any], show_removed: bool = False, fullname: bool = False
) -> None:
table = Table(title="Bundle List", box=box.SIMPLE, expand=True)

table.add_column("Name")
table.add_column("Version")
table.add_column("Tags")
table.add_column("Size")
table.add_column("Runtime")
table.add_column("Created")

for _name, _versions in _bundles.items():
for _v in _versions:
if show_removed ^ _v["is_removed"]:
continue

_version = (
_v["version"]
if fullname or show_removed
else _v["version"][:SHORT_VERSION_CNT]
)
if _v.get("id"):
_version = f"[{_v['id']:2}] {_version}"

table.add_row(
_name,
_version,
",".join(_v.get("tags", [])),
pretty_bytes(_v["size"]),
_v.get("runtime", "--"),
_v[CREATED_AT_KEY],
)

console.print(table)

@staticmethod
def pretty_json(data: t.Any) -> None:
print(json.dumps(data, indent=4, sort_keys=True, cls=Encoder))

@staticmethod
def list_data(
_bundles: t.Dict[str, t.Any], show_removed: bool = False, fullname: bool = False
) -> t.List[t.Dict[str, t.Any]]:
result = []
for _name, _versions in _bundles.items():
# compatible with standalone and cloud
# TODO: use a better way to handle this
if not isinstance(_versions, (list, tuple)):
_versions = [_versions]

for _v in _versions:
if show_removed ^ _v.get("is_removed", False):
continue

_info = {
"version": (
_v["version"]
if fullname or show_removed
else _v["version"][:SHORT_VERSION_CNT]
),
"name": _name,
CREATED_AT_KEY: _v[CREATED_AT_KEY],
"tags": _v.get("tags"),
}

for k in ("rows", "mode", "python", "size"):
if k in _v:
_info[k] = _v[k]

result.append(_info)

order_keys = [Order("name"), Order(CREATED_AT_KEY, True)]
return sort_obj_list(result, order_keys)

@staticmethod
def place_holder_for_empty(place_holder: str = "--") -> t.Callable[[str], str]:
return lambda x: x or place_holder
Expand Down Expand Up @@ -353,7 +281,7 @@ def get_history_data(
CREATED_AT_KEY: _h.get(CREATED_AT_KEY),
}
)
return result
return sort_obj_list(result, [Order(CREATED_AT_KEY, True)])

@staticmethod
def must_have_project(uri: Project) -> None:
Expand Down
Loading