Merge pull request #1041 from quarkiverse/configname-openai

geoand · web-flow · commit b4b3c51616b3 · 2024-11-04T09:25:31.000+02:00
Bring ModelAuthProvider support to the OpenAI extension
diff --git a/model-providers/openai/openai-common/runtime/src/main/java/io/quarkiverse/langchain4j/openai/common/QuarkusOpenAiClient.java b/model-providers/openai/openai-common/runtime/src/main/java/io/quarkiverse/langchain4j/openai/common/QuarkusOpenAiClient.java
@@ -527,6 +527,7 @@ public static class QuarkusOpenAiClientBuilderFactory implements OpenAiClientBui
         @Override
         public Builder get() {
             var result = new Builder();
+            result.configName(AdditionalPropertiesHack.getAndClearConfigName());
             result.tlsConfigurationName(AdditionalPropertiesHack.getAndClearTlsConfigurationName());
             return result;
         }
diff --git a/model-providers/openai/openai-common/runtime/src/main/java/io/quarkiverse/langchain4j/openai/common/runtime/AdditionalPropertiesHack.java b/model-providers/openai/openai-common/runtime/src/main/java/io/quarkiverse/langchain4j/openai/common/runtime/AdditionalPropertiesHack.java
@@ -26,6 +26,15 @@ public static void reset() {
         PROPS.set(new HashMap<>());
     }
 
+    public static void setConfigName(String configName) {
+        Map<String, String> map = PROPS.get();
+        if (map == null) {
+            // this should never happen
+            return;
+        }
+        map.put("configName", configName);
+    }
+
     public static void setTlsConfigurationName(String tlsConfigurationName) {
         Map<String, String> map = PROPS.get();
         if (map == null) {
@@ -35,6 +44,15 @@ public static void setTlsConfigurationName(String tlsConfigurationName) {
         map.put("tlsConfigurationName", tlsConfigurationName);
     }
 
+    public static String getAndClearConfigName() {
+        Map<String, String> map = PROPS.get();
+        if (map == null) {
+            // this should never happen
+            return null;
+        }
+        return map.remove("configName");
+    }
+
     public static String getAndClearTlsConfigurationName() {
         Map<String, String> map = PROPS.get();
         if (map == null) {
diff --git a/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiChatModelBuilderFactory.java b/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiChatModelBuilderFactory.java
@@ -12,15 +12,22 @@ public OpenAiChatModel.OpenAiChatModelBuilder get() {
 
     public static class Builder extends OpenAiChatModel.OpenAiChatModelBuilder {
 
+        private String configName;
         private String tlsConfigurationName;
 
+        public Builder configName(String configName) {
+            this.configName = configName;
+            return this;
+        }
+
         public Builder tlsConfigurationName(String tlsConfigurationName) {
             this.tlsConfigurationName = tlsConfigurationName;
             return this;
         }
 
         @Override
         public OpenAiChatModel build() {
+            AdditionalPropertiesHack.setConfigName(configName);
             AdditionalPropertiesHack.setTlsConfigurationName(tlsConfigurationName);
             return super.build();
         }
diff --git a/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiEmbeddingModelBuilderFactory.java b/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiEmbeddingModelBuilderFactory.java
@@ -13,15 +13,22 @@ public OpenAiEmbeddingModel.OpenAiEmbeddingModelBuilder get() {
 
     public static class Builder extends OpenAiEmbeddingModel.OpenAiEmbeddingModelBuilder {
 
+        private String configName;
         private String tlsConfigurationName;
 
+        public Builder configName(String configName) {
+            this.configName = configName;
+            return this;
+        }
+
         public Builder tlsConfigurationName(String tlsConfigurationName) {
             this.tlsConfigurationName = tlsConfigurationName;
             return this;
         }
 
         @Override
         public OpenAiEmbeddingModel build() {
+            AdditionalPropertiesHack.setConfigName(configName);
             AdditionalPropertiesHack.setTlsConfigurationName(tlsConfigurationName);
             return super.build();
         }
diff --git a/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiImageModel.java b/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiImageModel.java
@@ -55,6 +55,7 @@ public QuarkusOpenAiImageModel(Builder builder) {
 
         this.client = QuarkusOpenAiClient.builder()
                 .baseUrl(builder.baseUrl)
+                .configName(builder.configName)
                 .tlsConfigurationName(builder.tlsConfigurationName)
                 .openAiApiKey(builder.apiKey)
                 .organizationId(builder.organizationId)
@@ -139,6 +140,7 @@ public static Builder builder() {
 
     public static class Builder {
         private String baseUrl;
+        private String configName;
         private String tlsConfigurationName;
         private String apiKey;
         private String organizationId;
@@ -159,6 +161,11 @@ public Builder baseUrl(String baseUrl) {
             return this;
         }
 
+        public Builder configName(String configName) {
+            this.configName = configName;
+            return this;
+        }
+
         public Builder tlsConfigurationName(String tlsConfigurationName) {
             this.tlsConfigurationName = tlsConfigurationName;
             return this;
diff --git a/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiModerationModelBuilderFactory.java b/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiModerationModelBuilderFactory.java
@@ -13,15 +13,22 @@ public OpenAiModerationModel.OpenAiModerationModelBuilder get() {
 
     public static class Builder extends OpenAiModerationModel.OpenAiModerationModelBuilder {
 
+        private String configName;
         private String tlsConfigurationName;
 
+        public Builder configName(String configName) {
+            this.configName = configName;
+            return this;
+        }
+
         public Builder tlsConfigurationName(String tlsConfigurationName) {
             this.tlsConfigurationName = tlsConfigurationName;
             return this;
         }
 
         @Override
         public OpenAiModerationModel build() {
+            AdditionalPropertiesHack.setConfigName(configName);
             AdditionalPropertiesHack.setTlsConfigurationName(tlsConfigurationName);
             return super.build();
         }
diff --git a/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiStreamingChatModelBuilderFactory.java b/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/QuarkusOpenAiStreamingChatModelBuilderFactory.java
@@ -13,15 +13,22 @@ public OpenAiStreamingChatModel.OpenAiStreamingChatModelBuilder get() {
 
     public static class Builder extends OpenAiStreamingChatModel.OpenAiStreamingChatModelBuilder {
 
+        private String configName;
         private String tlsConfigurationName;
 
+        public Builder configName(String configName) {
+            this.configName = configName;
+            return this;
+        }
+
         public Builder tlsConfigurationName(String tlsConfigurationName) {
             this.tlsConfigurationName = tlsConfigurationName;
             return this;
         }
 
         @Override
         public OpenAiStreamingChatModel build() {
+            AdditionalPropertiesHack.setConfigName(configName);
             AdditionalPropertiesHack.setTlsConfigurationName(tlsConfigurationName);
             return super.build();
         }
diff --git a/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/runtime/OpenAiRecorder.java b/model-providers/openai/openai-vanilla/runtime/src/main/java/io/quarkiverse/langchain4j/openai/runtime/OpenAiRecorder.java
@@ -72,6 +72,7 @@ public Function<SyntheticCreationalContext<ChatLanguageModel>, ChatLanguageModel
 
             builder
                     .tlsConfigurationName(openAiConfig.tlsConfigurationName().orElse(null))
+                    .configName(configName)
                     .baseUrl(openAiConfig.baseUrl())
                     .apiKey(apiKey)
                     .timeout(openAiConfig.timeout().orElse(Duration.ofSeconds(10)))
@@ -129,6 +130,7 @@ public Supplier<StreamingChatLanguageModel> streamingChatModel(LangChain4jOpenAi
             var builder = (QuarkusOpenAiStreamingChatModelBuilderFactory.Builder) OpenAiStreamingChatModel.builder();
             builder
                     .tlsConfigurationName(openAiConfig.tlsConfigurationName().orElse(null))
+                    .configName(configName)
                     .baseUrl(openAiConfig.baseUrl())
                     .apiKey(apiKey)
                     .timeout(openAiConfig.timeout().orElse(Duration.ofSeconds(10)))
@@ -182,6 +184,7 @@ public Supplier<EmbeddingModel> embeddingModel(LangChain4jOpenAiConfig runtimeCo
             var builder = (QuarkusOpenAiEmbeddingModelBuilderFactory.Builder) OpenAiEmbeddingModel.builder();
             builder
                     .tlsConfigurationName(openAiConfig.tlsConfigurationName().orElse(null))
+                    .configName(configName)
                     .baseUrl(openAiConfig.baseUrl())
                     .apiKey(apiKey)
                     .timeout(openAiConfig.timeout().orElse(Duration.ofSeconds(10)))
@@ -230,6 +233,7 @@ public Supplier<ModerationModel> moderationModel(LangChain4jOpenAiConfig runtime
             var builder = (QuarkusOpenAiModerationModelBuilderFactory.Builder) OpenAiModerationModel.builder();
             builder
                     .tlsConfigurationName(openAiConfig.tlsConfigurationName().orElse(null))
+                    .configName(configName)
                     .baseUrl(openAiConfig.baseUrl())
                     .apiKey(apiKey)
                     .timeout(openAiConfig.timeout().orElse(Duration.ofSeconds(10)))
@@ -272,6 +276,7 @@ public Supplier<ImageModel> imageModel(LangChain4jOpenAiConfig runtimeConfig, St
             }
             ImageModelConfig imageModelConfig = openAiConfig.imageModel();
             var builder = QuarkusOpenAiImageModel.builder()
+                    .configName(configName)
                     .tlsConfigurationName(openAiConfig.tlsConfigurationName().orElse(null))
                     .baseUrl(openAiConfig.baseUrl())
                     .apiKey(apiKey)

Original file line number	Diff line number	Diff line change
`@@ -527,6 +527,7 @@ public static class QuarkusOpenAiClientBuilderFactory implements OpenAiClientBui`
`527`	`527`	`@Override`
`528`	`528`	`public Builder get() {`
`529`	`529`	`var result = new Builder();`
	`530`	`+ result.configName(AdditionalPropertiesHack.getAndClearConfigName());`
`530`	`531`	`result.tlsConfigurationName(AdditionalPropertiesHack.getAndClearTlsConfigurationName());`
`531`	`532`	`return result;`
`532`	`533`	`}`