Merge pull request #13 from launchableinc/update-lib-versions

Update lib versions

Author: Konboi

api/src/main/java/com/launchableinc/openai/utils/TikTokensUtil.java

@@ -4,6 +4,7 @@
 import com.knuddels.jtokkit.api.Encoding;
 import com.knuddels.jtokkit.api.EncodingRegistry;
 import com.knuddels.jtokkit.api.EncodingType;
+import com.knuddels.jtokkit.api.IntArrayList;
 import com.knuddels.jtokkit.api.ModelType;
 import com.launchableinc.openai.completion.chat.ChatMessage;
 import lombok.AllArgsConstructor;
@@ -46,7 +47,7 @@ public class TikTokensUtil {
 	 * @return Encoding array
 	 */
 	public static List<Integer> encode(Encoding enc, String text) {
-		return isBlank(text) ? new ArrayList<>() : enc.encode(text);
+		return isBlank(text) ? new ArrayList<>() : enc.encode(text).boxed();
 	}
 
 	/**
@@ -69,7 +70,7 @@ public static int tokens(Encoding enc, String text) {
 	 * @return Text information corresponding to the encoding array.
 	 */
 	public static String decode(Encoding enc, List<Integer> encoded) {
-		return enc.decode(encoded);
+		return enc.decode(toIntArrayList(encoded));
 	}
 
 	/**
@@ -94,7 +95,7 @@ public static List<Integer> encode(EncodingType encodingType, String text) {
 			return new ArrayList<>();
 		}
 		Encoding enc = getEncoding(encodingType);
-		List<Integer> encoded = enc.encode(text);
+		List<Integer> encoded = enc.encode(text).boxed();
 		return encoded;
 	}
 
@@ -119,7 +120,7 @@ public static int tokens(EncodingType encodingType, String text) {
 	 */
 	public static String decode(EncodingType encodingType, List<Integer> encoded) {
 		Encoding enc = getEncoding(encodingType);
-		return enc.decode(encoded);
+		return enc.decode(toIntArrayList(encoded));
 	}
 
 
@@ -147,7 +148,7 @@ public static List<Integer> encode(String modelName, String text) {
 		if (Objects.isNull(enc)) {
 			return new ArrayList<>();
 		}
-		List<Integer> encoded = enc.encode(text);
+		List<Integer> encoded = enc.encode(text).boxed();
 		return encoded;
 	}
 
@@ -209,7 +210,16 @@ public static int tokens(String modelName, List<ChatMessage> messages) {
 	 */
 	public static String decode(String modelName, List<Integer> encoded) {
 		Encoding enc = getEncoding(modelName);
-		return enc.decode(encoded);
+		return enc.decode(toIntArrayList(encoded));
+	}
+
+	private static IntArrayList toIntArrayList(List<Integer> encoded) {
+		IntArrayList intArrayList = new IntArrayList(encoded.size());
+		for (Integer e : encoded) {
+			intArrayList.add(e);
+		}
+
+		return intArrayList;
 	}
 
 

gradle/libs.versions.toml

@@ -12,4 +12,4 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit
 retrofitJackson = { module = "com.squareup.retrofit2:converter-jackson", version.ref = "retrofit" }
 retrofitRxJava2 = { module = "com.squareup.retrofit2:adapter-rxjava2", version.ref = "retrofit" }
 retrofitMock = { module = "com.squareup.retrofit2:retrofit-mock", version.ref = "retrofit" }
-jtokkit = { module = "com.knuddels:jtokkit", version = "0.6.1" }
+jtokkit = { module = "com.knuddels:jtokkit", version = "1.1.0" }

service/src/test/java/com/launchableinc/openai/service/ChatCompletionTest.java

@@ -101,6 +101,27 @@ void createChatCompletion_with_json_mode() {
 		assertTrue(isValidJson(choices.getMessage().getContent()));
 	}
 
+	@Test
+	void createChatCompletion_with_gpt4o() {
+		final List<ChatMessage> messages = new ArrayList<>();
+		final ChatMessage systemMessage = new ChatMessage(ChatMessageRole.SYSTEM.value(),
+				"You are a cat and will speak as such.");
+		messages.add(systemMessage);
+
+		ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest
+				.builder()
+				.model("gpt-4o")
+				.messages(messages)
+				.n(5)
+				.maxTokens(50)
+				.logitBias(new HashMap<>())
+				.build();
+
+		List<ChatCompletionChoice> choices = service.createChatCompletion(chatCompletionRequest)
+				.getChoices();
+		assertEquals(5, choices.size());
+	}
+
 	private boolean isValidJson(String jsonString) {
 		ObjectMapper objectMapper = new ObjectMapper();
 		try {