forked from Mirror/ollama4j
		
	Update APIs from ask to generate
				
					
				
			This commit is contained in:
		@@ -2,7 +2,7 @@
 | 
			
		||||
sidebar_position: 2
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
# Ask - Async
 | 
			
		||||
# Generate - Async
 | 
			
		||||
 | 
			
		||||
This API lets you ask questions to the LLMs in a asynchronous way.
 | 
			
		||||
These APIs correlate to
 | 
			
		||||
@@ -19,7 +19,7 @@ public class Main {
 | 
			
		||||
 | 
			
		||||
        String prompt = "Who are you?";
 | 
			
		||||
 | 
			
		||||
        OllamaAsyncResultCallback callback = ollamaAPI.askAsync(OllamaModelType.LLAMA2, prompt);
 | 
			
		||||
        OllamaAsyncResultCallback callback = ollamaAPI.generateAsync(OllamaModelType.LLAMA2, prompt);
 | 
			
		||||
 | 
			
		||||
        while (!callback.isComplete() || !callback.getStream().isEmpty()) {
 | 
			
		||||
            // poll for data from the response stream
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
sidebar_position: 3
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
# Ask - With Image Files
 | 
			
		||||
# Generate - With Image Files
 | 
			
		||||
 | 
			
		||||
This API lets you ask questions along with the image files to the LLMs.
 | 
			
		||||
These APIs correlate to
 | 
			
		||||
@@ -15,7 +15,7 @@ recommended.
 | 
			
		||||
 | 
			
		||||
:::
 | 
			
		||||
 | 
			
		||||
## Ask (Sync)
 | 
			
		||||
## Synchronous mode
 | 
			
		||||
 | 
			
		||||
If you have this image downloaded and you pass the path to the downloaded image to the following code:
 | 
			
		||||
 | 
			
		||||
@@ -29,7 +29,7 @@ public class Main {
 | 
			
		||||
        OllamaAPI ollamaAPI = new OllamaAPI(host);
 | 
			
		||||
        ollamaAPI.setRequestTimeoutSeconds(10);
 | 
			
		||||
 | 
			
		||||
        OllamaResult result = ollamaAPI.askWithImageFiles(OllamaModelType.LLAVA,
 | 
			
		||||
        OllamaResult result = ollamaAPI.generateWithImageFiles(OllamaModelType.LLAVA,
 | 
			
		||||
                "What's in this image?",
 | 
			
		||||
                List.of(
 | 
			
		||||
                        new File("/path/to/image")));
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
sidebar_position: 4
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
# Ask - With Image URLs
 | 
			
		||||
# Generate - With Image URLs
 | 
			
		||||
 | 
			
		||||
This API lets you ask questions along with the image files to the LLMs.
 | 
			
		||||
These APIs correlate to
 | 
			
		||||
@@ -29,7 +29,7 @@ public class Main {
 | 
			
		||||
        OllamaAPI ollamaAPI = new OllamaAPI(host);
 | 
			
		||||
        ollamaAPI.setRequestTimeoutSeconds(10);
 | 
			
		||||
 | 
			
		||||
        OllamaResult result = ollamaAPI.askWithImageURLs(OllamaModelType.LLAVA,
 | 
			
		||||
        OllamaResult result = ollamaAPI.generateWithImageURLs(OllamaModelType.LLAVA,
 | 
			
		||||
                "What's in this image?",
 | 
			
		||||
                List.of(
 | 
			
		||||
                        "https://t3.ftcdn.net/jpg/02/96/63/80/360_F_296638053_0gUVA4WVBKceGsIr7LNqRWSnkusi07dq.jpg"));
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
sidebar_position: 1
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
# Ask - Sync
 | 
			
		||||
# Generate - Sync
 | 
			
		||||
 | 
			
		||||
This API lets you ask questions to the LLMs in a synchronous way.
 | 
			
		||||
These APIs correlate to
 | 
			
		||||
@@ -25,7 +25,7 @@ public class Main {
 | 
			
		||||
        OllamaAPI ollamaAPI = new OllamaAPI(host);
 | 
			
		||||
 | 
			
		||||
        OllamaResult result =
 | 
			
		||||
                ollamaAPI.ask(OllamaModelType.LLAMA2, "Who are you?", new OptionsBuilder().build());
 | 
			
		||||
                ollamaAPI.generate(OllamaModelType.LLAMA2, "Who are you?", new OptionsBuilder().build());
 | 
			
		||||
 | 
			
		||||
        System.out.println(result.getResponse());
 | 
			
		||||
    }
 | 
			
		||||
@@ -55,7 +55,7 @@ public class Main {
 | 
			
		||||
        String prompt = "List all cricket world cup teams of 2019.";
 | 
			
		||||
 | 
			
		||||
        OllamaResult result =
 | 
			
		||||
                ollamaAPI.ask(OllamaModelType.LLAMA2, prompt, new OptionsBuilder().build());
 | 
			
		||||
                ollamaAPI.generate(OllamaModelType.LLAMA2, prompt, new OptionsBuilder().build());
 | 
			
		||||
 | 
			
		||||
        System.out.println(result.getResponse());
 | 
			
		||||
    }
 | 
			
		||||
@@ -97,7 +97,7 @@ public class Main {
 | 
			
		||||
                SamplePrompts.getSampleDatabasePromptWithQuestion(
 | 
			
		||||
                        "List all customer names who have bought one or more products");
 | 
			
		||||
        OllamaResult result =
 | 
			
		||||
                ollamaAPI.ask(OllamaModelType.SQLCODER, prompt, new OptionsBuilder().build());
 | 
			
		||||
                ollamaAPI.generate(OllamaModelType.SQLCODER, prompt, new OptionsBuilder().build());
 | 
			
		||||
        System.out.println(result.getResponse());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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.ask(model, promptBuilder.build());
 | 
			
		||||
        OllamaResult response = ollamaAPI.generate(model, promptBuilder.build());
 | 
			
		||||
        System.out.println(response.getResponse());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user