Skip to content
This repository has been archived by the owner on Jun 6, 2024. It is now read-only.

✨feature(base_url): user can define custom openai base url #433

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,37 @@ public OpenAiService(final String token) {
this(token, DEFAULT_TIMEOUT);
}

/**
* Creates a new OpenAiService that wraps OpenAiApi
*
* @param token OpenAi token string "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
* @param baseUrl OpenAi baseUrl, default is "https://api.openai.com/"
*/
public OpenAiService(final String token, String baseUrl) {
this(token, DEFAULT_TIMEOUT, baseUrl);
}

/**
* Creates a new OpenAiService that wraps OpenAiApi
*
* @param token OpenAi token string "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
* @param timeout http read timeout, Duration.ZERO means no timeout
*/
public OpenAiService(final String token, final Duration timeout) {
this(token, timeout, null);
}

/**
* Creates a new OpenAiService that wraps OpenAiApi
*
* @param token OpenAi token string "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
* @param timeout http read timeout, Duration.ZERO means no timeout
* @param baseUrl OpenAi baseUrl, default is "https://api.openai.com/"
*/
public OpenAiService(final String token, final Duration timeout, String baseUrl) {
ObjectMapper mapper = defaultObjectMapper();
OkHttpClient client = defaultClient(token, timeout);
Retrofit retrofit = defaultRetrofit(client, mapper);
Retrofit retrofit = defaultRetrofit(client, mapper, baseUrl);

this.api = retrofit.create(OpenAiApi.class);
this.executorService = client.dispatcher().executorService();
Expand Down Expand Up @@ -572,7 +593,7 @@ public void shutdownExecutor() {
public static OpenAiApi buildApi(String token, Duration timeout) {
ObjectMapper mapper = defaultObjectMapper();
OkHttpClient client = defaultClient(token, timeout);
Retrofit retrofit = defaultRetrofit(client, mapper);
Retrofit retrofit = defaultRetrofit(client, mapper, null);

return retrofit.create(OpenAiApi.class);
}
Expand All @@ -596,14 +617,18 @@ public static OkHttpClient defaultClient(String token, Duration timeout) {
.build();
}

public static Retrofit defaultRetrofit(OkHttpClient client, ObjectMapper mapper) {
public static Retrofit defaultRetrofit(OkHttpClient client, ObjectMapper mapper, String baseUrl) {
if (baseUrl == null || "".equals(baseUrl)) {
baseUrl = BASE_URL;
}
return new Retrofit.Builder()
.baseUrl(BASE_URL)
.baseUrl(baseUrl)
.client(client)
.addConverterFactory(JacksonConverterFactory.create(mapper))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
}


public Flowable<ChatMessageAccumulator> mapStreamToAccumulator(Flowable<ChatCompletionChunk> flowable) {
ChatFunctionCall functionCall = new ChatFunctionCall(null, null);
Expand Down