fix: more

Author: sangjanai

engine/commands/model_import_cmd.cc

@@ -14,6 +14,8 @@ ModelImportCmd::ModelImportCmd(std::string model_handle, std::string model_path)
       model_path_(std::move(model_path)) {}
 
 void ModelImportCmd::Exec() {
+  namespace fs = std::filesystem;
+  namespace fmu = file_manager_utils;
   config::GGUFHandler gguf_handler;
   config::YamlHandler yaml_handler;
   cortex::db::Models modellist_utils_obj;
@@ -22,10 +24,13 @@ void ModelImportCmd::Exec() {
                                  std::filesystem::path("imported") /
                                  std::filesystem::path(model_handle_ + ".yml"))
                                     .string();
-  cortex::db::ModelEntry model_entry{
-      model_handle_,   "local",       "imported",
-      model_yaml_path, model_handle_};
   try {
+    // Use relative path for model_yaml_path. In case of import, we use absolute path for model
+    auto yaml_rel_path =
+        fmu::Subtract(fs::path(model_yaml_path), fmu::GetCortexDataPath());
+    cortex::db::ModelEntry model_entry{model_handle_, "local", "imported",
+                                       yaml_rel_path, model_handle_};
+
     std::filesystem::create_directories(
         std::filesystem::path(model_yaml_path).parent_path());
     gguf_handler.Parse(model_path_);

engine/config/yaml_config.cc

@@ -6,6 +6,7 @@
 using namespace std;
 
 #include "utils/format_utils.h"
+#include "utils/file_manager_utils.h"
 #include "yaml_config.h"
 namespace config {
 // Method to read YAML file
@@ -14,6 +15,8 @@ void YamlHandler::Reset() {
   yaml_node_.reset();
 };
 void YamlHandler::ReadYamlFile(const std::string& file_path) {
+  namespace fs = std::filesystem;
+  namespace fmu = file_manager_utils;
   try {
     yaml_node_ = YAML::LoadFile(file_path);
     // incase of model.yml file, we don't have files yet, create them
@@ -24,8 +27,9 @@ void YamlHandler::ReadYamlFile(const std::string& file_path) {
       std::vector<std::string> v;
       if (yaml_node_["engine"] &&
           yaml_node_["engine"].as<std::string>() == "cortex.llamacpp") {
-        // TODO: change prefix to models:// with source from cortexso
-        v.emplace_back(s.substr(0, s.find_last_of('/')) + "/model.gguf");
+        auto abs_path = s.substr(0, s.find_last_of('/')) + "/model.gguf";
+        auto rel_path = fmu::Subtract(fs::path(abs_path), fmu::GetCortexDataPath());
+        v.emplace_back(rel_path.string());
       } else {
         v.emplace_back(s.substr(0, s.find_last_of('/')));
       }

engine/controllers/models.cc

@@ -224,6 +224,8 @@ void Models::UpdateModel(const HttpRequestPtr& req,
 void Models::ImportModel(
     const HttpRequestPtr& req,
     std::function<void(const HttpResponsePtr&)>&& callback) const {
+  namespace fs = std::filesystem;
+  namespace fmu = file_manager_utils;
   if (!http_util::HasFieldInReq(req, callback, "model") ||
       !http_util::HasFieldInReq(req, callback, "modelPath")) {
     return;
@@ -233,14 +235,18 @@ void Models::ImportModel(
   config::GGUFHandler gguf_handler;
   config::YamlHandler yaml_handler;
   cortex::db::Models modellist_utils_obj;
-
   std::string model_yaml_path = (file_manager_utils::GetModelsContainerPath() /
                                  std::filesystem::path("imported") /
                                  std::filesystem::path(modelHandle + ".yml"))
                                     .string();
-  cortex::db::ModelEntry model_entry{modelHandle, "local", "imported",
-                                     model_yaml_path, modelHandle};
+
   try {
+    // Use relative path for model_yaml_path. In case of import, we use absolute path for model
+    auto yaml_rel_path =
+        fmu::Subtract(fs::path(model_yaml_path), fmu::GetCortexDataPath());
+    cortex::db::ModelEntry model_entry{modelHandle, "local", "imported",
+                                       yaml_rel_path, modelHandle};
+
     std::filesystem::create_directories(
         std::filesystem::path(model_yaml_path).parent_path());
     gguf_handler.Parse(modelPath);

engine/services/model_service.cc

@@ -17,14 +17,19 @@
 namespace {
 void ParseGguf(const DownloadItem& ggufDownloadItem,
                std::optional<std::string> author) {
-
+  namespace fs = std::filesystem;
+  namespace fmu = file_manager_utils;
   config::GGUFHandler gguf_handler;
   config::YamlHandler yaml_handler;
   gguf_handler.Parse(ggufDownloadItem.localPath.string());
+
   config::ModelConfig model_config = gguf_handler.GetModelConfig();
   model_config.id =
       ggufDownloadItem.localPath.parent_path().filename().string();
-  model_config.files = {ggufDownloadItem.localPath.string()};
+  // use relative path for files
+  auto file_rel_path = fmu::Subtract(fs::path(ggufDownloadItem.localPath),
+                                     fmu::GetCortexDataPath());
+  model_config.files = {file_rel_path.string()};
   model_config.model = ggufDownloadItem.id;
   yaml_handler.UpdateModelConfig(model_config);
 
@@ -383,11 +388,13 @@ cpp::result<void, std::string> ModelService::DeleteModel(
       if (mc.files.size() > 0) {
         if (mc.engine == "cortex.llamacpp") {
           for (auto& file : mc.files) {
-            std::filesystem::path gguf_p(file);
+            std::filesystem::path gguf_p(
+                fmu::GetAbsolutePath(fmu::GetCortexDataPath(), fs::path(file)));
             std::filesystem::remove(gguf_p);
           }
         } else {
-          std::filesystem::path f(mc.files[0]);
+          std::filesystem::path f(fmu::GetAbsolutePath(fmu::GetCortexDataPath(),
+                                                       fs::path(mc.files[0])));
           std::filesystem::remove_all(f);
         }
       } else {
@@ -431,7 +438,9 @@ cpp::result<bool, std::string> ModelService::StartModel(
     Json::Value json_data = mc.ToJson();
     if (mc.files.size() > 0) {
       // TODO(sang) support multiple files
-      json_data["model_path"] = mc.files[0];
+      json_data["model_path"] =
+          fmu::GetAbsolutePath(fmu::GetCortexDataPath(), fs::path(mc.files[0]))
+              .string();
     } else {
       LOG_WARN << "model_path is empty";
       return false;