cui-llama.rn 1.5.0 → 1.6.1

package/android/src/newarch/java/com/rnllama/RNLlamaModule.java

@@ -1,135 +1,135 @@
-package com.rnllama;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.module.annotations.ReactModule;
-
-import java.util.HashMap;
-import java.util.Random;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.PushbackInputStream;
-
-@ReactModule(name = RNLlama.NAME)
-public class RNLlamaModule extends NativeRNLlamaSpec {
-  public static final String NAME = RNLlama.NAME;
-
-  private RNLlama rnllama = null;
-
-  public RNLlamaModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-    rnllama = new RNLlama(reactContext);
-  }
-
-  @Override
-  @NonNull
-  public String getName() {
-    return NAME;
-  }
-
-  @ReactMethod
-  public void toggleNativeLog(boolean enabled, Promise promise) {
-    rnllama.toggleNativeLog(enabled, promise);
-  }
-
-  @ReactMethod
-  public void setContextLimit(double limit, Promise promise) {
-    rnllama.setContextLimit(limit, promise);
-  }
-
-  @ReactMethod
-  public void modelInfo(final String model, final ReadableArray skip, final Promise promise) {
-    rnllama.modelInfo(model, skip, promise);
-  }
-
-  @ReactMethod
-  public void initContext(double id, final ReadableMap params, final Promise promise) {
-    rnllama.initContext(id, params, promise);
-  }
-
-  @ReactMethod
-  public void getFormattedChat(double id, String messages, String chatTemplate, ReadableMap params, Promise promise) {
-    rnllama.getFormattedChat(id, messages, chatTemplate, params, promise);
-  }
-
-  @ReactMethod
-  public void loadSession(double id, String path, Promise promise) {
-    rnllama.loadSession(id, path, promise);
-  }
-
-  @ReactMethod
-  public void saveSession(double id, String path, double size, Promise promise) {
-    rnllama.saveSession(id, path, size, promise);
-  }
-
-  @ReactMethod
-  public void completion(double id, final ReadableMap params, final Promise promise) {
-    rnllama.completion(id, params, promise);
-  }
-
-  @ReactMethod
-  public void stopCompletion(double id, final Promise promise) {
-    rnllama.stopCompletion(id, promise);
-  }
-
-  @ReactMethod
-  public void tokenizeAsync(double id, final String text, final Promise promise) {
-    rnllama.tokenizeAsync(id, text, promise);
-  }
-
-  @ReactMethod(isBlockingSynchronousMethod=true)
-  public WritableMap tokenizeSync(double id, final String text) {
-    return rnllama.tokenizeSync(id, text);
-  }
-
-  @ReactMethod
-  public void getCpuFeatures(final Promise promise) {
-    rnllama.getCpuFeatures(promise);
-  }
-
-  @ReactMethod
-  public void detokenize(double id, final ReadableArray tokens, final Promise promise) {
-    rnllama.detokenize(id, tokens, promise);
-  }
-
-  @ReactMethod
-  public void embedding(double id, final String text, final ReadableMap params, final Promise promise) {
-    rnllama.embedding(id, text, params, promise);
-  }
-
-  @ReactMethod
-  public void bench(double id, final double pp, final double tg, final double pl, final double nr, final Promise promise) {
-    rnllama.bench(id, pp, tg, pl, nr, promise);
-  }
-
-  @ReactMethod
-  public void applyLoraAdapters(double id, final ReadableArray loraAdapters, final Promise promise) {
-    rnllama.applyLoraAdapters(id, loraAdapters, promise);
-  }
-
-  @ReactMethod
-  public void removeLoraAdapters(double id, final Promise promise) {
-    rnllama.removeLoraAdapters(id, promise);
-  }
-
-  @ReactMethod
-  public void getLoadedLoraAdapters(double id, final Promise promise) {
-    rnllama.getLoadedLoraAdapters(id, promise);
-  }
-
-  @ReactMethod
-  public void releaseContext(double id, Promise promise) {
-    rnllama.releaseContext(id, promise);
-  }
-
-  @ReactMethod
-  public void releaseAllContexts(Promise promise) {
-    rnllama.releaseAllContexts(promise);
-  }
-}
+package com.rnllama;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.module.annotations.ReactModule;
+
+import java.util.HashMap;
+import java.util.Random;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.PushbackInputStream;
+
+@ReactModule(name = RNLlama.NAME)
+public class RNLlamaModule extends NativeRNLlamaSpec {
+  public static final String NAME = RNLlama.NAME;
+
+  private RNLlama rnllama = null;
+
+  public RNLlamaModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    rnllama = new RNLlama(reactContext);
+  }
+
+  @Override
+  @NonNull
+  public String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  public void toggleNativeLog(boolean enabled, Promise promise) {
+    rnllama.toggleNativeLog(enabled, promise);
+  }
+
+  @ReactMethod
+  public void setContextLimit(double limit, Promise promise) {
+    rnllama.setContextLimit(limit, promise);
+  }
+
+  @ReactMethod
+  public void modelInfo(final String model, final ReadableArray skip, final Promise promise) {
+    rnllama.modelInfo(model, skip, promise);
+  }
+
+  @ReactMethod
+  public void initContext(double id, final ReadableMap params, final Promise promise) {
+    rnllama.initContext(id, params, promise);
+  }
+
+  @ReactMethod
+  public void getFormattedChat(double id, String messages, String chatTemplate, ReadableMap params, Promise promise) {
+    rnllama.getFormattedChat(id, messages, chatTemplate, params, promise);
+  }
+
+  @ReactMethod
+  public void loadSession(double id, String path, Promise promise) {
+    rnllama.loadSession(id, path, promise);
+  }
+
+  @ReactMethod
+  public void saveSession(double id, String path, double size, Promise promise) {
+    rnllama.saveSession(id, path, size, promise);
+  }
+
+  @ReactMethod
+  public void completion(double id, final ReadableMap params, final Promise promise) {
+    rnllama.completion(id, params, promise);
+  }
+
+  @ReactMethod
+  public void stopCompletion(double id, final Promise promise) {
+    rnllama.stopCompletion(id, promise);
+  }
+
+  @ReactMethod
+  public void tokenizeAsync(double id, final String text, final Promise promise) {
+    rnllama.tokenizeAsync(id, text, promise);
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod=true)
+  public WritableMap tokenizeSync(double id, final String text) {
+    return rnllama.tokenizeSync(id, text);
+  }
+
+  @ReactMethod
+  public void getCpuFeatures(final Promise promise) {
+    rnllama.getCpuFeatures(promise);
+  }
+
+  @ReactMethod
+  public void detokenize(double id, final ReadableArray tokens, final Promise promise) {
+    rnllama.detokenize(id, tokens, promise);
+  }
+
+  @ReactMethod
+  public void embedding(double id, final String text, final ReadableMap params, final Promise promise) {
+    rnllama.embedding(id, text, params, promise);
+  }
+
+  @ReactMethod
+  public void bench(double id, final double pp, final double tg, final double pl, final double nr, final Promise promise) {
+    rnllama.bench(id, pp, tg, pl, nr, promise);
+  }
+
+  @ReactMethod
+  public void applyLoraAdapters(double id, final ReadableArray loraAdapters, final Promise promise) {
+    rnllama.applyLoraAdapters(id, loraAdapters, promise);
+  }
+
+  @ReactMethod
+  public void removeLoraAdapters(double id, final Promise promise) {
+    rnllama.removeLoraAdapters(id, promise);
+  }
+
+  @ReactMethod
+  public void getLoadedLoraAdapters(double id, final Promise promise) {
+    rnllama.getLoadedLoraAdapters(id, promise);
+  }
+
+  @ReactMethod
+  public void releaseContext(double id, Promise promise) {
+    rnllama.releaseContext(id, promise);
+  }
+
+  @ReactMethod
+  public void releaseAllContexts(Promise promise) {
+    rnllama.releaseAllContexts(promise);
+  }
+}

package/android/src/oldarch/java/com/rnllama/RNLlamaModule.java

@@ -1,136 +1,136 @@
-package com.rnllama;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.module.annotations.ReactModule;
-
-import java.util.HashMap;
-import java.util.Random;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.PushbackInputStream;
-
-@ReactModule(name = RNLlama.NAME)
-public class RNLlamaModule extends ReactContextBaseJavaModule {
-  public static final String NAME = RNLlama.NAME;
-
-  private RNLlama rnllama = null;
-
-  public RNLlamaModule(ReactApplicationContext reactContext) {
-    super(reactContext);
-    rnllama = new RNLlama(reactContext);
-  }
-
-  @Override
-  @NonNull
-  public String getName() {
-    return NAME;
-  }
-
-  @ReactMethod
-  public void toggleNativeLog(boolean enabled, Promise promise) {
-    rnllama.toggleNativeLog(enabled, promise);
-  }
-
-  @ReactMethod
-  public void setContextLimit(double limit, Promise promise) {
-    rnllama.setContextLimit(limit, promise);
-  }
-
-  @ReactMethod
-  public void modelInfo(final String model, final ReadableArray skip, final Promise promise) {
-    rnllama.modelInfo(model, skip, promise);
-  }
-
-  @ReactMethod
-  public void initContext(double id, final ReadableMap params, final Promise promise) {
-    rnllama.initContext(id, params, promise);
-  }
-
-  @ReactMethod
-  public void getFormattedChat(double id, String messages, String chatTemplate, ReadableMap params, Promise promise) {
-    rnllama.getFormattedChat(id, messages, chatTemplate, params, promise);
-  }
-
-  @ReactMethod
-  public void loadSession(double id, String path, Promise promise) {
-    rnllama.loadSession(id, path, promise);
-  }
-
-  @ReactMethod
-  public void saveSession(double id, String path, int size, Promise promise) {
-    rnllama.saveSession(id, path, size, promise);
-  }
-
-  @ReactMethod
-  public void completion(double id, final ReadableMap params, final Promise promise) {
-    rnllama.completion(id, params, promise);
-  }
-
-  @ReactMethod
-  public void stopCompletion(double id, final Promise promise) {
-    rnllama.stopCompletion(id, promise);
-  }
-
-  @ReactMethod
-  public void tokenizeAsync(double id, final String text, final Promise promise) {
-    rnllama.tokenizeAsync(id, text, promise);
-  }
-
-  @ReactMethod(isBlockingSynchronousMethod=true)
-  public WritableMap tokenizeSync(double id, final String text) {
-    return rnllama.tokenizeSync(id, text);
-  }
-
-  @ReactMethod
-  public void getCpuFeatures(final Promise promise) {
-    rnllama.getCpuFeatures(promise);
-  }
-
-  @ReactMethod
-  public void detokenize(double id, final ReadableArray tokens, final Promise promise) {  
-    rnllama.detokenize(id, tokens, promise);
-  }
-
-  @ReactMethod
-  public void embedding(double id, final String text, final ReadableMap params, final Promise promise) {
-    rnllama.embedding(id, text, params, promise);
-  }
-
-  @ReactMethod
-  public void bench(double id, final double pp, final double tg, final double pl, final double nr, final Promise promise) {
-    rnllama.bench(id, pp, tg, pl, nr, promise);
-  }
-
-  @ReactMethod
-  public void applyLoraAdapters(double id, final ReadableArray loraAdapters, final Promise promise) {
-    rnllama.applyLoraAdapters(id, loraAdapters, promise);
-  }
-
-  @ReactMethod
-  public void removeLoraAdapters(double id, final Promise promise) {
-    rnllama.removeLoraAdapters(id, promise);
-  }
-
-  @ReactMethod
-  public void getLoadedLoraAdapters(double id, final Promise promise) {
-    rnllama.getLoadedLoraAdapters(id, promise);
-  }
-
-  @ReactMethod
-  public void releaseContext(double id, Promise promise) {
-    rnllama.releaseContext(id, promise);
-  }
-
-  @ReactMethod
-  public void releaseAllContexts(Promise promise) {
-    rnllama.releaseAllContexts(promise);
-  }
-}
+package com.rnllama;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.module.annotations.ReactModule;
+
+import java.util.HashMap;
+import java.util.Random;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.PushbackInputStream;
+
+@ReactModule(name = RNLlama.NAME)
+public class RNLlamaModule extends ReactContextBaseJavaModule {
+  public static final String NAME = RNLlama.NAME;
+
+  private RNLlama rnllama = null;
+
+  public RNLlamaModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    rnllama = new RNLlama(reactContext);
+  }
+
+  @Override
+  @NonNull
+  public String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  public void toggleNativeLog(boolean enabled, Promise promise) {
+    rnllama.toggleNativeLog(enabled, promise);
+  }
+
+  @ReactMethod
+  public void setContextLimit(double limit, Promise promise) {
+    rnllama.setContextLimit(limit, promise);
+  }
+
+  @ReactMethod
+  public void modelInfo(final String model, final ReadableArray skip, final Promise promise) {
+    rnllama.modelInfo(model, skip, promise);
+  }
+
+  @ReactMethod
+  public void initContext(double id, final ReadableMap params, final Promise promise) {
+    rnllama.initContext(id, params, promise);
+  }
+
+  @ReactMethod
+  public void getFormattedChat(double id, String messages, String chatTemplate, ReadableMap params, Promise promise) {
+    rnllama.getFormattedChat(id, messages, chatTemplate, params, promise);
+  }
+
+  @ReactMethod
+  public void loadSession(double id, String path, Promise promise) {
+    rnllama.loadSession(id, path, promise);
+  }
+
+  @ReactMethod
+  public void saveSession(double id, String path, int size, Promise promise) {
+    rnllama.saveSession(id, path, size, promise);
+  }
+
+  @ReactMethod
+  public void completion(double id, final ReadableMap params, final Promise promise) {
+    rnllama.completion(id, params, promise);
+  }
+
+  @ReactMethod
+  public void stopCompletion(double id, final Promise promise) {
+    rnllama.stopCompletion(id, promise);
+  }
+
+  @ReactMethod
+  public void tokenizeAsync(double id, final String text, final Promise promise) {
+    rnllama.tokenizeAsync(id, text, promise);
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod=true)
+  public WritableMap tokenizeSync(double id, final String text) {
+    return rnllama.tokenizeSync(id, text);
+  }
+
+  @ReactMethod
+  public void getCpuFeatures(final Promise promise) {
+    rnllama.getCpuFeatures(promise);
+  }
+
+  @ReactMethod
+  public void detokenize(double id, final ReadableArray tokens, final Promise promise) {  
+    rnllama.detokenize(id, tokens, promise);
+  }
+
+  @ReactMethod
+  public void embedding(double id, final String text, final ReadableMap params, final Promise promise) {
+    rnllama.embedding(id, text, params, promise);
+  }
+
+  @ReactMethod
+  public void bench(double id, final double pp, final double tg, final double pl, final double nr, final Promise promise) {
+    rnllama.bench(id, pp, tg, pl, nr, promise);
+  }
+
+  @ReactMethod
+  public void applyLoraAdapters(double id, final ReadableArray loraAdapters, final Promise promise) {
+    rnllama.applyLoraAdapters(id, loraAdapters, promise);
+  }
+
+  @ReactMethod
+  public void removeLoraAdapters(double id, final Promise promise) {
+    rnllama.removeLoraAdapters(id, promise);
+  }
+
+  @ReactMethod
+  public void getLoadedLoraAdapters(double id, final Promise promise) {
+    rnllama.getLoadedLoraAdapters(id, promise);
+  }
+
+  @ReactMethod
+  public void releaseContext(double id, Promise promise) {
+    rnllama.releaseContext(id, promise);
+  }
+
+  @ReactMethod
+  public void releaseAllContexts(Promise promise) {
+    rnllama.releaseAllContexts(promise);
+  }
+}

package/cpp/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-2024 The ggml authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/cpp/README.md

@@ -1,4 +1,4 @@
-# Note
-
-- Only `rn-llama.h` and `rn-llama.cpp` are the specific files for this folder, others are sync from [llama.cpp](https://github.com/ggerganov/llama.cpp).
-- We can update the native source by using the [bootstrap](../scripts/bootstrap.sh) script.
+# Note
+
+- Only `rn-llama.h` and `rn-llama.cpp` are the specific files for this folder, others are sync from [llama.cpp](https://github.com/ggerganov/llama.cpp).
+- We can update the native source by using the [bootstrap](../scripts/bootstrap.sh) script.

package/cpp/chat.cpp

@@ -1612,7 +1612,7 @@ static common_chat_params common_chat_templates_apply_jinja(
     }
 
     // Hermes 2/3 Pro, Qwen 2.5 Instruct (w/ tools)
-    if (src.find("<tool_call>") != std::string::npos && params.json_schema.is_null()) {
+    if (src.find("<tool_call>") != std::string::npos && params.json_schema.is_null() && params.tools.is_array() && params.json_schema.is_null()) {
         return common_chat_params_init_hermes_2_pro(tmpl, params);
     }
 

package/cpp/common.cpp

@@ -837,7 +837,7 @@ std::string fs_get_cache_directory() {
     if (getenv("LLAMA_CACHE")) {
         cache_directory = std::getenv("LLAMA_CACHE");
     } else {
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__) || defined(_AIX)
         if (std::getenv("XDG_CACHE_HOME")) {
             cache_directory = std::getenv("XDG_CACHE_HOME");
         } else {
@@ -847,7 +847,9 @@ std::string fs_get_cache_directory() {
         cache_directory = std::getenv("HOME") + std::string("/Library/Caches/");
 #elif defined(_WIN32)
         cache_directory = std::getenv("LOCALAPPDATA");
-#endif // __linux__
+#else
+#  error Unknown architecture
+#endif
         cache_directory = ensure_trailing_slash(cache_directory);
         cache_directory += "llama.cpp";
     }
@@ -1034,6 +1036,19 @@ struct common_init_result common_init_from_params(common_params & params) {
     return iparams;
 }
 
+std::string get_model_endpoint() {
+    const char * model_endpoint_env = getenv("MODEL_ENDPOINT");
+    // We still respect the use of environment-variable "HF_ENDPOINT" for backward-compatibility.
+    const char * hf_endpoint_env = getenv("HF_ENDPOINT");
+    const char * endpoint_env = model_endpoint_env ? model_endpoint_env : hf_endpoint_env;
+    std::string model_endpoint = "https://huggingface.co/";
+    if (endpoint_env) {
+        model_endpoint = endpoint_env;
+        if (model_endpoint.back() != '/') model_endpoint += '/';
+    }
+    return model_endpoint;
+}
+
 void common_set_adapter_lora(struct llama_context * ctx, std::vector<common_adapter_lora_info> & lora) {
     llama_clear_adapter_lora(ctx);
     for (auto & la : lora) {