seeseemelk/ollama4j
1
0
Fork 0
forked from Mirror/ollama4j
Code Issues Pull Requests Actions Packages Releases 1 Activity

method introduced to get request builder default settings

Browse Source
This commit is contained in:
Michael Wechner 2023-12-27 08:42:45 +01:00
parent 9d336e257c
commit 7481c2ba0e
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/io/github/amithkoujalgi/ollama4j/core/OllamaAPI.java
View File

@ -316,17 +316,13 @@ public class OllamaAPI {
*/ */
public List<Double> generateEmbeddings(String model, String prompt) public List<Double> generateEmbeddings(String model, String prompt)
throws IOException, InterruptedException, OllamaBaseException { throws IOException, InterruptedException, OllamaBaseException {
String url = this.host + "/api/embeddings"; URI uri = URI.create(this.host + "/api/embeddings");
String jsonData = new ModelEmbeddingsRequest(model, prompt).toString(); String jsonData = new ModelEmbeddingsRequest(model, prompt).toString();
HttpClient httpClient = HttpClient.newHttpClient(); HttpClient httpClient = HttpClient.newHttpClient();
HttpRequest request = HttpRequest.Builder requestBuilder = getRequestBuilderDefault(uri)
HttpRequest.newBuilder()
.uri(URI.create(url))
.header("Accept", "application/json") .header("Accept", "application/json")
.header("Content-type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(jsonData));
.timeout(Duration.ofSeconds(requestTimeoutSeconds)) HttpRequest request = requestBuilder.build();
.POST(HttpRequest.BodyPublishers.ofString(jsonData))
.build();
HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
int statusCode = response.statusCode(); int statusCode = response.statusCode();
String responseBody = response.body(); String responseBody = response.body();
@ -436,16 +432,10 @@ public class OllamaAPI {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
HttpClient httpClient = HttpClient.newHttpClient(); HttpClient httpClient = HttpClient.newHttpClient();
URI uri = URI.create(this.host + "/api/generate"); URI uri = URI.create(this.host + "/api/generate");
HttpRequest.Builder requestBuilder = HttpRequest.Builder requestBuilder = getRequestBuilderDefault(uri)
HttpRequest.newBuilder(uri)
.POST( .POST(
HttpRequest.BodyPublishers.ofString( HttpRequest.BodyPublishers.ofString(
Utils.getObjectMapper().writeValueAsString(ollamaRequestModel))) Utils.getObjectMapper().writeValueAsString(ollamaRequestModel)));
.header("Content-Type", "application/json")
.timeout(Duration.ofSeconds(requestTimeoutSeconds));
if (basicAuthCredentialsSet()) {
requestBuilder.header("Authorization", getBasicAuthHeaderValue());
}
HttpRequest request = requestBuilder.build(); HttpRequest request = requestBuilder.build();
logger.debug("Ask model '" + ollamaRequestModel + "' ..."); logger.debug("Ask model '" + ollamaRequestModel + "' ...");
HttpResponse<InputStream> response = HttpResponse<InputStream> response =
@ -485,6 +475,20 @@ public class OllamaAPI {
} }
} }
/**
*
*/
private HttpRequest.Builder getRequestBuilderDefault(URI uri) {
HttpRequest.Builder requestBuilder =
HttpRequest.newBuilder(uri)
.header("Content-Type", "application/json")
.timeout(Duration.ofSeconds(requestTimeoutSeconds));
if (basicAuthCredentialsSet()) {
requestBuilder.header("Authorization", getBasicAuthHeaderValue());
}
return requestBuilder;
}
/** /**
* @return basic authentication header value (encoded credentials) * @return basic authentication header value (encoded credentials)
*/ */