cui-llama.rn 1.4.4 → 1.4.6

package/cpp/rn-llama.cpp

@@ -194,7 +194,8 @@ bool llama_rn_context::loadModel(common_params &params_)
         LOG_ERROR("unable to load model: %s", params_.model.c_str());
         return false;
     }
-    templates = common_chat_templates_from_model(model, params.chat_template);
+    
+    templates = common_chat_templates_init(model, params.chat_template);
     n_ctx = llama_n_ctx(ctx);
 
     // We can uncomment for debugging or after this fix: https://github.com/ggerganov/llama.cpp/pull/11101
@@ -219,36 +220,28 @@ common_chat_params llama_rn_context::getFormattedChatWithJinja(
   const bool &parallel_tool_calls,
   const std::string &tool_choice
 ) const {
-  common_chat_inputs inputs;
-  inputs.messages = json::parse(messages);
+  common_chat_templates_inputs inputs;
+  inputs.messages = common_chat_msgs_parse_oaicompat(json::parse(messages));
   auto useTools = !tools.empty();
   if (useTools) {
-      inputs.tools = json::parse(tools);
+      inputs.tools = common_chat_tools_parse_oaicompat(json::parse(tools));
   }
   inputs.parallel_tool_calls = parallel_tool_calls;
   if (!tool_choice.empty()) {
-      inputs.tool_choice = tool_choice;
+      inputs.tool_choice = common_chat_tool_choice_parse_oaicompat(tool_choice);
   }
+  
   if (!json_schema.empty()) {
-      inputs.json_schema = json::parse(json_schema);
+      inputs.json_schema = json_schema;
   }
   inputs.extract_reasoning = params.reasoning_format != COMMON_REASONING_FORMAT_NONE;
-  inputs.stream = true;
-
+ 
   // If chat_template is provided, create new one and use it (probably slow)
   if (!chat_template.empty()) {
-      auto tmp = common_chat_templates_from_model(model, chat_template);
-      const common_chat_template* template_ptr = useTools && tmp.template_tool_use ? tmp.template_tool_use.get() : tmp.template_default.get();
-      if (inputs.parallel_tool_calls && !template_ptr->original_caps().supports_parallel_tool_calls) {
-          inputs.parallel_tool_calls = false;
-      }
-      return common_chat_params_init(*template_ptr, inputs);
+      auto tmp = common_chat_templates_init(model, chat_template);
+      return common_chat_templates_apply(tmp.get(), inputs);
   } else {
-      const common_chat_template* template_ptr = useTools && templates.template_tool_use ? templates.template_tool_use.get() : templates.template_default.get();
-      if (inputs.parallel_tool_calls && !template_ptr->original_caps().supports_parallel_tool_calls) {
-          inputs.parallel_tool_calls = false;
-      }
-      return common_chat_params_init(*template_ptr, inputs);
+      return common_chat_templates_apply(templates.get(), inputs);
   }
 }
 
@@ -256,33 +249,24 @@ std::string llama_rn_context::getFormattedChat(
   const std::string &messages,
   const std::string &chat_template
 ) const {
-  auto chat_json = json::parse(messages);
-
+  auto chat_json = json::parse(messages);    
+  common_chat_templates_inputs inputs;
   // Handle regular chat without tools
   std::vector<common_chat_msg> chat_msgs;
   for (const auto &msg : chat_json) {
       chat_msgs.push_back({
-          msg["role"].get<std::string>(),
-          msg["content"].get<std::string>()
+          msg["role"].get(),
+          msg["content"].get()
       });
   }
+  inputs.messages = chat_msgs;
 
   // If chat_template is provided, create new one and use it (probably slow)
   if (!chat_template.empty()) {
-      auto tmp = common_chat_templates_from_model(model, chat_template);
-      return common_chat_apply_template(
-          *tmp.template_default,
-          chat_msgs,
-          true,
-          false
-      );
+      auto tmp = common_chat_templates_init(model, chat_template);
+      return common_chat_templates_apply(tmp.get(), inputs).prompt;
   } else {
-      return common_chat_apply_template(
-          *templates.template_default,
-          chat_msgs,
-          true,
-          false
-      );
+      return common_chat_templates_apply(templates.get(), inputs).prompt;
   }
 }
 
@@ -595,7 +579,6 @@ std::vector<float> llama_rn_context::getEmbedding(common_params &embd_params)
     float *data;
 
     const enum llama_pooling_type pooling_type = llama_pooling_type(ctx);
-    printf("pooling_type: %d\n", pooling_type);
     if (pooling_type == LLAMA_POOLING_TYPE_NONE) {
         data = llama_get_embeddings(ctx);
     } else {

package/cpp/rn-llama.h

@@ -3,9 +3,9 @@
 
 #include <sstream>
 #include <iostream>
-#include "chat.hpp"
 #include "chat-template.hpp"
 #include "common.h"
+#include "chat.h"
 #include "ggml.h"
 #include "gguf.h"
 #include "llama.h"
@@ -15,8 +15,18 @@
 #include <android/log.h>
 #endif
 
+using json = nlohmann::ordered_json;
+typedef minja::chat_template common_chat_template;
+
+struct common_chat_templates {
+    bool has_explicit_template;
+    std::unique_ptr<common_chat_template> template_default;
+    std::unique_ptr<common_chat_template> template_tool_use;
+};
+
 namespace rnllama {
 
+
 std::string tokens_to_output_formatted_string(const llama_context *ctx, const llama_token token);
 
 std::string tokens_to_str(llama_context *ctx, const std::vector<llama_token>::const_iterator begin, const std::vector<llama_token>::const_iterator end);
@@ -65,7 +75,7 @@ struct llama_rn_context {
 
     llama_context *ctx = nullptr;
     common_sampler *ctx_sampling = nullptr;
-    common_chat_templates templates;
+    common_chat_templates_ptr templates = nullptr;
 
     int n_ctx;