Supports custom OkHttpClient (#9)

Author: qianmoQ

.github/workflows/checker.yml

@@ -70,7 +70,7 @@ jobs:
             17
           distribution: 'temurin'
       - run: chmod 755 ./mvnw
-      - run: ./mvnw clean install test -Dfindbugs.skip -Dcheckstyle.skip -Dgpg.skip -Dskip.yarn -Dopenai.token=${{ secrets.OPENAI_TOKEN }}
+      - run: ./mvnw clean install test -Dfindbugs.skip -Dcheckstyle.skip -Dgpg.skip -Dskip.yarn -Dopenai.token=${{ secrets.OPENAI_TOKEN }} -Dproxy.token=${{ secrets.PROXY_TOKEN }} -Dproxy.host=${{ secrets.PROXY_HOST }}
 
   before_checker_package:
     runs-on: ubuntu-latest

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.devlive.sdk</groupId>
     <artifactId>openai-java-sdk</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <name>openai-java-sdk</name>
     <description>

src/main/java/org/devlive/sdk/openai/OpenAiClient.java

@@ -8,6 +8,7 @@
 import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.devlive.sdk.openai.exception.ParamException;
 import org.devlive.sdk.openai.interceptor.DefaultInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
@@ -36,16 +37,16 @@ private OpenAiClient(OpenAiClientBuilder builder)
         }
         Preconditions.checkState(hasApiKey, "Invalid OpenAi token");
 
-        if (ObjectUtils.isEmpty(apiHost)) {
+        if (ObjectUtils.isEmpty(builder.apiHost)) {
             builder.apiHost(null);
         }
-        if (ObjectUtils.isEmpty(timeout)) {
+        if (ObjectUtils.isEmpty(builder.timeout)) {
             builder.timeout(null);
         }
-        if (ObjectUtils.isEmpty(unit)) {
+        if (ObjectUtils.isEmpty(builder.unit)) {
             builder.unit(null);
         }
-        if (ObjectUtils.isEmpty(client)) {
+        if (ObjectUtils.isEmpty(builder.client)) {
             builder.client(null);
         }
 
@@ -101,10 +102,10 @@ public OpenAiClientBuilder unit(TimeUnit unit)
 
         public OpenAiClientBuilder client(OkHttpClient client)
         {
+            DefaultInterceptor interceptor = new DefaultInterceptor();
+            interceptor.setApiKey(this.apiKey);
             if (ObjectUtils.isEmpty(client)) {
                 log.warn("No client, creating default client");
-                DefaultInterceptor interceptor = new DefaultInterceptor();
-                interceptor.setApiKey(this.apiKey);
                 client = new OkHttpClient.Builder()
                         .addInterceptor(interceptor)
                         .connectTimeout(this.timeout, this.unit)
@@ -113,6 +114,18 @@ public OpenAiClientBuilder client(OkHttpClient client)
                         .callTimeout(this.timeout, this.unit)
                         .build();
             }
+
+            if (client.interceptors().size() <= 0) {
+                throw new ParamException("No interceptors available");
+            }
+
+            long count = client.interceptors()
+                    .stream()
+                    .filter(inter -> inter instanceof DefaultInterceptor)
+                    .count();
+            if (count <= 0) {
+                throw new ParamException("Must inject DefaultInterceptor");
+            }
             this.client = client;
             return this;
         }

src/main/java/org/devlive/sdk/openai/exception/DefaultException.java

@@ -1,8 +1,11 @@
 package org.devlive.sdk.openai.exception;
 
+import lombok.Getter;
+
 public class DefaultException
         extends RuntimeException
 {
+    @Getter
     private final String message;
 
     public DefaultException(String message)

src/main/java/org/devlive/sdk/openai/interceptor/DefaultInterceptor.java

@@ -9,7 +9,9 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.devlive.sdk.openai.exception.AuthorizedException;
+import org.devlive.sdk.openai.exception.ParamException;
 import org.devlive.sdk.openai.exception.RequestException;
 import org.devlive.sdk.openai.response.DefaultResponse;
 import org.devlive.sdk.openai.utils.JsonUtils;
@@ -31,6 +33,9 @@ public DefaultInterceptor()
 
     public Request headers(Request original)
     {
+        if (StringUtils.isEmpty(this.apiKey)) {
+            throw new ParamException("Invalid OpenAi token, must be non-empty");
+        }
         return original.newBuilder()
                 .header("Authorization", String.format("Bearer %s", this.apiKey))
                 .header("Content-Type", "application/json")

src/test/java/org/devlive/sdk/openai/OpenAiClientTest.java

@@ -1,22 +1,26 @@
 package org.devlive.sdk.openai;
 
 import com.google.common.collect.Lists;
+import okhttp3.OkHttpClient;
 import org.devlive.sdk.openai.entity.CompletionChatEntity;
 import org.devlive.sdk.openai.entity.CompletionEntity;
 import org.devlive.sdk.openai.entity.CompletionMessageEntity;
 import org.devlive.sdk.openai.exception.AuthorizedException;
+import org.devlive.sdk.openai.interceptor.DefaultInterceptor;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class OpenAiClientTest
 {
     private OpenAiClient client;
     private String invalidApiKey = "sk-rh";
+    private long openApiTimeout = 10;
 
     @Before
     public void before()
@@ -32,6 +36,25 @@ public void testBuilder()
         Assert.assertNotNull(client);
     }
 
+    @Test
+    public void testClient()
+    {
+        DefaultInterceptor interceptor = new DefaultInterceptor();
+        interceptor.setApiKey(System.getProperty("proxy.token"));
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .addInterceptor(interceptor)
+                .connectTimeout(openApiTimeout, TimeUnit.SECONDS)
+                .writeTimeout(openApiTimeout, TimeUnit.SECONDS)
+                .readTimeout(openApiTimeout, TimeUnit.SECONDS)
+                .build();
+        client = OpenAiClient.builder()
+                .apiHost(System.getProperty("proxy.host"))
+                .apiKey(invalidApiKey)
+                .client(okHttpClient)
+                .build();
+        Assert.assertTrue(client.getModels().getModels().size() > 0);
+    }
+
     @Test
     public void testNoAuthorized()
     {