Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions engine/cli/commands/model_pull_cmd.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ std::optional<std::string> ModelPullCmd::Exec(const std::string& host, int port,
CTL_INF("model: " << model << ", model_id: " << model_id);

// Send request download model to server
CLI_LOG("Validating download items, please wait..")
Json::Value json_data;
json_data["model"] = model;
auto data_str = json_data.toStyledString();
Expand Down
23 changes: 13 additions & 10 deletions engine/cli/utils/download_progress.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ bool DownloadProgress::Connect(const std::string& host, int port) {

bool DownloadProgress::Handle(const std::string& id) {
assert(!!ws_);
uint64_t total = std::numeric_limits<uint64_t>::max();
std::unordered_map<std::string, uint64_t> totals;
status_ = DownloadStatus::DownloadStarted;
std::unique_ptr<indicators::DynamicProgress<indicators::ProgressBar>> bars;

std::vector<std::unique_ptr<indicators::ProgressBar>> items;
indicators::show_console_cursor(false);
auto handle_message = [this, &bars, &items, &total,
auto handle_message = [this, &bars, &items, &totals,
id](const std::string& message) {
CTL_INF(message);

Expand Down Expand Up @@ -72,23 +72,26 @@ bool DownloadProgress::Handle(const std::string& id) {
for (int i = 0; i < ev.download_task_.items.size(); i++) {
auto& it = ev.download_task_.items[i];
uint64_t downloaded = it.downloadedBytes.value_or(0);
if (total == 0 || total == std::numeric_limits<uint64_t>::max()) {
total = it.bytes.value_or(std::numeric_limits<uint64_t>::max());
CTL_INF("Updated - total: " << total);
if (totals.find(it.id) == totals.end()) {
totals[it.id] = it.bytes.value_or(std::numeric_limits<uint64_t>::max());
CTL_INF("Updated " << it.id << " - total: " << totals[it.id]);
}
if (ev.type_ == DownloadStatus::DownloadUpdated) {

if (ev.type_ == DownloadStatus::DownloadStarted ||
ev.type_ == DownloadStatus::DownloadUpdated) {
(*bars)[i].set_option(indicators::option::PrefixText{
pad_string(it.id) +
std::to_string(int(static_cast<double>(downloaded) / total * 100)) +
std::to_string(
int(static_cast<double>(downloaded) / totals[it.id] * 100)) +
'%'});
(*bars)[i].set_progress(
int(static_cast<double>(downloaded) / total * 100));
int(static_cast<double>(downloaded) / totals[it.id] * 100));
(*bars)[i].set_option(indicators::option::PostfixText{
format_utils::BytesToHumanReadable(downloaded) + "/" +
format_utils::BytesToHumanReadable(total)});
format_utils::BytesToHumanReadable(totals[it.id])});
} else if (ev.type_ == DownloadStatus::DownloadSuccess) {
(*bars)[i].set_progress(100);
auto total_str = format_utils::BytesToHumanReadable(total);
auto total_str = format_utils::BytesToHumanReadable(totals[it.id]);
(*bars)[i].set_option(
indicators::option::PostfixText{total_str + "/" + total_str});
(*bars)[i].set_option(
Expand Down
Loading