Exposed initialization state for service (for scenario testing). (#47)

Co-authored-by: hawkan <Aeroplane!2000>

Author: hawkan

client/src/main/java/com/theokanning/openai/OpenAiService.java

@@ -24,29 +24,56 @@
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static java.time.Duration.ofSeconds;
+
 public class OpenAiService {
 
-    OpenAiApi api;
+    private static final String BASE_URL = "https://api.openai.com/";
+
+    final OpenAiApi api;
 
     /**
      * Creates a new OpenAiService that wraps OpenAiApi
      *
      * @param token OpenAi token string "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
      */
-    public OpenAiService(String token) {
-        this(token, 10);
+    public OpenAiService(final String token) {
+        this(token, BASE_URL, ofSeconds(10));
     }
 
     /**
      * Creates a new OpenAiService that wraps OpenAiApi
      *
      * @param token   OpenAi token string "sk-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
      * @param timeout http read timeout in seconds, 0 means no timeout
+     * @deprecated use {@link OpenAiService(String, Duration)}
+     */
+    @Deprecated
+    public OpenAiService(final String token, final int timeout) {
+        this(token, BASE_URL, ofSeconds(timeout));
+    }
+
+    /**
+     * 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, BASE_URL, timeout);
+    }
+
+    /**
+     * 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(String token, int timeout) {
+    public OpenAiService(final String token, final String baseUrl, final Duration timeout) {
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
@@ -55,11 +82,11 @@ public OpenAiService(String token, int timeout) {
         OkHttpClient client = new OkHttpClient.Builder()
                 .addInterceptor(new AuthenticationInterceptor(token))
                 .connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS))
-                .readTimeout(timeout, TimeUnit.SECONDS)
+                .readTimeout(timeout.toMillis(), TimeUnit.MILLISECONDS)
                 .build();
 
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("https://api.openai.com/")
+                .baseUrl(baseUrl)
                 .client(client)
                 .addConverterFactory(JacksonConverterFactory.create(mapper))
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
@@ -73,7 +100,7 @@ public OpenAiService(String token, int timeout) {
      *
      * @param api OpenAiApi instance to use for all methods
      */
-    public OpenAiService(OpenAiApi api) {
+    public OpenAiService(final OpenAiApi api) {
         this.api = api;
     }