Add a default interceptor

Author: qianmoQ

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

@@ -8,7 +8,6 @@
 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;
@@ -102,30 +101,21 @@ 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");
                 client = new OkHttpClient.Builder()
-                        .addInterceptor(interceptor)
                         .connectTimeout(this.timeout, this.unit)
                         .writeTimeout(this.timeout, this.unit)
                         .readTimeout(this.timeout, this.unit)
                         .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");
-            }
+            // Add default interceptor
+            DefaultInterceptor interceptor = new DefaultInterceptor();
+            interceptor.setApiKey(this.apiKey);
+            client = client.newBuilder()
+                    .addInterceptor(interceptor)
+                    .build();
             this.client = client;
             return this;
         }

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

@@ -6,7 +6,6 @@
 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;
@@ -39,17 +38,14 @@ public void testBuilder()
     @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)
+                .apiKey(System.getProperty("proxy.token"))
                 .client(okHttpClient)
                 .build();
         Assert.assertTrue(client.getModels().getModels().size() > 0);