Skip to content

Commit f9364aa

Browse files
vansangpfievsangjanai
vansangpfiev
and
sangjanai
authored
fix: add metadata (#1875)
* fix: add metadata * fix: add get models by source * fix: metadata json * fix: get downloaded models * fix: add checkedForSyncHubAt to rc * fix: handle hf download by model id * fix: update model when download from model sources * fix: cortexso model download * feat: AMD hardware API (#1797) * feat: add amd gpu windows * chore: remove unused code * feat: get amd gpus * fix: clean * chore: cleanup * fix: set activate * fix: build windows * feat: linux * fix: add patches * fix: map cuda gpus * fix: build * chore: docs * fix: build * chore: clean up * fix: build * fix: build * chore: pack vulkan windows * chore: vulkan linux --------- Co-authored-by: vansangpfiev <[email protected]> * fix: add cpu usage (#1868) Co-authored-by: vansangpfiev <[email protected]> * fix: handle sub-directory HF * fix: add author in response for /models/sources GET * fix: PATCH method for Thread and Messages management (#1923) Co-authored-by: vansangpfiev <[email protected]> --------- Co-authored-by: vansangpfiev <[email protected]>
1 parent ecbd2d0 commit f9364aa

14 files changed

+405
-170
lines changed

‎engine/controllers/models.cc

+36-3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,20 @@ void Models::PullModel(const HttpRequestPtr& req,
5858
model_handle, desired_model_id, desired_model_name);
5959
} else if (model_handle.find(":") != std::string::npos) {
6060
auto model_and_branch = string_utils::SplitBy(model_handle, ":");
61+
if (model_and_branch.size() == 3) {
62+
auto mh = url_parser::Url{
63+
.protocol = "https",
64+
.host = kHuggingFaceHost,
65+
.pathParams = {
66+
model_and_branch[0],
67+
model_and_branch[1],
68+
"resolve",
69+
"main",
70+
model_and_branch[2],
71+
}}.ToFullPath();
72+
return model_service_->HandleDownloadUrlAsync(mh, desired_model_id,
73+
desired_model_name);
74+
}
6175
return model_service_->DownloadModelFromCortexsoAsync(
6276
model_and_branch[0], model_and_branch[1], desired_model_id);
6377
}
@@ -813,15 +827,34 @@ void Models::GetModelSources(
813827
resp->setStatusCode(k400BadRequest);
814828
callback(resp);
815829
} else {
816-
auto const& info = res.value();
830+
auto& info = res.value();
817831
Json::Value ret;
818832
Json::Value data(Json::arrayValue);
819-
for (auto const& i : info) {
820-
data.append(i);
833+
for (auto& i : info) {
834+
data.append(i.second.ToJson());
821835
}
822836
ret["data"] = data;
823837
auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
824838
resp->setStatusCode(k200OK);
825839
callback(resp);
826840
}
841+
}
842+
843+
void Models::GetModelSource(
844+
const HttpRequestPtr& req,
845+
std::function<void(const HttpResponsePtr&)>&& callback,
846+
const std::string& src) {
847+
auto res = model_src_svc_->GetModelSource(src);
848+
if (res.has_error()) {
849+
Json::Value ret;
850+
ret["message"] = res.error();
851+
auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
852+
resp->setStatusCode(k400BadRequest);
853+
callback(resp);
854+
} else {
855+
auto& info = res.value();
856+
auto resp = cortex_utils::CreateCortexHttpJsonResponse(info.ToJson());
857+
resp->setStatusCode(k200OK);
858+
callback(resp);
859+
}
827860
}

‎engine/controllers/models.h

+5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class Models : public drogon::HttpController<Models, false> {
4343
ADD_METHOD_TO(Models::AddModelSource, "/v1/models/sources", Post);
4444
ADD_METHOD_TO(Models::DeleteModelSource, "/v1/models/sources", Delete);
4545
ADD_METHOD_TO(Models::GetModelSources, "/v1/models/sources", Get);
46+
ADD_METHOD_TO(Models::GetModelSource, "/v1/models/sources/{src}", Get);
4647
METHOD_LIST_END
4748

4849
explicit Models(std::shared_ptr<DatabaseService> db_service,
@@ -106,6 +107,10 @@ class Models : public drogon::HttpController<Models, false> {
106107
void GetModelSources(const HttpRequestPtr& req,
107108
std::function<void(const HttpResponsePtr&)>&& callback);
108109

110+
void GetModelSource(const HttpRequestPtr& req,
111+
std::function<void(const HttpResponsePtr&)>&& callback,
112+
const std::string& src);
113+
109114
private:
110115
std::shared_ptr<DatabaseService> db_service_;
111116
std::shared_ptr<ModelService> model_service_;

‎engine/database/models.cc

+45-17
Original file line numberDiff line numberDiff line change
@@ -270,35 +270,63 @@ bool Models::HasModel(const std::string& identifier) const {
270270
}
271271
}
272272

273-
cpp::result<std::vector<std::string>, std::string> Models::GetModelSources()
274-
const {
273+
cpp::result<std::vector<ModelEntry>, std::string> Models::GetModels(
274+
const std::string& model_src) const {
275275
try {
276-
std::vector<std::string> sources;
276+
std::vector<ModelEntry> res;
277277
SQLite::Statement query(db_,
278-
"SELECT DISTINCT model_source FROM models WHERE "
279-
"status = \"downloadable\"");
280-
278+
"SELECT model_id, author_repo_id, branch_name, "
279+
"path_to_model_yaml, model_alias, model_format, "
280+
"model_source, status, engine, metadata FROM "
281+
"models WHERE model_source = "
282+
"? AND status = \"downloadable\"");
283+
query.bind(1, model_src);
281284
while (query.executeStep()) {
282-
sources.push_back(query.getColumn(0).getString());
285+
ModelEntry entry;
286+
entry.model = query.getColumn(0).getString();
287+
entry.author_repo_id = query.getColumn(1).getString();
288+
entry.branch_name = query.getColumn(2).getString();
289+
entry.path_to_model_yaml = query.getColumn(3).getString();
290+
entry.model_alias = query.getColumn(4).getString();
291+
entry.model_format = query.getColumn(5).getString();
292+
entry.model_source = query.getColumn(6).getString();
293+
entry.status = StringToStatus(query.getColumn(7).getString());
294+
entry.engine = query.getColumn(8).getString();
295+
entry.metadata = query.getColumn(9).getString();
296+
res.push_back(entry);
283297
}
284-
return sources;
298+
return res;
285299
} catch (const std::exception& e) {
286300
return cpp::fail(e.what());
287301
}
288302
}
289303

290-
cpp::result<std::vector<std::string>, std::string> Models::GetModels(
291-
const std::string& model_src) const {
304+
cpp::result<std::vector<ModelEntry>, std::string> Models::GetModelSources()
305+
const {
292306
try {
293-
std::vector<std::string> ids;
294-
SQLite::Statement query(db_,
295-
"SELECT model_id FROM models WHERE model_source = "
296-
"? AND status = \"downloadable\"");
297-
query.bind(1, model_src);
307+
std::vector<ModelEntry> res;
308+
SQLite::Statement query(
309+
db_,
310+
"SELECT model_id, author_repo_id, branch_name, "
311+
"path_to_model_yaml, model_alias, model_format, "
312+
"model_source, status, engine, metadata FROM models "
313+
"WHERE model_source != \"\" AND (status = \"downloaded\" OR status = "
314+
"\"downloadable\")");
298315
while (query.executeStep()) {
299-
ids.push_back(query.getColumn(0).getString());
316+
ModelEntry entry;
317+
entry.model = query.getColumn(0).getString();
318+
entry.author_repo_id = query.getColumn(1).getString();
319+
entry.branch_name = query.getColumn(2).getString();
320+
entry.path_to_model_yaml = query.getColumn(3).getString();
321+
entry.model_alias = query.getColumn(4).getString();
322+
entry.model_format = query.getColumn(5).getString();
323+
entry.model_source = query.getColumn(6).getString();
324+
entry.status = StringToStatus(query.getColumn(7).getString());
325+
entry.engine = query.getColumn(8).getString();
326+
entry.metadata = query.getColumn(9).getString();
327+
res.push_back(entry);
300328
}
301-
return ids;
329+
return res;
302330
} catch (const std::exception& e) {
303331
return cpp::fail(e.what());
304332
}

‎engine/database/models.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace cortex::db {
1010

1111
enum class ModelStatus { Remote, Downloaded, Downloadable };
1212

13-
1413
struct ModelEntry {
1514
std::string model;
1615
std::string author_repo_id;
@@ -57,9 +56,9 @@ class Models {
5756
cpp::result<std::vector<std::string>, std::string> FindRelatedModel(
5857
const std::string& identifier) const;
5958
bool HasModel(const std::string& identifier) const;
60-
cpp::result<std::vector<std::string>, std::string> GetModelSources() const;
61-
cpp::result<std::vector<std::string>, std::string> GetModels(
59+
cpp::result<std::vector<ModelEntry>, std::string> GetModels(
6260
const std::string& model_src) const;
61+
cpp::result<std::vector<ModelEntry>, std::string> GetModelSources() const;
6362
};
6463

6564
} // namespace cortex::db

‎engine/services/database_service.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ bool DatabaseService::HasModel(const std::string& identifier) const {
118118
return cortex::db::Models().HasModel(identifier);
119119
}
120120

121-
cpp::result<std::vector<std::string>, std::string>
122-
DatabaseService::GetModelSources() const {
123-
return cortex::db::Models().GetModelSources();
124-
}
125-
126-
cpp::result<std::vector<std::string>, std::string> DatabaseService::GetModels(
121+
cpp::result<std::vector<ModelEntry>, std::string> DatabaseService::GetModels(
127122
const std::string& model_src) const {
128123
return cortex::db::Models().GetModels(model_src);
129124
}
125+
126+
cpp::result<std::vector<ModelEntry>, std::string>
127+
DatabaseService::GetModelSources() const {
128+
return cortex::db::Models().GetModelSources();
129+
}
130130
// end models

‎engine/services/database_service.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,10 @@ class DatabaseService {
6060
cpp::result<std::vector<std::string>, std::string> FindRelatedModel(
6161
const std::string& identifier) const;
6262
bool HasModel(const std::string& identifier) const;
63-
cpp::result<std::vector<std::string>, std::string> GetModelSources() const;
64-
cpp::result<std::vector<std::string>, std::string> GetModels(
63+
cpp::result<std::vector<ModelEntry>, std::string> GetModels(
6564
const std::string& model_src) const;
65+
cpp::result<std::vector<ModelEntry>, std::string> GetModelSources()
66+
const;
6667

6768
private:
6869
};

‎engine/services/model_service.cc

+11-40
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ void ParseGguf(DatabaseService& db_service,
6767
CTL_INF("Adding model to modellist with branch: " << branch);
6868

6969
auto rel = file_manager_utils::ToRelativeCortexDataPath(yaml_name);
70-
CTL_INF("path_to_model_yaml: " << rel.string());
70+
CTL_INF("path_to_model_yaml: " << rel.string()
71+
<< ", model: " << ggufDownloadItem.id);
7172

7273
auto author_id = author.has_value() ? author.value() : "cortexso";
7374
if (!db_service.HasModel(ggufDownloadItem.id)) {
@@ -86,6 +87,7 @@ void ParseGguf(DatabaseService& db_service,
8687
} else {
8788
if (auto m = db_service.GetModelInfo(ggufDownloadItem.id); m.has_value()) {
8889
auto upd_m = m.value();
90+
upd_m.path_to_model_yaml = rel.string();
8991
upd_m.status = cortex::db::ModelStatus::Downloaded;
9092
if (auto r = db_service.UpdateModelEntry(ggufDownloadItem.id, upd_m);
9193
r.has_error()) {
@@ -161,6 +163,9 @@ void ModelService::ForceIndexingModelList() {
161163
continue;
162164
}
163165
try {
166+
CTL_DBG(fmu::ToAbsoluteCortexDataPath(
167+
fs::path(model_entry.path_to_model_yaml))
168+
.string());
164169
yaml_handler.ModelConfigFromFile(
165170
fmu::ToAbsoluteCortexDataPath(
166171
fs::path(model_entry.path_to_model_yaml))
@@ -171,48 +176,12 @@ void ModelService::ForceIndexingModelList() {
171176
} catch (const std::exception& e) {
172177
// remove in db
173178
auto remove_result = db_service_->DeleteModelEntry(model_entry.model);
179+
CTL_DBG(e.what());
174180
// silently ignore result
175181
}
176182
}
177183
}
178184

179-
cpp::result<std::string, std::string> ModelService::DownloadModel(
180-
const std::string& input) {
181-
if (input.empty()) {
182-
return cpp::fail(
183-
"Input must be Cortex Model Hub handle or HuggingFace url!");
184-
}
185-
186-
if (string_utils::StartsWith(input, "https://")) {
187-
return HandleUrl(input);
188-
}
189-
190-
if (input.find(":") != std::string::npos) {
191-
auto parsed = string_utils::SplitBy(input, ":");
192-
if (parsed.size() != 2) {
193-
return cpp::fail("Invalid model handle: " + input);
194-
}
195-
return DownloadModelFromCortexso(parsed[0], parsed[1]);
196-
}
197-
198-
if (input.find("/") != std::string::npos) {
199-
auto parsed = string_utils::SplitBy(input, "/");
200-
if (parsed.size() != 2) {
201-
return cpp::fail("Invalid model handle: " + input);
202-
}
203-
204-
auto author = parsed[0];
205-
auto model_name = parsed[1];
206-
if (author == "cortexso") {
207-
return HandleCortexsoModel(model_name);
208-
}
209-
210-
return DownloadHuggingFaceGgufModel(author, model_name, std::nullopt);
211-
}
212-
213-
return HandleCortexsoModel(input);
214-
}
215-
216185
cpp::result<std::string, std::string> ModelService::HandleCortexsoModel(
217186
const std::string& modelName) {
218187
auto branches =
@@ -612,7 +581,8 @@ ModelService::DownloadModelFromCortexsoAsync(
612581
.branch_name = branch,
613582
.path_to_model_yaml = rel.string(),
614583
.model_alias = unique_model_id,
615-
.status = cortex::db::ModelStatus::Downloaded};
584+
.status = cortex::db::ModelStatus::Downloaded,
585+
.engine = mc.engine};
616586
auto result = db_service_->AddModelEntry(model_entry);
617587

618588
if (result.has_error()) {
@@ -621,6 +591,7 @@ ModelService::DownloadModelFromCortexsoAsync(
621591
} else {
622592
if (auto m = db_service_->GetModelInfo(unique_model_id); m.has_value()) {
623593
auto upd_m = m.value();
594+
upd_m.path_to_model_yaml = rel.string();
624595
upd_m.status = cortex::db::ModelStatus::Downloaded;
625596
if (auto r = db_service_->UpdateModelEntry(unique_model_id, upd_m);
626597
r.has_error()) {
@@ -1157,7 +1128,7 @@ cpp::result<ModelPullInfo, std::string> ModelService::GetModelPullInfo(
11571128

11581129
if (input.find(":") != std::string::npos) {
11591130
auto parsed = string_utils::SplitBy(input, ":");
1160-
if (parsed.size() != 2) {
1131+
if (parsed.size() != 2 && parsed.size() != 3) {
11611132
return cpp::fail("Invalid model handle: " + input);
11621133
}
11631134
return ModelPullInfo{.id = input,

‎engine/services/model_service.h

-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ class ModelService {
4242
inference_svc_(inference_service),
4343
engine_svc_(engine_svc) {};
4444

45-
/**
46-
* Return model id if download successfully
47-
*/
48-
cpp::result<std::string, std::string> DownloadModel(const std::string& input);
49-
5045
cpp::result<std::string, std::string> AbortDownloadModel(
5146
const std::string& task_id);
5247

0 commit comments

Comments
 (0)