Merge pull request #398 from janhq/397-grammar-file-not-found-llamacp…

…pcc201 bug: correct way of handle grammar file
janhq · Jan 31, 2024 · 626c753 · 626c753
2 parents 5ce716b + ef16ba7
commit 626c753
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/controllers/llamaCPP.cc b/controllers/llamaCPP.cc
@@ -186,15 +186,19 @@ void llamaCPP::chatCompletion(
         (*jsonBody).get("frequency_penalty", 0).asFloat();
     data["presence_penalty"] = (*jsonBody).get("presence_penalty", 0).asFloat();
     const Json::Value &messages = (*jsonBody)["messages"];
-    std::string grammar_file = (*jsonBody).get("grammar_file", "").asString();
-    std::ifstream file(grammar_file);
-    if (!file) {
-      LOG_ERROR << "Grammar file not found";
-    } else {
-      std::stringstream grammarBuf;
-      grammarBuf << file.rdbuf();
-      data["grammar"] = grammarBuf.str();
-    }
+
+    if (!(*jsonBody)["grammar_file"].isNull()) {
+      std::string grammar_file = (*jsonBody)["grammar_file"].asString();
+      std::ifstream file(grammar_file);
+      if (!file) {
+        LOG_ERROR << "Grammar file not found";
+      } else {
+        std::stringstream grammarBuf;
+        grammarBuf << file.rdbuf();
+        data["grammar"] = grammarBuf.str();
+      }
+    };
+
     if (!llama.multimodal) {
 
       for (const auto &message : messages) {