Java 1.8 support

README.md

@@ -1,4 +1,4 @@
-![Java 11+](https://img.shields.io/badge/Java-11%2B-informational)
+![Java 1.8+](https://img.shields.io/badge/Java-1.8%2B-informational)
 ![llama.cpp b3534](https://img.shields.io/badge/llama.cpp-%23b3534-informational)
 
 # Java Bindings for [llama.cpp](https://github.com/ggerganov/llama.cpp)

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>de.kherud</groupId>
 	<artifactId>llama</artifactId>
-	<version>3.3.0</version>
+	<version>3.3.1</version>
 	<packaging>jar</packaging>
 
 	<name>${project.groupId}:${project.artifactId}</name>
@@ -56,12 +56,6 @@
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jetbrains</groupId>
-			<artifactId>annotations</artifactId>
-			<version>24.1.0</version>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -1,14 +1,11 @@
 package de.kherud.llama;
 
-import org.jetbrains.annotations.NotNull;
-
 /**
  * An iterable used by {@link LlamaModel#generate(InferenceParameters)} that specifically returns a {@link LlamaIterator}.
  */
 @FunctionalInterface
 public interface LlamaIterable extends Iterable<LlamaOutput> {
 
-    @NotNull
     @Override
     LlamaIterator iterator();
 

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

@@ -28,8 +28,6 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.jetbrains.annotations.Nullable;
-
 /**
  * Set the system properties, de.kherud.llama.lib.path, de.kherud.llama.lib.name, appropriately so that the
  * library can find *.dll, *.dylib and *.so files, according to the current OS (win, linux, mac).
@@ -182,7 +180,6 @@ private static boolean loadNativeLibrary(Path path) {
 		}
 	}
 
-	@Nullable
 	private static Path extractFile(String sourceDirectory, String fileName, String targetDirectory, boolean addUuid) {
 		String nativeLibraryFilePath = sourceDirectory + "/" + fileName;
 

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

@@ -1,7 +1,6 @@
 package de.kherud.llama;
 
 import de.kherud.llama.args.LogFormat;
-import org.jetbrains.annotations.Nullable;
 
 import java.lang.annotation.Native;
 import java.nio.charset.StandardCharsets;
@@ -106,9 +105,9 @@ public String decode(int[] tokens) {
 	 * To disable logging, pass an empty callback, i.e., <code>(level, msg) -> {}</code>.
 	 *
 	 * @param format the log format to use
-	 * @param callback a method to call for log messages
+	 * @param callback a method to call for log messages (can be set to null)
 	 */
-	public static native void setLogger(LogFormat format, @Nullable BiConsumer<LogLevel, String> callback);
+	public static native void setLogger(LogFormat format, BiConsumer<LogLevel, String> callback);
 
 	@Override
 	public void close() {

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

@@ -1,7 +1,5 @@
 package de.kherud.llama;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
@@ -13,20 +11,19 @@ public final class LlamaOutput {
 
     /**
      * The last bit of generated text that is representable as text (i.e., cannot be individual utf-8 multibyte code
-     * points).
+     * points). Not null.
      */
-    @NotNull
     public final String text;
 
     /**
-     * Note, that you have to configure {@link InferenceParameters#setNProbs(int)} in order for probabilities to be returned.
+     * Note, that you have to configure {@link InferenceParameters#setNProbs(int)} in order for probabilities to be
+     * returned. Not null.
      */
-    @NotNull
     public final Map<String, Float> probabilities;
 
     final boolean stop;
 
-    LlamaOutput(byte[] generated, @NotNull Map<String, Float> probabilities, boolean stop) {
+    LlamaOutput(byte[] generated, Map<String, Float> probabilities, boolean stop) {
         this.text = new String(generated, StandardCharsets.UTF_8);
         this.probabilities = probabilities;
         this.stop = stop;

src/test/java/de/kherud/llama/LlamaModelTest.java

@@ -88,7 +88,7 @@ public void testGenerateGrammar() {
 		}
 		String output = sb.toString();
 
-		Assert.assertTrue(output.matches("[ab]+"));
+		Assert.assertTrue("'" + output + "' doesn't match [ab]+", output.matches("[ab]+"));
 		int generated = model.encode(output).length;
 		Assert.assertTrue(generated > 0 && generated <= nPredict + 1);
 	}
@@ -131,7 +131,7 @@ public void testCompleteGrammar() {
 				.setGrammar("root ::= (\"a\" | \"b\")+")
 				.setNPredict(nPredict);
 		String output = model.complete(params);
-		Assert.assertTrue(output + " doesn't match [ab]+", output.matches("[ab]+"));
+		Assert.assertTrue("'" + output + "' doesn't match [ab]+", output.matches("[ab]+"));
 		int generated = model.encode(output).length;
 		Assert.assertTrue(generated > 0 && generated <= nPredict + 1);
 	}