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.

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

feat: cortex ps #1345

Merged
merged 1 commit into from
Sep 30, 2024
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
3 changes: 1 addition & 2 deletions engine/commands/model_stop_cmd.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "model_stop_cmd.h"
#include "httplib.h"
#include "nlohmann/json.hpp"
#include "trantor/utils/Logger.h"
#include "utils/logging_utils.h"

namespace commands {
Expand Down Expand Up @@ -30,4 +29,4 @@ void ModelStopCmd::Exec() {
}
}

}; // namespace commands
}; // namespace commands
6 changes: 3 additions & 3 deletions engine/commands/model_stop_cmd.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include <string>
#include <optional>
#include "config/model_config.h"

namespace commands {

class ModelStopCmd{
class ModelStopCmd {
public:
ModelStopCmd(std::string host, int port, const config::ModelConfig& mc);
void Exec();
Expand All @@ -15,4 +15,4 @@ class ModelStopCmd{
int port_;
const config::ModelConfig& mc_;
};
} // namespace commands
} // namespace commands
63 changes: 63 additions & 0 deletions engine/commands/ps_cmd.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#include "ps_cmd.h"
#include <drogon/drogon.h>
#include <httplib.h>
#include <string>
#include <tabulate/table.hpp>
#include "nlohmann/json.hpp"
#include "utils/logging_utils.h"
#include "utils/string_utils.h"

namespace commands {

void PsCmd::Exec(const std::string& host, int port) {
auto host_and_port{host + ":" + std::to_string(port)};
httplib::Client cli(host_and_port);

auto res = cli.Get("/inferences/server/models");
if (!res || res->status != httplib::StatusCode::OK_200) {
CLI_LOG("No model loaded!");
return;
}

auto body = nlohmann::json::parse(res->body);
auto data = body["data"];
std::vector<ModelLoadedStatus> model_status_list;
try {
for (const auto& item : data) {
ModelLoadedStatus model_status;
model_status.engine = item["engine"];
model_status.model = item["id"];
model_status.ram = item["ram"];
model_status.start_time = item["start_time"];
model_status.vram = item["vram"];
model_status_list.push_back(model_status);
}
} catch (const std::exception& e) {
CLI_LOG("Fail to get list model information: " + std::string(e.what()));
}

PrintModelStatusList(model_status_list);
}

void PsCmd::PrintModelStatusList(
const std::vector<ModelLoadedStatus>& model_status_list) const {
if (model_status_list.empty()) {
CLI_LOG("No model loaded!");
return;
}

tabulate::Table table;
table.add_row({"Model", "Engine", "RAM", "VRAM", "Up time"});
for (const auto& model_status : model_status_list) {
table.add_row({
model_status.model,
model_status.engine,
model_status.ram,
model_status.vram,
string_utils::FormatTimeElapsed(model_status.start_time),
});
}
std::cout << table << std::endl;
}

}; // namespace commands
27 changes: 27 additions & 0 deletions engine/commands/ps_cmd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#pragma once

#include <string>
#include <vector>

namespace commands {

struct ModelLoadedStatus {
std::string engine;
std::string model;
std::string ram;
uint64_t start_time;
std::string vram;
};

class PsCmd {
public:
explicit PsCmd() = default;

void Exec(const std::string& host, int port);

private:
void PrintModelStatusList(
const std::vector<ModelLoadedStatus>& model_status_list) const;
};

} // namespace commands
8 changes: 7 additions & 1 deletion engine/controllers/command_line_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "commands/model_start_cmd.h"
#include "commands/model_stop_cmd.h"
#include "commands/model_upd_cmd.h"
#include "commands/ps_cmd.h"
#include "commands/run_cmd.h"
#include "commands/server_start_cmd.h"
#include "commands/server_stop_cmd.h"
Expand Down Expand Up @@ -73,7 +74,7 @@ bool CommandLineParser::SetupCommand(int argc, char** argv) {
#ifdef CORTEX_CPP_VERSION
if (cml_data_.check_upd) {
// TODO(sang) find a better way to handle
// This is an extremely ungly way to deal with connection
// This is an extremely ungly way to deal with connection
// hang when network down
std::atomic<bool> done = false;
std::thread t([&]() {
Expand Down Expand Up @@ -387,6 +388,11 @@ void CommandLineParser::SetupSystemCommands() {
auto ps_cmd =
app_.add_subcommand("ps", "Show running models and their status");
ps_cmd->group(kSystemGroup);
ps_cmd->usage("Usage:\n" + commands::GetCortexBinary() + "ps");
ps_cmd->callback([&]() {
commands::PsCmd().Exec(cml_data_.config.apiServerHost,
std::stoi(cml_data_.config.apiServerPort));
});

auto update_cmd = app_.add_subcommand("update", "Update cortex version");
update_cmd->group(kSystemGroup);
Expand Down
1 change: 0 additions & 1 deletion engine/controllers/command_line_parser.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "CLI/CLI.hpp"
#include "commands/model_upd_cmd.h"
#include "services/engine_service.h"
#include "utils/config_yaml_utils.h"
class CommandLineParser {
Expand Down
46 changes: 46 additions & 0 deletions engine/utils/string_utils.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <chrono>
#include <sstream>
#include <string>
#include <vector>

Expand Down Expand Up @@ -29,4 +31,48 @@ inline std::vector<std::string> SplitBy(const std::string& str,
} while (pos < str.length() && prev < str.length());
return tokens;
}

inline uint64_t getCurrentTimeInMilliseconds() {
using namespace std::chrono;
return duration_cast<milliseconds>(system_clock::now().time_since_epoch())
.count();
}

inline std::string FormatTimeElapsed(uint64_t pastTimestamp) {
uint64_t currentTimestamp = getCurrentTimeInMilliseconds();
uint64_t milliseconds = currentTimestamp - pastTimestamp;

// Constants for time units
const uint64_t millisInSecond = 1000;
const uint64_t millisInMinute = millisInSecond * 60;
const uint64_t millisInHour = millisInMinute * 60;
const uint64_t millisInDay = millisInHour * 24;

uint64_t days = milliseconds / millisInDay;
milliseconds %= millisInDay;

uint64_t hours = milliseconds / millisInHour;
milliseconds %= millisInHour;

uint64_t minutes = milliseconds / millisInMinute;
milliseconds %= millisInMinute;

uint64_t seconds = milliseconds / millisInSecond;

std::ostringstream oss;

if (days > 0) {
vansangpfiev marked this conversation as resolved.
Show resolved Hide resolved
oss << days << " day" << (days > 1 ? "s" : "") << ", ";
}
if (hours > 0 || days > 0) {
oss << hours << " hour" << (hours > 1 ? "s" : "") << ", ";
}
if (minutes > 0 || hours > 0 || days > 0) {
oss << minutes << " minute" << (minutes > 1 ? "s" : "") << ", ";
}

oss << seconds << " second" << (seconds > 1 ? "s" : "");

return oss.str();
}
} // namespace string_utils
Loading