Merge pull request #5 from bernardladenthin/claude/add-getmetadata-method-xVaJm

Claude/add getmetadata method x va jm

Author: bernardladenthin

.gitignore

@@ -1,6 +1,7 @@
 .idea
 target
 build
+build-android
 cmake-build-*
 .DS_Store
 .directory

CMakeLists.txt

@@ -33,27 +33,35 @@ FetchContent_MakeAvailable(llama.cpp)
 
 # find which OS we build for if not set (make sure to run mvn compile first)
 if(NOT DEFINED OS_NAME)
-    find_package(Java REQUIRED)
-    find_program(JAVA_EXECUTABLE NAMES java)
-	execute_process(
-      COMMAND ${JAVA_EXECUTABLE} -cp ${CMAKE_SOURCE_DIR}/target/classes de.kherud.llama.OSInfo --os
-      OUTPUT_VARIABLE OS_NAME
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+    if(ANDROID_ABI)
+        set(OS_NAME "Android")
+    else()
+        find_package(Java REQUIRED)
+        find_program(JAVA_EXECUTABLE NAMES java)
+        execute_process(
+            COMMAND ${JAVA_EXECUTABLE} -cp ${CMAKE_SOURCE_DIR}/target/classes de.kherud.llama.OSInfo --os
+            OUTPUT_VARIABLE OS_NAME
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    endif()
 endif()
 if(NOT OS_NAME)
     message(FATAL_ERROR "Could not determine OS name")
 endif()
 
 # find which architecture we build for if not set  (make sure to run mvn compile first)
 if(NOT DEFINED OS_ARCH)
-    find_package(Java REQUIRED)
-    find_program(JAVA_EXECUTABLE NAMES java)
-    execute_process(
-      COMMAND ${JAVA_EXECUTABLE} -cp ${CMAKE_SOURCE_DIR}/target/classes de.kherud.llama.OSInfo --arch
-      OUTPUT_VARIABLE OS_ARCH
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
+    if(ANDROID_ABI)
+        set(OS_ARCH ${ANDROID_ABI})
+    else()
+        find_package(Java REQUIRED)
+        find_program(JAVA_EXECUTABLE NAMES java)
+        execute_process(
+            COMMAND ${JAVA_EXECUTABLE} -cp ${CMAKE_SOURCE_DIR}/target/classes de.kherud.llama.OSInfo --arch
+            OUTPUT_VARIABLE OS_ARCH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    endif()
 endif()
 if(NOT OS_ARCH)
     message(FATAL_ERROR "Could not determine CPU architecture")
@@ -89,7 +97,12 @@ if(NOT DEFINED JNI_INCLUDE_DIRS)
     endif()
 endif()
 if(NOT JNI_INCLUDE_DIRS)
-    message(FATAL_ERROR "Could not determine JNI include directories")
+    if(ANDROID_ABI)
+        find_package(JNI REQUIRED)
+        set(JNI_INCLUDE_DIRS ${JNI_INCLUDE_DIRS})
+    else()
+        message(FATAL_ERROR "Could not determine JNI include directories")
+    endif()
 endif()
 
 add_library(jllama SHARED src/main/cpp/jllama.cpp src/main/cpp/server.hpp src/main/cpp/utils.hpp)

README.md

@@ -19,6 +19,10 @@ Inference of Meta's LLaMA model (and others) in pure C/C++.
 > [!NOTE]
 > Now with support for Gemma 3
 
+## Download
+
+[![](https://img.shields.io/badge/download-class.jar-blue)](dist/llama-4.2.0.jar)
+
 ## Quick Start
 
 Access this library via Maven:

src/main/java/de/kherud/llama/InferenceParameters.java

@@ -48,6 +48,7 @@ public final class InferenceParameters extends JsonParameters {
 	private static final String PARAM_SAMPLERS = "samplers";
 	private static final String PARAM_STREAM = "stream";
 	private static final String PARAM_USE_CHAT_TEMPLATE = "use_chat_template";
+	private static final String PARAM_CHAT_TEMPLATE = "chat_template";
 	private static final String PARAM_USE_JINJA = "use_jinja";
 	private static final String PARAM_MESSAGES = "messages";
 
@@ -490,7 +491,12 @@ public InferenceParameters setUseChatTemplate(boolean useChatTemplate) {
 		parameters.put(PARAM_USE_JINJA, String.valueOf(useChatTemplate));
 		return this;
 	}
-	
+
+	public InferenceParameters setChatTemplate(String chatTemplate) {
+		parameters.put(PARAM_CHAT_TEMPLATE, toJsonString(chatTemplate));
+		return this;
+	}
+
 	/**
      * Set the messages for chat-based inference.
      * - Allows **only one** system message.

src/main/java/de/kherud/llama/ModelParameters.java

@@ -959,6 +959,10 @@ public ModelParameters enableJinja() {
         return this;
     }
 
+    public boolean isDefault(String key) {
+        return !parameters.containsKey("--" + key);
+    }
+
 }
 
 

src/main/java/de/kherud/llama/OSInfo.java

@@ -175,7 +175,7 @@ static String resolveArmArchType() {
 			if (isAndroid()) {
 				if (armType.startsWith("aarch64")) {
 					// Use arm64
-					return "aarch64";
+					return "arm64-v8a";
 				}
 				else {
 					return "arm";

src/test/java/examples/ChatExample.java

@@ -0,0 +1,47 @@
+package examples;
+
+import de.kherud.llama.InferenceParameters;
+import de.kherud.llama.LlamaModel;
+import de.kherud.llama.LlamaOutput;
+import de.kherud.llama.ModelParameters;
+import de.kherud.llama.Pair;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Ignore;
+
+// Model file (models/codellama-7b.Q2_K.gguf) is not available in the models directory
+@Ignore
+public class ChatExample {
+
+    public static void main(String... args) throws Exception {
+        ModelParameters modelParams = new ModelParameters()
+                .setModel("models/codellama-7b.Q2_K.gguf")
+                .setGpuLayers(43);
+        try (LlamaModel model = new LlamaModel(modelParams)) {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
+            List<Pair<String, String>> messages = new ArrayList<>();
+            String system = "You are a helpful assistant.";
+            while (true) {
+                System.out.print("User: ");
+                String input = reader.readLine();
+                messages.add(new Pair<>("user", input));
+                StringBuilder response = new StringBuilder();
+                InferenceParameters inferParams = new InferenceParameters("")
+                        .setMessages(system, messages)
+                        .setUseChatTemplate(true);
+                System.out.print("Assistant: ");
+                for (LlamaOutput output : model.generate(inferParams)) {
+                    System.out.print(output);
+                    response.append(output);
+                }
+                System.out.println();
+                messages.add(new Pair<>("assistant", response.toString()));
+            }
+        }
+    }
+}