Merge pull request #1743 from janhq/j/fix-rounding-float

fix: rounding float

Author: namchuai

engine/config/model_config.h

@@ -1,13 +1,12 @@
 #pragma once
 
 #include <json/json.h>
-#include <cmath>
-#include <iomanip>
 #include <limits>
 #include <sstream>
 #include <string>
 #include <vector>
 #include "utils/format_utils.h"
+
 namespace config {
 struct ModelConfig {
   std::string name;
@@ -173,6 +172,15 @@ struct ModelConfig {
         tp = json["tp"].asInt();
     }
   }
+
+  std::string ToJsonString() const {
+    auto obj = ToJson();
+    obj["id"] = obj["model"].asString();
+    Json::StreamWriterBuilder wbuilder;
+    wbuilder.settings_["precision"] = 2;
+    return Json::writeString(wbuilder, obj);
+  }
+
   Json::Value ToJson() const {
     Json::Value obj;
 

engine/config/yaml_config.h

@@ -4,7 +4,6 @@
 #include <string>
 
 #include "model_config.h"
-#include "yaml-cpp/yaml.h"
 
 namespace config {
 class YamlHandler {

engine/controllers/models.cc

@@ -224,13 +224,9 @@ void Models::GetModel(const HttpRequestPtr& req,
             .string());
     auto model_config = yaml_handler.GetModelConfig();
 
-    ret = model_config.ToJson();
-
-    ret["id"] = model_config.model;
-    ret["object"] = "model";
-    ret["result"] = "OK";
-    auto resp = cortex_utils::CreateCortexHttpJsonResponse(ret);
-    resp->setStatusCode(k200OK);
+    auto ret = model_config.ToJsonString();
+    auto resp = cortex_utils::CreateCortexHttpTextAsJsonResponse(ret);
+    resp->setStatusCode(drogon::k200OK);
     callback(resp);
   } catch (const std::exception& e) {
     std::string message =

engine/database/models.cc

@@ -1,18 +1,15 @@
 #include "models.h"
 #include <algorithm>
-#include <iostream>
 #include <sstream>
 #include "database.h"
 #include "utils/result.hpp"
 #include "utils/scope_exit.h"
 
 namespace cortex::db {
 
-Models::Models() : db_(cortex::db::Database::GetInstance().db()) {
-}
+Models::Models() : db_(cortex::db::Database::GetInstance().db()) {}
 
-Models::Models(SQLite::Database& db) : db_(db) {
-}
+Models::Models(SQLite::Database& db) : db_(db) {}
 
 Models::~Models() {}
 

engine/utils/cortex_utils.h

@@ -43,6 +43,17 @@ inline drogon::HttpResponsePtr CreateCortexHttpResponse() {
   return res;
 }
 
+inline drogon::HttpResponsePtr CreateCortexHttpTextAsJsonResponse(
+    const std::string& data) {
+  auto res = drogon::HttpResponse::newHttpResponse();
+  res->setBody(data);
+  res->setContentTypeCode(drogon::CT_APPLICATION_JSON);
+#if defined(_WIN32)
+  res->addHeader("date", GetDateRFC1123());
+#endif
+  return res;
+};
+
 inline drogon::HttpResponsePtr CreateCortexHttpJsonResponse(
     const Json::Value& data) {
   auto res = drogon::HttpResponse::newHttpJsonResponse(data);