Merge pull request #7 from edeandrea/add-organizationId

Add organizationId

Author: ai-for-java

.gitignore

@@ -22,3 +22,8 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+**/target/**
+
+.idea
+*.iml

README.md

@@ -65,6 +65,7 @@ String apiKey = System.getenv("OPENAI_API_KEY");
 
 OpenAiClient client = OpenAiClient.builder()
 .openAiApiKey(apiKey)
+.organizationId(orgId)
 .callTimeout(ofSeconds(60))
 .connectTimeout(ofSeconds(60))
 .readTimeout(ofSeconds(60))

src/main/java/dev/ai4j/openai4j/ApiKeyHeaderInjector.java

@@ -1,27 +1,10 @@
 package dev.ai4j.openai4j;
 
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
+import java.util.Collections;
 
-import java.io.IOException;
-
-class ApiKeyHeaderInjector implements Interceptor {
-
- private final String apiKey;
+class ApiKeyHeaderInjector extends GenericHeaderInjector {
 
  ApiKeyHeaderInjector(String apiKey) {
- this.apiKey = apiKey;
- }
-
- @Override
- public Response intercept(Chain chain) throws IOException {
-
- Request request = chain.request()
- .newBuilder()
- .addHeader("api-key", apiKey)
- .build();
-
- return chain.proceed(request);
+ super(Collections.singletonMap("api-key", apiKey));
  }
 }

src/main/java/dev/ai4j/openai4j/AuthorizationHeaderInjector.java

@@ -1,27 +1,10 @@
 package dev.ai4j.openai4j;
 
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
+import java.util.Collections;
 
-import java.io.IOException;
-
-class AuthorizationHeaderInjector implements Interceptor {
-
- private final String apiKey;
+class AuthorizationHeaderInjector extends GenericHeaderInjector {
 
  AuthorizationHeaderInjector(String apiKey) {
- this.apiKey = apiKey;
- }
-
- @Override
- public Response intercept(Chain chain) throws IOException {
-
- Request request = chain.request()
- .newBuilder()
- .addHeader("Authorization", "Bearer " + apiKey)
- .build();
-
- return chain.proceed(request);
+ super(Collections.singletonMap("Authorization", "Bearer " + apiKey));
  }
 }

src/main/java/dev/ai4j/openai4j/DefaultOpenAiClient.java

@@ -2,6 +2,9 @@
 
 import static dev.ai4j.openai4j.Json.GSON;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import dev.ai4j.openai4j.chat.ChatCompletionRequest;
 import dev.ai4j.openai4j.chat.ChatCompletionResponse;
 import dev.ai4j.openai4j.completion.CompletionRequest;
@@ -14,11 +17,10 @@
 import dev.ai4j.openai4j.moderation.ModerationResponse;
 import dev.ai4j.openai4j.moderation.ModerationResult;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
@@ -58,6 +60,10 @@ private DefaultOpenAiClient(Builder serviceBuilder) {
  okHttpClientBuilder.addInterceptor(new ApiKeyHeaderInjector(serviceBuilder.azureApiKey));
  }
 
+ if (serviceBuilder.organizationId != null) {
+ okHttpClientBuilder.addInterceptor(new GenericHeaderInjector(Collections.singletonMap("OpenAI-Organization", serviceBuilder.organizationId)));
+ }
+
  if (serviceBuilder.proxy != null) {
  okHttpClientBuilder.proxy(serviceBuilder.proxy);
  }

src/main/java/dev/ai4j/openai4j/GenericHeaderInjector.java

@@ -0,0 +1,29 @@
+package dev.ai4j.openai4j;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import okhttp3.Interceptor;
+import okhttp3.Request.Builder;
+import okhttp3.Response;
+
+class GenericHeaderInjector implements Interceptor {
+ private final Map<String, String> headers = new HashMap<>();
+
+ GenericHeaderInjector(Map<String, String> headers) {
+ Optional.ofNullable(headers)
+ .ifPresent(this.headers::putAll);
+ }
+
+ @Override
+ public Response intercept(Chain chain) throws IOException {
+ Builder builder = chain.request().newBuilder();
+
+ // Add headers
+ this.headers.forEach(builder::addHeader);
+
+ return chain.proceed(builder.build());
+ }
+}

src/main/java/dev/ai4j/openai4j/OpenAiClient.java

@@ -1,5 +1,12 @@
 package dev.ai4j.openai4j;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.List;
+
 import dev.ai4j.openai4j.chat.ChatCompletionRequest;
 import dev.ai4j.openai4j.chat.ChatCompletionResponse;
 import dev.ai4j.openai4j.completion.CompletionRequest;
@@ -13,12 +20,6 @@
 import dev.ai4j.openai4j.moderation.ModerationResult;
 import dev.ai4j.openai4j.spi.OpenAiClientBuilderFactory;
 import dev.ai4j.openai4j.spi.ServiceHelper;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.util.List;
 
 public abstract class OpenAiClient {
 
@@ -55,6 +56,7 @@ public static OpenAiClient.Builder builder() {
  public abstract static class Builder<T extends OpenAiClient, B extends Builder<T, B>> {
 
  public String baseUrl = "https://api.openai.com/v1/";
+ public String organizationId;
  public String apiVersion;
  public String openAiApiKey;
  public String azureApiKey;
@@ -84,6 +86,16 @@ public B baseUrl(String baseUrl) {
  return (B) this;
  }
 
+ /**
+ *
+ * @param organizationId The organizationId for OpenAI: https://platform.openai.com/docs/api-reference/organization-optional
+ * @return builder
+ */
+ public B organizationId(String organizationId) {
+ this.organizationId = organizationId;
+ return (B) this;
+ }
+
  /**
  * @param apiVersion Version of the API in the YYYY-MM-DD format. Applicable only for Azure OpenAI.
  * @return builder