@fugood/llama.node 1.2.3 → 1.2.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fugood/llama.node",
   "access": "public",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "An another Node binding of llama.cpp",
   "main": "lib/index.js",
   "scripts": {
@@ -72,19 +72,19 @@
     "CMakeLists.txt"
   ],
   "optionalDependencies": {
-    "@fugood/node-llama-linux-x64": "1.2.3",
-    "@fugood/node-llama-linux-x64-vulkan": "1.2.3",
-    "@fugood/node-llama-linux-x64-cuda": "1.2.3",
-    "@fugood/node-llama-linux-arm64": "1.2.3",
-    "@fugood/node-llama-linux-arm64-vulkan": "1.2.3",
-    "@fugood/node-llama-linux-arm64-cuda": "1.2.3",
-    "@fugood/node-llama-win32-x64": "1.2.3",
-    "@fugood/node-llama-win32-x64-vulkan": "1.2.3",
-    "@fugood/node-llama-win32-x64-cuda": "1.2.3",
-    "@fugood/node-llama-win32-arm64": "1.2.3",
-    "@fugood/node-llama-win32-arm64-vulkan": "1.2.3",
-    "@fugood/node-llama-darwin-x64": "1.2.3",
-    "@fugood/node-llama-darwin-arm64": "1.2.3"
+    "@fugood/node-llama-linux-x64": "1.2.5",
+    "@fugood/node-llama-linux-x64-vulkan": "1.2.5",
+    "@fugood/node-llama-linux-x64-cuda": "1.2.5",
+    "@fugood/node-llama-linux-arm64": "1.2.5",
+    "@fugood/node-llama-linux-arm64-vulkan": "1.2.5",
+    "@fugood/node-llama-linux-arm64-cuda": "1.2.5",
+    "@fugood/node-llama-win32-x64": "1.2.5",
+    "@fugood/node-llama-win32-x64-vulkan": "1.2.5",
+    "@fugood/node-llama-win32-x64-cuda": "1.2.5",
+    "@fugood/node-llama-win32-arm64": "1.2.5",
+    "@fugood/node-llama-win32-arm64-vulkan": "1.2.5",
+    "@fugood/node-llama-darwin-x64": "1.2.5",
+    "@fugood/node-llama-darwin-arm64": "1.2.5"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.24.4",

package/scripts/llama.cpp.patch

@@ -1,5 +1,27 @@
+diff --git a/src/llama.cpp/common/CMakeLists.txt b/src/llama.cpp/common/CMakeLists.txt
+index fe290bf8f..d377e29b9 100644
+--- a/src/llama.cpp/common/CMakeLists.txt
++++ b/src/llama.cpp/common/CMakeLists.txt
+@@ -170,9 +170,16 @@ if (LLAMA_LLGUIDANCE)
+     set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} llguidance ${LLGUIDANCE_PLATFORM_LIBS})
+ endif ()
+ 
++# Add Windows socket libraries unconditionally on Windows
++if (WIN32)
++    set(LLAMA_COMMON_WIN_LIBS ws2_32)
++else()
++    set(LLAMA_COMMON_WIN_LIBS "")
++endif()
++
+ target_include_directories(${TARGET} PUBLIC . ../vendor)
+ target_compile_features   (${TARGET} PUBLIC cxx_std_17)
+-target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama Threads::Threads)
++target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} ${LLAMA_COMMON_WIN_LIBS} PUBLIC llama Threads::Threads)
+ 
+ 
+ #
 diff --git a/src/llama.cpp/common/chat.cpp b/src/llama.cpp/common/chat.cpp
-index 111b4a21b..16ce87672 100644
+index 8587140e1..7931a31a1 100644
 --- a/src/llama.cpp/common/chat.cpp
 +++ b/src/llama.cpp/common/chat.cpp
 @@ -6,9 +6,6 @@
@@ -29,7 +51,7 @@ index 111b4a21b..16ce87672 100644
  struct templates_params {
      json messages;
      json tools;
-@@ -784,8 +771,7 @@ static std::string apply(
+@@ -807,8 +794,7 @@ static std::string apply(
      if (additional_context) {
          tmpl_inputs.extra_context.merge_patch(*additional_context);
      }
@@ -40,7 +62,7 @@ index 111b4a21b..16ce87672 100644
      minja::chat_template_options tmpl_opts;
      // To avoid double BOS / EOS tokens, we're manually removing begining / trailing tokens
 diff --git a/src/llama.cpp/common/chat.h b/src/llama.cpp/common/chat.h
-index d1e480c91..437e64e29 100644
+index f7b36ec71..c07429f08 100644
 --- a/src/llama.cpp/common/chat.h
 +++ b/src/llama.cpp/common/chat.h
 @@ -9,7 +9,18 @@
@@ -64,10 +86,10 @@ index d1e480c91..437e64e29 100644
  struct common_chat_tool_call {
      std::string name;
 diff --git a/src/llama.cpp/common/common.cpp b/src/llama.cpp/common/common.cpp
-index fdce1dcde..55aac3412 100644
+index b0591e84b..93759f884 100644
 --- a/src/llama.cpp/common/common.cpp
 +++ b/src/llama.cpp/common/common.cpp
-@@ -1103,6 +1103,7 @@ struct llama_model_params common_model_params_to_llama(common_params & params) {
+@@ -1126,6 +1126,7 @@ struct llama_model_params common_model_params_to_llama(common_params & params) {
          mparams.n_gpu_layers = params.n_gpu_layers;
      }
  
@@ -76,10 +98,10 @@ index fdce1dcde..55aac3412 100644
      mparams.split_mode      = params.split_mode;
      mparams.tensor_split    = params.tensor_split;
 diff --git a/src/llama.cpp/common/common.h b/src/llama.cpp/common/common.h
-index 390dda5e5..f259ca785 100644
+index 040a44ebd..37ad69173 100644
 --- a/src/llama.cpp/common/common.h
 +++ b/src/llama.cpp/common/common.h
-@@ -270,6 +270,7 @@ struct lr_opt {
+@@ -274,6 +274,7 @@ struct lr_opt {
  struct ggml_opt_optimizer_params common_opt_lr_pars(void * userdata);
  
  struct common_params {
@@ -88,7 +110,7 @@ index 390dda5e5..f259ca785 100644
      int32_t n_ctx                 =  4096; // context size
      int32_t n_batch               =  2048; // logical batch size for prompt processing (must be >=32 to use BLAS)
 diff --git a/src/llama.cpp/ggml/src/ggml-cpu/CMakeLists.txt b/src/llama.cpp/ggml/src/ggml-cpu/CMakeLists.txt
-index ce0a3e128..df9300224 100644
+index 42041b717..371752718 100644
 --- a/src/llama.cpp/ggml/src/ggml-cpu/CMakeLists.txt
 +++ b/src/llama.cpp/ggml/src/ggml-cpu/CMakeLists.txt
 @@ -106,7 +106,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
@@ -101,10 +123,10 @@ index ce0a3e128..df9300224 100644
              check_cxx_compiler_flag(-mfp16-format=ieee GGML_COMPILER_SUPPORTS_FP16_FORMAT_I3E)
              if (NOT "${GGML_COMPILER_SUPPORTS_FP16_FORMAT_I3E}" STREQUAL "")
 diff --git a/src/llama.cpp/ggml/src/ggml-vulkan/CMakeLists.txt b/src/llama.cpp/ggml/src/ggml-vulkan/CMakeLists.txt
-index b97e7bf99..c3eb9519f 100644
+index 83a83887b..8ae962b29 100644
 --- a/src/llama.cpp/ggml/src/ggml-vulkan/CMakeLists.txt
 +++ b/src/llama.cpp/ggml/src/ggml-vulkan/CMakeLists.txt
-@@ -111,7 +111,7 @@ if (Vulkan_FOUND)
+@@ -112,7 +112,7 @@ if (Vulkan_FOUND)
      endif()
  
      # Set up toolchain for host compilation whether cross-compiling or not
@@ -113,7 +135,7 @@ index b97e7bf99..c3eb9519f 100644
          if (GGML_VULKAN_SHADERS_GEN_TOOLCHAIN)
              set(HOST_CMAKE_TOOLCHAIN_FILE ${GGML_VULKAN_SHADERS_GEN_TOOLCHAIN})
          else()
-@@ -131,7 +131,7 @@ if (Vulkan_FOUND)
+@@ -132,7 +132,7 @@ if (Vulkan_FOUND)
  
      include(ExternalProject)
  

package/src/llama.cpp/CMakeLists.txt

@@ -92,6 +92,7 @@ option(LLAMA_TOOLS_INSTALL  "llama: install tools"        ${LLAMA_TOOLS_INSTALL_
 
 # 3rd party libs
 option(LLAMA_CURL       "llama: use libcurl to download model from an URL" ON)
+option(LLAMA_OPENSSL    "llama: use openssl to support HTTPS" OFF)
 option(LLAMA_LLGUIDANCE "llama-common: include LLGuidance library for structured output in common utils" OFF)
 
 # Required for relocatable CMake package

package/src/llama.cpp/common/CMakeLists.txt

@@ -56,6 +56,7 @@ add_library(${TARGET} STATIC
     common.h
     console.cpp
     console.h
+    http.h
     json-partial.cpp
     json-partial.h
     json-schema-to-grammar.cpp
@@ -87,7 +88,43 @@ if (LLAMA_CURL)
     target_compile_definitions(${TARGET} PUBLIC LLAMA_USE_CURL)
     include_directories(${CURL_INCLUDE_DIRS})
     set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} ${CURL_LIBRARIES})
-endif ()
+endif()
+
+if (LLAMA_OPENSSL)
+    find_package(OpenSSL)
+    if (OpenSSL_FOUND)
+        include(CheckCSourceCompiles)
+        set(SAVED_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
+        set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+        check_c_source_compiles("
+        #include <openssl/opensslv.h>
+        #if defined(OPENSSL_IS_BORINGSSL) || defined(LIBRESSL_VERSION_NUMBER)
+        #    if OPENSSL_VERSION_NUMBER < 0x1010107f
+        #        error bad version
+        #    endif
+        #else
+        #    if OPENSSL_VERSION_NUMBER < 0x30000000L
+        #        error bad version
+        #    endif
+        #endif
+        int main() { return 0; }
+        " OPENSSL_VERSION_SUPPORTED)
+        set(CMAKE_REQUIRED_INCLUDES ${SAVED_CMAKE_REQUIRED_INCLUDES})
+        if (OPENSSL_VERSION_SUPPORTED)
+            message(STATUS "OpenSSL found: ${OPENSSL_VERSION}")
+            target_compile_definitions(${TARGET} PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
+            target_link_libraries(${TARGET} PUBLIC OpenSSL::SSL OpenSSL::Crypto)
+            if (APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+                target_compile_definitions(${TARGET} PUBLIC CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)
+                find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation REQUIRED)
+                find_library(SECURITY_FRAMEWORK Security REQUIRED)
+                target_link_libraries(${TARGET} PUBLIC ${CORE_FOUNDATION_FRAMEWORK} ${SECURITY_FRAMEWORK})
+            endif()
+        endif()
+    else()
+        message(STATUS "OpenSSL not found, SSL support disabled")
+    endif()
+endif()
 
 if (LLAMA_LLGUIDANCE)
     include(ExternalProject)
@@ -133,9 +170,16 @@ if (LLAMA_LLGUIDANCE)
     set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} llguidance ${LLGUIDANCE_PLATFORM_LIBS})
 endif ()
 
+# Add Windows socket libraries unconditionally on Windows
+if (WIN32)
+    set(LLAMA_COMMON_WIN_LIBS ws2_32)
+else()
+    set(LLAMA_COMMON_WIN_LIBS "")
+endif()
+
 target_include_directories(${TARGET} PUBLIC . ../vendor)
 target_compile_features   (${TARGET} PUBLIC cxx_std_17)
-target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama Threads::Threads)
+target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} ${LLAMA_COMMON_WIN_LIBS} PUBLIC llama Threads::Threads)
 
 
 #