Allow for specifying the organization id in the configuration

Fixes #344
langchain4j · Dec 18, 2023 · 1fa9188 · 1fa9188
1 parent 99faffe
commit 1fa9188
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 1 deletion.
diff --git a/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiChatModel.java b/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiChatModel.java
@@ -43,6 +43,7 @@ public class OpenAiChatModel implements ChatLanguageModel, TokenCountEstimator {
     @Builder
     public OpenAiChatModel(String baseUrl,
                            String apiKey,
+                           String organizationId,
                            String modelName,
                            Double temperature,
                            Double topP,
@@ -67,6 +68,7 @@ public OpenAiChatModel(String baseUrl,
         this.client = OpenAiClient.builder()
                 .openAiApiKey(apiKey)
                 .baseUrl(baseUrl)
+                .organizationId(organizationId)
                 .callTimeout(timeout)
                 .connectTimeout(timeout)
                 .readTimeout(timeout)

diff --git a/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiEmbeddingModel.java b/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiEmbeddingModel.java
@@ -35,6 +35,7 @@ public class OpenAiEmbeddingModel implements EmbeddingModel, TokenCountEstimator
     @Builder
     public OpenAiEmbeddingModel(String baseUrl,
                                 String apiKey,
+                                String organizationId,
                                 String modelName,
                                 Duration timeout,
                                 Integer maxRetries,
@@ -53,6 +54,7 @@ public OpenAiEmbeddingModel(String baseUrl,
         this.client = OpenAiClient.builder()
                 .openAiApiKey(apiKey)
                 .baseUrl(baseUrl)
+                .organizationId(organizationId)
                 .callTimeout(timeout)
                 .connectTimeout(timeout)
                 .readTimeout(timeout)

diff --git a/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiLanguageModel.java b/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiLanguageModel.java
@@ -35,6 +35,7 @@ public class OpenAiLanguageModel implements LanguageModel, TokenCountEstimator {
     @Builder
     public OpenAiLanguageModel(String baseUrl,
                                String apiKey,
+                               String organizationId,
                                String modelName,
                                Double temperature,
                                Duration timeout,
@@ -49,6 +50,7 @@ public OpenAiLanguageModel(String baseUrl,
         this.client = OpenAiClient.builder()
                 .baseUrl(getOrDefault(baseUrl, OPENAI_URL))
                 .openAiApiKey(apiKey)
+                .organizationId(organizationId)
                 .callTimeout(timeout)
                 .connectTimeout(timeout)
                 .readTimeout(timeout)

diff --git a/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiModerationModel.java b/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiModerationModel.java
@@ -36,6 +36,7 @@ public class OpenAiModerationModel implements ModerationModel {
     @Builder
     public OpenAiModerationModel(String baseUrl,
                                  String apiKey,
+                                 String organizationId,
                                  String modelName,
                                  Duration timeout,
                                  Integer maxRetries,
@@ -53,6 +54,7 @@ public OpenAiModerationModel(String baseUrl,
         this.client = OpenAiClient.builder()
                 .openAiApiKey(apiKey)
                 .baseUrl(baseUrl)
+                .organizationId(organizationId)
                 .callTimeout(timeout)
                 .connectTimeout(timeout)
                 .readTimeout(timeout)

diff --git a/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiStreamingChatModel.java b/langchain4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiStreamingChatModel.java
@@ -46,6 +46,7 @@ public class OpenAiStreamingChatModel implements StreamingChatLanguageModel, Tok
     @Builder
     public OpenAiStreamingChatModel(String baseUrl,
                                     String apiKey,
+                                    String organizationId,
                                     String modelName,
                                     Double temperature,
                                     Double topP,
@@ -64,6 +65,7 @@ public OpenAiStreamingChatModel(String baseUrl,
         this.client = OpenAiClient.builder()
                 .baseUrl(getOrDefault(baseUrl, OPENAI_URL))
                 .openAiApiKey(apiKey)
+                .organizationId(organizationId)
                 .callTimeout(timeout)
                 .connectTimeout(timeout)
                 .readTimeout(timeout)

diff --git a/...in4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiStreamingLanguageModel.java b/...in4j-open-ai/src/main/java/dev/langchain4j/model/openai/OpenAiStreamingLanguageModel.java
@@ -34,6 +34,7 @@ public class OpenAiStreamingLanguageModel implements StreamingLanguageModel, Tok
     @Builder
     public OpenAiStreamingLanguageModel(String baseUrl,
                                         String apiKey,
+                                        String organizationId,
                                         String modelName,
                                         Double temperature,
                                         Duration timeout,
@@ -47,6 +48,7 @@ public OpenAiStreamingLanguageModel(String baseUrl,
         this.client = OpenAiClient.builder()
                 .baseUrl(getOrDefault(baseUrl, OPENAI_URL))
                 .openAiApiKey(apiKey)
+                .organizationId(organizationId)
                 .callTimeout(timeout)
                 .connectTimeout(timeout)
                 .readTimeout(timeout)

diff --git a/langchain4j-open-ai/src/test/java/dev/langchain4j/model/openai/OpenAiChatModelIT.java b/langchain4j-open-ai/src/test/java/dev/langchain4j/model/openai/OpenAiChatModelIT.java
@@ -33,6 +33,7 @@ class OpenAiChatModelIT {
 
     ChatLanguageModel model = OpenAiChatModel.builder()
             .apiKey(System.getenv("OPENAI_API_KEY"))
+            .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
             .temperature(0.0)
             .logRequests(true)
             .logResponses(true)
@@ -65,6 +66,7 @@ void should_generate_answer_and_return_token_usage_and_finish_reason_length() {
         // given
         ChatLanguageModel model = OpenAiChatModel.builder()
                 .apiKey(System.getenv("OPENAI_API_KEY"))
+                .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
                 .maxTokens(3)
                 .build();
 
@@ -188,6 +190,7 @@ void should_execute_multiple_tools_in_parallel_then_answer() {
         // given
         ChatLanguageModel model = OpenAiChatModel.builder()
                 .apiKey(System.getenv("OPENAI_API_KEY"))
+                .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
                 .modelName(GPT_3_5_TURBO_1106.toString()) // supports parallel function calling
                 .temperature(0.0)
                 .build();

diff --git a/langchain4j-open-ai/src/test/java/dev/langchain4j/model/openai/OpenAiLanguageModelIT.java b/langchain4j-open-ai/src/test/java/dev/langchain4j/model/openai/OpenAiLanguageModelIT.java
@@ -12,6 +12,7 @@ class OpenAiLanguageModelIT {
 
     LanguageModel model = OpenAiLanguageModel.builder()
             .apiKey(System.getenv("OPENAI_API_KEY"))
+            .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
             .logRequests(true)
             .logResponses(true)
             .build();

diff --git a/langchain4j-open-ai/src/test/java/dev/langchain4j/model/openai/OpenAiModerationModelIT.java b/langchain4j-open-ai/src/test/java/dev/langchain4j/model/openai/OpenAiModerationModelIT.java
@@ -10,6 +10,7 @@ class OpenAiModerationModelIT {
 
     ModerationModel model = OpenAiModerationModel.builder()
             .apiKey(System.getenv("OPENAI_API_KEY"))
+            .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
             .build();
 
     @Test

diff --git a/langchain4j-parent/pom.xml b/langchain4j-parent/pom.xml
@@ -17,7 +17,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <openai4j.version>0.11.1</openai4j.version>
+        <openai4j.version>0.12.1</openai4j.version>
         <azure-ai-openai.version>1.0.0-beta.6</azure-ai-openai.version>
         <retrofit.version>2.9.0</retrofit.version>
         <okhttp.version>4.10.0</okhttp.version>

diff --git a/...ain4j-spring-boot-starter/src/main/java/dev/langchain4j/LangChain4jAutoConfiguration.java b/...ain4j-spring-boot-starter/src/main/java/dev/langchain4j/LangChain4jAutoConfiguration.java
@@ -51,6 +51,7 @@ ChatLanguageModel chatLanguageModel(LangChain4jProperties properties) {
                 return OpenAiChatModel.builder()
                         .baseUrl(openAi.getBaseUrl())
                         .apiKey(openAi.getApiKey())
+                        .organizationId(openAi.getOrganizationId())
                         .modelName(openAi.getModelName())
                         .temperature(openAi.getTemperature())
                         .topP(openAi.getTopP())
@@ -142,6 +143,7 @@ LanguageModel languageModel(LangChain4jProperties properties) {
                 }
                 return OpenAiLanguageModel.builder()
                         .apiKey(openAi.getApiKey())
+                        .organizationId(openAi.getOrganizationId())
                         .modelName(openAi.getModelName())
                         .temperature(openAi.getTemperature())
                         .timeout(openAi.getTimeout())
@@ -229,6 +231,7 @@ EmbeddingModel embeddingModel(LangChain4jProperties properties) {
                 }
                 return OpenAiEmbeddingModel.builder()
                         .apiKey(openAi.getApiKey())
+                        .organizationId(openAi.getOrganizationId())
                         .modelName(openAi.getModelName())
                         .timeout(openAi.getTimeout())
                         .maxRetries(openAi.getMaxRetries())
@@ -306,6 +309,7 @@ ModerationModel moderationModel(LangChain4jProperties properties) {
 
         return OpenAiModerationModel.builder()
                 .apiKey(openAi.getApiKey())
+                .organizationId(openAi.getOrganizationId())
                 .modelName(openAi.getModelName())
                 .timeout(openAi.getTimeout())
                 .maxRetries(openAi.getMaxRetries())

diff --git a/langchain4j-spring-boot-starter/src/main/java/dev/langchain4j/OpenAi.java b/langchain4j-spring-boot-starter/src/main/java/dev/langchain4j/OpenAi.java
@@ -6,6 +6,7 @@ class OpenAi {
 
     private String baseUrl;
     private String apiKey;
+    private String organizationId;
     private String modelName;
     private Double temperature;
     private Double topP;
@@ -33,6 +34,14 @@ public void setApiKey(String apiKey) {
         this.apiKey = apiKey;
     }
 
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
     public String getModelName() {
         return modelName;
     }

diff --git a/langchain4j/src/test/java/dev/langchain4j/service/AiServicesIT.java b/langchain4j/src/test/java/dev/langchain4j/service/AiServicesIT.java
@@ -56,6 +56,7 @@ public class AiServicesIT {
     @Spy
     ChatLanguageModel chatLanguageModel = OpenAiChatModel.builder()
             .apiKey(System.getenv("OPENAI_API_KEY"))
+            .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
             .temperature(0.0)
             .logRequests(true)
             .logResponses(true)
@@ -67,6 +68,7 @@ public class AiServicesIT {
     @Spy
     ModerationModel moderationModel = OpenAiModerationModel.builder()
             .apiKey(System.getenv("OPENAI_API_KEY"))
+            .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
             .build();
 
     ToolSpecification calculatorSpecification = ToolSpecification.builder()
@@ -845,6 +847,7 @@ void should_execute_multiple_tools_in_parallel_then_answer() {
 
         ChatLanguageModel chatLanguageModel = spy(OpenAiChatModel.builder()
                 .apiKey(System.getenv("OPENAI_API_KEY"))
+                .organizationId(System.getenv("OPENAI_ORGANIZATION_ID"))
                 .modelName(GPT_3_5_TURBO_1106)
                 .temperature(0.0)
                 .logRequests(true)