[agents] Makes "access-key" property for OpenAIConfig optional. Omitt…

…ing API key allows HTTP schema for internal cluster communications, without receiving "Key credentials require HTTPS to prevent leaking the key." error.
Dobosz · Nov 27, 2023 · eab5425 · eab5425
1 parent eec9581
commit eab5425
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/...ream-ai-agents/src/main/java/com/datastax/oss/streaming/ai/model/config/OpenAIConfig.java b/...ream-ai-agents/src/main/java/com/datastax/oss/streaming/ai/model/config/OpenAIConfig.java
@@ -22,7 +22,7 @@
 public class OpenAIConfig {
     @JsonProperty private String url;
 
-    @JsonProperty(value = "access-key", required = true)
+    @JsonProperty(value = "access-key")
     private String accessKey;
 
     @JsonProperty OpenAIProvider provider = OpenAIProvider.OPENAI;

diff --git a/...eam-ai-agents/src/main/java/com/datastax/oss/streaming/ai/util/TransformFunctionUtil.java b/...eam-ai-agents/src/main/java/com/datastax/oss/streaming/ai/util/TransformFunctionUtil.java
@@ -98,10 +98,12 @@ public static OpenAIClient buildOpenAIClient(OpenAIConfig openAIConfig) {
             return null;
         }
         OpenAIClientBuilder openAIClientBuilder = new OpenAIClientBuilder();
-        if (openAIConfig.getProvider() == OpenAIProvider.AZURE) {
-            openAIClientBuilder.credential(new AzureKeyCredential(openAIConfig.getAccessKey()));
-        } else {
-            openAIClientBuilder.credential(new KeyCredential(openAIConfig.getAccessKey()));
+        if (!openAIConfig.getAccessKey().isEmpty()) {
+            if (openAIConfig.getProvider() == OpenAIProvider.AZURE) {
+                openAIClientBuilder.credential(new AzureKeyCredential(openAIConfig.getAccessKey()));
+            } else {
+                openAIClientBuilder.credential(new KeyCredential(openAIConfig.getAccessKey()));
+            }
         }
         if (openAIConfig.getUrl() != null && !openAIConfig.getUrl().isEmpty()) {
             openAIClientBuilder.endpoint(openAIConfig.getUrl());
@@ -124,10 +126,12 @@ public static OpenAIAsyncClient buildOpenAsyncAIClient(OpenAIConfig openAIConfig
             return null;
         }
         OpenAIClientBuilder openAIClientBuilder = new OpenAIClientBuilder();
-        if (openAIConfig.getProvider() == OpenAIProvider.AZURE) {
-            openAIClientBuilder.credential(new AzureKeyCredential(openAIConfig.getAccessKey()));
-        } else {
-            openAIClientBuilder.credential(new KeyCredential(openAIConfig.getAccessKey()));
+        if (!openAIConfig.getAccessKey().isEmpty()) {
+            if (openAIConfig.getProvider() == OpenAIProvider.AZURE) {
+                openAIClientBuilder.credential(new AzureKeyCredential(openAIConfig.getAccessKey()));
+            } else {
+                openAIClientBuilder.credential(new KeyCredential(openAIConfig.getAccessKey()));
+            }
         }
         if (openAIConfig.getUrl() != null && !openAIConfig.getUrl().isEmpty()) {
             openAIClientBuilder.endpoint(openAIConfig.getUrl());