Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ollama add OkhttpClient inject #911

Merged
merged 5 commits into from
May 7, 2024
Merged

Ollama add OkhttpClient inject #911

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96a14ce
add OkhttpClient inject
Martin7-1 Apr 9, 2024
77fede7
Merge branch 'main' into ollama-customize-httpclient
langchain4j May 6, 2024
14a7fe0
Merge branch 'main' into ollama-customize-httpclient
Martin7-1 May 7, 2024
1522c64
refactor header injection with OkHttp Inteceptor
Martin7-1 May 7, 2024
5c6efae
remove duplicate re-define and use copy of map
Martin7-1 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion langchain4j-ollama/src/main/java/dev/langchain4j/model/ollama/OllamaChatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import java.time.Duration;
import java.util.List;
import java.util.Map;

import static dev.langchain4j.internal.RetryUtils.withRetry;
import static dev.langchain4j.internal.Utils.getOrDefault;
Expand Down Expand Up @@ -45,10 +46,12 @@ public OllamaChatModel(String baseUrl,
List<String> stop,
String format,
Duration timeout,
Integer maxRetries) {
Integer maxRetries,
Map<String, String> customHeaders) {
this.client = OllamaClient.builder()
.baseUrl(baseUrl)
.timeout(getOrDefault(timeout, ofSeconds(60)))
.customHeaders(customHeaders)
.build();
this.modelName = ensureNotBlank(modelName, "modelName");
this.options = Options.builder()
Expand Down
36 changes: 31 additions & 5 deletions langchain4j-ollama/src/main/java/dev/langchain4j/model/ollama/OllamaClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
import dev.langchain4j.model.output.Response;
import dev.langchain4j.model.output.TokenUsage;
import lombok.Builder;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.ResponseBody;
import org.jetbrains.annotations.NotNull;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Retrofit;
Expand All @@ -19,6 +22,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.time.Duration;
import java.util.Map;

import static com.google.gson.FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES;
import static java.lang.Boolean.TRUE;
Expand All @@ -32,14 +36,19 @@ class OllamaClient {
private final OllamaApi ollamaApi;

@Builder
public OllamaClient(String baseUrl, Duration timeout) {

OkHttpClient okHttpClient = new OkHttpClient.Builder()
public OllamaClient(String baseUrl,
Duration timeout,
Map<String, String> customHeaders) {
OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder()
.callTimeout(timeout)
.connectTimeout(timeout)
.readTimeout(timeout)
.writeTimeout(timeout)
.build();
.writeTimeout(timeout);
// add custom header interceptor
if (customHeaders != null && !customHeaders.isEmpty()) {
okHttpClientBuilder.addInterceptor(headerInterceptor(customHeaders));
}
OkHttpClient okHttpClient = okHttpClientBuilder.build();

Retrofit retrofit = new Retrofit.Builder()
.baseUrl(baseUrl)
Expand Down Expand Up @@ -200,6 +209,23 @@ public OllamaModelCard showInformation(ShowModelInformationRequest showInformati
}
}

private Interceptor headerInterceptor(Map<String, String> customHeaders) {
return new Interceptor() {
Martin7-1 marked this conversation as resolved.
Show resolved Hide resolved
@NotNull
@Override
public okhttp3.Response intercept(@NotNull Chain chain) throws IOException {
Request original = chain.request();
Request.Builder requestBuilder = original.newBuilder()
.method(original.method(), original.body());
Martin7-1 marked this conversation as resolved.
Show resolved Hide resolved
for (Map.Entry<String, String> header : customHeaders.entrySet()) {
requestBuilder.addHeader(header.getKey(), header.getValue());
}

return chain.proceed(requestBuilder.build());
}
};
}

private RuntimeException toException(retrofit2.Response<?> response) throws IOException {
int code = response.code();
String body = response.errorBody().string();
Expand Down
5 changes: 4 additions & 1 deletion langchain4j-ollama/src/main/java/dev/langchain4j/model/ollama/OllamaEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import static dev.langchain4j.internal.RetryUtils.withRetry;
import static dev.langchain4j.internal.Utils.getOrDefault;
Expand All @@ -30,10 +31,12 @@ public class OllamaEmbeddingModel implements EmbeddingModel {
public OllamaEmbeddingModel(String baseUrl,
String modelName,
Duration timeout,
Integer maxRetries) {
Integer maxRetries,
Map<String, String> customHeaders) {
this.client = OllamaClient.builder()
.baseUrl(baseUrl)
.timeout(getOrDefault(timeout, ofSeconds(60)))
.customHeaders(customHeaders)
.build();
this.modelName = ensureNotBlank(modelName, "modelName");
this.maxRetries = getOrDefault(maxRetries, 3);
Expand Down
5 changes: 4 additions & 1 deletion langchain4j-ollama/src/main/java/dev/langchain4j/model/ollama/OllamaLanguageModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import java.time.Duration;
import java.util.List;
import java.util.Map;

import static dev.langchain4j.internal.RetryUtils.withRetry;
import static dev.langchain4j.internal.Utils.getOrDefault;
Expand Down Expand Up @@ -41,10 +42,12 @@ public OllamaLanguageModel(String baseUrl,
List<String> stop,
String format,
Duration timeout,
Integer maxRetries) {
Integer maxRetries,
Map<String, String> customHeaders) {
this.client = OllamaClient.builder()
.baseUrl(baseUrl)
.timeout(getOrDefault(timeout, ofSeconds(60)))
.customHeaders(customHeaders)
.build();
this.modelName = ensureNotBlank(modelName, "modelName");
this.options = Options.builder()
Expand Down
5 changes: 4 additions & 1 deletion langchain4j-ollama/src/main/java/dev/langchain4j/model/ollama/OllamaStreamingChatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import java.time.Duration;
import java.util.List;
import java.util.Map;

import static dev.langchain4j.internal.Utils.getOrDefault;
import static dev.langchain4j.internal.ValidationUtils.ensureNotBlank;
Expand Down Expand Up @@ -41,10 +42,12 @@ public OllamaStreamingChatModel(String baseUrl,
Integer numCtx,
List<String> stop,
String format,
Duration timeout) {
Duration timeout,
Map<String, String> customHeaders) {
this.client = OllamaClient.builder()
.baseUrl(baseUrl)
.timeout(getOrDefault(timeout, ofSeconds(60)))
.customHeaders(customHeaders)
.build();
this.modelName = ensureNotBlank(modelName, "modelName");
this.options = Options.builder()
Expand Down
5 changes: 4 additions & 1 deletion ...ain4j-ollama/src/main/java/dev/langchain4j/model/ollama/OllamaStreamingLanguageModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import java.time.Duration;
import java.util.List;
import java.util.Map;

import static dev.langchain4j.internal.Utils.getOrDefault;
import static dev.langchain4j.internal.ValidationUtils.ensureNotBlank;
Expand Down Expand Up @@ -37,10 +38,12 @@ public OllamaStreamingLanguageModel(String baseUrl,
Integer numCtx,
List<String> stop,
String format,
Duration timeout) {
Duration timeout,
Map<String, String> customHeaders) {
this.client = OllamaClient.builder()
.baseUrl(baseUrl)
.timeout(getOrDefault(timeout, ofSeconds(60)))
.customHeaders(customHeaders)
.build();
this.modelName = ensureNotBlank(modelName, "modelName");
this.options = Options.builder()
Expand Down