From fa20daf6e540e8a40bdea4160d28e757f21d6f3a Mon Sep 17 00:00:00 2001 From: anjeongkyun Date: Sun, 21 Apr 2024 23:37:18 +0900 Subject: [PATCH 1/4] Adds test case of testRequestWithOptions --- .../jackson/TestChatRequestSerialization.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java index c5a7060..f6237cc 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java +++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java @@ -51,12 +51,27 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe public void testRequestWithOptions() { OptionsBuilder b = new OptionsBuilder(); OllamaChatRequestModel req = builder.withMessage(OllamaChatMessageRole.USER, "Some prompt") - .withOptions(b.setMirostat(1).build()).build(); + .withOptions(b.setMirostat(1).build()) + .withOptions(b.setTemperature(1L).build()) + .withOptions(b.setMirostatEta(1L).build()) + .withOptions(b.setMirostatTau(1L).build()) + .withOptions(b.setNumGpu(1).build()) + .withOptions(b.setSeed(1).build()) + .withOptions(b.setTopK(1).build()) + .withOptions(b.setTopP(1).build()) + .build(); String jsonRequest = serializeRequest(req); - OllamaChatRequestModel deserializeRequest = deserializeRequest(jsonRequest,OllamaChatRequestModel.class); + OllamaChatRequestModel deserializeRequest = deserializeRequest(jsonRequest, OllamaChatRequestModel.class); assertEqualsAfterUnmarshalling(deserializeRequest, req); assertEquals(1, deserializeRequest.getOptions().get("mirostat")); + assertEquals(1.0, deserializeRequest.getOptions().get("temperature")); + assertEquals(1.0, deserializeRequest.getOptions().get("mirostat_eta")); + assertEquals(1.0, deserializeRequest.getOptions().get("mirostat_tau")); + assertEquals(1, deserializeRequest.getOptions().get("num_gpu")); + assertEquals(1, deserializeRequest.getOptions().get("seed")); + assertEquals(1, deserializeRequest.getOptions().get("top_k")); + assertEquals(1.0, deserializeRequest.getOptions().get("top_p")); } @Test From 9900ae92fb44039a394e5c263b2baf44781dce11 Mon Sep 17 00:00:00 2001 From: anjeongkyun Date: Sun, 21 Apr 2024 23:43:49 +0900 Subject: [PATCH 2/4] Adds test of testWithTemplate --- .../unittests/jackson/TestChatRequestSerialization.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java index f6237cc..a83376d 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java +++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java @@ -86,4 +86,12 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe String requestFormatProperty = jsonObject.getString("format"); assertEquals("json", requestFormatProperty); } + + @Test + public void testWithTemplate() { + OllamaChatRequestModel req = builder.withTemplate("System Template") + .build(); + String jsonRequest = serializeRequest(req); + assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest, OllamaChatRequestModel.class), req); + } } From ec4abd1c2d805d366600ea80178e367bb7c472a6 Mon Sep 17 00:00:00 2001 From: anjeongkyun Date: Sun, 21 Apr 2024 23:49:42 +0900 Subject: [PATCH 3/4] Adds test of testWithStreaming --- .../unittests/jackson/TestChatRequestSerialization.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java index a83376d..c901c54 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java +++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java @@ -94,4 +94,11 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe String jsonRequest = serializeRequest(req); assertEqualsAfterUnmarshalling(deserializeRequest(jsonRequest, OllamaChatRequestModel.class), req); } + + @Test + public void testWithStreaming() { + OllamaChatRequestModel req = builder.withStreaming().build(); + String jsonRequest = serializeRequest(req); + assertEquals(deserializeRequest(jsonRequest, OllamaChatRequestModel.class).isStream(), true); + } } From b21aa6add2d19d530f15b9968c9568fd87588c25 Mon Sep 17 00:00:00 2001 From: anjeongkyun Date: Sun, 21 Apr 2024 23:52:42 +0900 Subject: [PATCH 4/4] Adds test of testWithKeepAlive --- .../unittests/jackson/TestChatRequestSerialization.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java index c901c54..e4655bf 100644 --- a/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java +++ b/src/test/java/io/github/amithkoujalgi/ollama4j/unittests/jackson/TestChatRequestSerialization.java @@ -101,4 +101,13 @@ public class TestChatRequestSerialization extends AbstractRequestSerializationTe String jsonRequest = serializeRequest(req); assertEquals(deserializeRequest(jsonRequest, OllamaChatRequestModel.class).isStream(), true); } + + @Test + public void testWithKeepAlive() { + String expectedKeepAlive = "5m"; + OllamaChatRequestModel req = builder.withKeepAlive(expectedKeepAlive) + .build(); + String jsonRequest = serializeRequest(req); + assertEquals(deserializeRequest(jsonRequest, OllamaChatRequestModel.class).getKeepAlive(), expectedKeepAlive); + } }