fix: escape json

Author: sangjanai

engine/extensions/template_renderer.cc

@@ -7,7 +7,9 @@
 #include <regex>
 #include <stdexcept>
 #include "utils/logging_utils.h"
+#include "utils/string_utils.h"
 namespace extensions {
+
 TemplateRenderer::TemplateRenderer() {
   // Configure Inja environment
   env_.set_trim_blocks(true);
@@ -21,10 +23,9 @@ TemplateRenderer::TemplateRenderer() {
     const auto& value = *args[0];
 
     if (value.is_string()) {
-      std::string v = value.get<std::string>();
-      v = std::regex_replace(v, std::regex("\""), "\\\"");
-      v = std::regex_replace(v, std::regex("\n"), "\\n");
-      return nlohmann::json(std::string("\"") + v + "\"");
+      return nlohmann::json(std::string("\"") +
+                            string_utils::EscapeJson(value.get<std::string>()) +
+                            "\"");
     }
     return value;
   });
@@ -48,7 +49,7 @@ std::string TemplateRenderer::Render(const std::string& tmpl,
     std::string result = env_.render(tmpl, template_data);
 
     // Clean up any potential double quotes in JSON strings
-    result = std::regex_replace(result, std::regex("\\\"\\\""), "\"");
+    // result = std::regex_replace(result, std::regex("\\\"\\\""), "\"");
 
     LOG_DEBUG << "Result: " << result;
 

engine/test/components/test_remote_engine.cc

@@ -337,7 +337,7 @@ TEST_F(RemoteEngineTest, CohereResponse) {
   // non-stream
   message = R"(
   {
-  "text": "Isaac Newton was 'born' on 25 \"December\" 1642 (Old Style) \n\nor 4 January 1643 (New Style).",
+  "text": "Isaac \t\tNewton was 'born' on 25 \"December\" 1642 (Old Style) \n\nor 4 January 1643 (New Style).",
   "generation_id": "0385c7cf-4247-43a3-a450-b25b547a31e1",
   "citations": [
     {
@@ -411,7 +411,7 @@ TEST_F(RemoteEngineTest, CohereResponse) {
   res_json = json_helper::ParseJsonString(res);
   EXPECT_EQ(
       res_json["choices"][0]["message"]["content"].asString(),
-      "Isaac Newton was 'born' on 25 \"December\" 1642 (Old Style) \n\nor 4 "
+      "Isaac \t\tNewton was 'born' on 25 \"December\" 1642 (Old Style) \n\nor 4 "
       "January 1643 (New Style).");
 }
 

engine/utils/string_utils.h

@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <cctype>
 #include <chrono>
+#include <iomanip>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -162,4 +163,41 @@ inline std::string FormatTimeElapsed(uint64_t pastTimestamp) {
 
   return oss.str();
 }
+
+inline std::string EscapeJson(const std::string& s) {
+  std::ostringstream o;
+  for (auto c = s.cbegin(); c != s.cend(); c++) {
+    switch (*c) {
+      case '"':
+        o << "\\\"";
+        break;
+      case '\\':
+        o << "\\\\";
+        break;
+      case '\b':
+        o << "\\b";
+        break;
+      case '\f':
+        o << "\\f";
+        break;
+      case '\n':
+        o << "\\n";
+        break;
+      case '\r':
+        o << "\\r";
+        break;
+      case '\t':
+        o << "\\t";
+        break;
+      default:
+        if ('\x00' <= *c && *c <= '\x1f') {
+          o << "\\u" << std::hex << std::setw(4) << std::setfill('0')
+            << static_cast<int>(*c);
+        } else {
+          o << *c;
+        }
+    }
+  }
+  return o.str();
+}
 }  // namespace string_utils