chore: add log

Author: vansangpfiev

engine/extensions/remote-engine/remote_engine.cc

@@ -93,8 +93,13 @@ CurlResponse RemoteEngine::MakeStreamingChatCompletionRequest(
     return response;
   }
 
-  std::string full_url =
-      config.transform_req["chat_completions"]["url"].as<std::string>();
+  std::string full_url = chat_url_;
+
+  if (config.transform_req["chat_completions"]["url"]) {
+    full_url =
+        config.transform_req["chat_completions"]["url"].as<std::string>();
+  }
+  CTL_DBG("full_url: " << full_url);
 
   struct curl_slist* headers = nullptr;
   if (!config.api_key.empty()) {
@@ -246,8 +251,13 @@ CurlResponse RemoteEngine::MakeChatCompletionRequest(
     response.error_message = "Failed to initialize CURL";
     return response;
   }
-  std::string full_url =
-      config.transform_req["chat_completions"]["url"].as<std::string>();
+  std::string full_url = chat_url_;
+
+  if (config.transform_req["chat_completions"]["url"]) {
+    full_url =
+        config.transform_req["chat_completions"]["url"].as<std::string>();
+  }
+  CTL_DBG("full_url: " << full_url);
 
   struct curl_slist* headers = nullptr;
   if (!config.api_key.empty()) {
@@ -411,6 +421,14 @@ void RemoteEngine::LoadModel(
               .asString();
       CTL_INF(chat_res_template_);
     }
+
+    if (!metadata_["transform_req"].isNull() &&
+        !metadata_["transform_req"]["chat_completions"].isNull() &&
+        !metadata_["transform_req"]["chat_completions"]["url"].isNull()) {
+      chat_url_ =
+          metadata_["transform_req"]["chat_completions"]["url"].asString();
+      CTL_INF(chat_url_);
+    }
   }
 
   if (!LoadModelConfig(model, model_path, api_key)) {
@@ -713,14 +731,12 @@ Json::Value RemoteEngine::GetRemoteModels(const std::string& url,
       CTL_WRN(response.error_message);
       return error;
     }
-    Json::Value response_json;
-    Json::Reader reader;
-    if (!reader.parse(response.body, response_json)) {
-      Json::Value error;
-      error["error"] = "Failed to parse response";
-      return error;
+    CTL_DBG(response.body);
+    auto body_json = json_helper::ParseJsonString(response.body);
+    if (body_json.isMember("error")) {
+      return body_json["error"];
     }
-    return response_json;
+    return body_json;
   }
 }
 

engine/extensions/remote-engine/remote_engine.h

@@ -53,6 +53,7 @@ class RemoteEngine : public RemoteEngineI {
   std::string chat_res_template_;
   std::string api_key_header_;
   std::string engine_name_;
+  std::string chat_url_;
   trantor::ConcurrentTaskQueue q_;
 
   // Helper functions

engine/services/engine_service.cc

@@ -1142,6 +1142,12 @@ cpp::result<Json::Value, std::string> EngineService::GetRemoteModels(
   auto api_key = remote_engine_json["api_key"].asString();
   auto api_key_template =
       remote_engine_json["metadata"]["api_key_template"].asString();
+  if (url.empty())
+    CTL_WRN("url is empty");
+  if (api_key.empty())
+    CTL_WRN("api_key is empty");
+  if (api_key_template.empty())
+    CTL_WRN("api_key_template is empty");
   auto res = e->GetRemoteModels(url, api_key, api_key_template);
   if (!res["error"].isNull()) {
     return cpp::fail(res["error"].asString());