mirror of
				https://github.com/amithkoujalgi/ollama4j.git
				synced 2025-10-29 07:30:41 +01:00 
			
		
		
		
	Compare commits
	
		
			22 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 78a5eedc8f | ||
|   | 364f961ee2 | ||
|   | b21aa6add2 | ||
|   | ec4abd1c2d | ||
|   | 9900ae92fb | ||
|   | fa20daf6e5 | ||
|   | 44949c0559 | ||
|   | e88711a017 | ||
|   | 32169ded18 | ||
|   | 4b2d566fd9 | ||
|   | fb4b7a7ce5 | ||
|   | 18f27775b0 | ||
|   | cb462ad05a | ||
|   | 1eec22ca1a | ||
|   | c1f3c51f88 | ||
|   | 7dd556293f | ||
|   | ee50131ce4 | ||
|   | 2cd47dbfaa | ||
|   | e5296c1067 | ||
|   | 0f00f05e3d | ||
|   | 976a3b82e5 | ||
|   | ba26d620c4 | 
							
								
								
									
										20
									
								
								.github/workflows/maven-publish.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								.github/workflows/maven-publish.yml
									
									
									
									
										vendored
									
									
								
							| @@ -12,23 +12,12 @@ on: | ||||
|     branches: [ "main" ] | ||||
|   workflow_dispatch: | ||||
|  | ||||
|  | ||||
| permissions: | ||||
|   contents: read | ||||
|   id-token: write | ||||
|   packages: write | ||||
|  | ||||
| jobs: | ||||
|   build: | ||||
|  | ||||
|     runs-on: ubuntu-latest | ||||
|  | ||||
|     permissions: | ||||
|       contents: write | ||||
|       packages: write | ||||
|       pull-requests: write | ||||
|       repository-projects: write | ||||
|  | ||||
|     steps: | ||||
|       - uses: actions/checkout@v3 | ||||
|       - name: Set up JDK 11 | ||||
| @@ -76,11 +65,4 @@ jobs: | ||||
|         env: | ||||
|           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} | ||||
|           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} | ||||
|           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} | ||||
|  | ||||
|       - name: Release Assets | ||||
|         uses: softprops/action-gh-release@v1 | ||||
|         env: | ||||
|           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||
|         with: | ||||
|           files: target/*.jar | ||||
|           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} | ||||
| @@ -42,7 +42,7 @@ public class AskPhi { | ||||
|                         .addSeparator() | ||||
|                         .add("How do I read a file in Go and print its contents to stdout?"); | ||||
|  | ||||
|         OllamaResult response = ollamaAPI.generate(model, promptBuilder.build()); | ||||
|         OllamaResult response = ollamaAPI.generate(model, promptBuilder.build(), new OptionsBuilder().build()); | ||||
|         System.out.println(response.getResponse()); | ||||
|     } | ||||
| } | ||||
|   | ||||
							
								
								
									
										4
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -4,7 +4,7 @@ | ||||
|  | ||||
|     <groupId>io.github.amithkoujalgi</groupId> | ||||
|     <artifactId>ollama4j</artifactId> | ||||
|     <version>1.0.59</version> | ||||
|     <version>1.0.64</version> | ||||
|  | ||||
|     <name>Ollama4j</name> | ||||
|     <description>Java library for interacting with Ollama API.</description> | ||||
| @@ -39,7 +39,7 @@ | ||||
|         <connection>scm:git:git@github.com:amithkoujalgi/ollama4j.git</connection> | ||||
|         <developerConnection>scm:git:https://github.com/amithkoujalgi/ollama4j.git</developerConnection> | ||||
|         <url>https://github.com/amithkoujalgi/ollama4j</url> | ||||
|         <tag>v1.0.59</tag> | ||||
|         <tag>v1.0.64</tag> | ||||
|     </scm> | ||||
|  | ||||
|     <build> | ||||
|   | ||||
| @@ -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 | ||||
| @@ -71,4 +86,28 @@ 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); | ||||
|     } | ||||
|  | ||||
|     @Test | ||||
|     public void testWithStreaming() { | ||||
|         OllamaChatRequestModel req = builder.withStreaming().build(); | ||||
|         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); | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user