MLE-25059 Improving error when Azure deployment name is missing

Author: rjrudin

flux-cli/src/test/java/com/marklogic/flux/impl/importdata/ImportFilesWithEmbedderTest.java

@@ -111,7 +111,8 @@ void azure() {
             "--uri-replace", ".*/json-files,''",
             "--splitter-json-pointer", "/text",
             "--embedder", "azure",
-            "--embedder-prop", "api-key=doesnt-matter"
+            "--embedder-prop", "api-key=doesnt-matter",
+            "--embedder-prop", "deployment-name=anything"
         );
     }
 

flux-embedding-model-azure-open-ai/src/main/java/com/marklogic/flux/langchain4j/embedding/AzureOpenAiEmbeddingModelFunction.java

@@ -21,6 +21,11 @@ public EmbeddingModel apply(Map<String, String> options) {
             throw new IllegalArgumentException(String.format("Must specify either api-key or %s.", nonAzureKey));
         }
 
+        final String deploymentName = options.get("deployment-name");
+        if (deploymentName == null || deploymentName.trim().isEmpty()) {
+            throw new IllegalArgumentException("deployment-name must be specified");
+        }
+
         AzureOpenAiEmbeddingModel.Builder builder = AzureOpenAiEmbeddingModel.builder()
             .apiKey(options.get("api-key"))
             .deploymentName(options.get("deployment-name"))

flux-embedding-model-azure-open-ai/src/test/java/com/marklogic/flux/langchain4j/embedding/ConfigTest.java

@@ -4,7 +4,6 @@
 package com.marklogic.flux.langchain4j.embedding;
 
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
@@ -43,7 +42,28 @@ void mostConfig() {
     void missingEndpoint() {
         expectError(
             "endpoint cannot be null or blank",
-            "api-key", "abc123"
+            "api-key", "abc123",
+            "deployment-name", "anything"
+        );
+    }
+
+    @Test
+    void missingDeploymentName() {
+        expectError(
+            // We have to translate the internal Azure error, as it will say "deploymentName" instead of "deployment-name".
+            "deployment-name must be specified",
+            "api-key", "abc123",
+            "endpoint", "somewhere"
+        );
+    }
+
+    @Test
+    void emptyDeploymentName() {
+        expectError(
+            "deployment-name must be specified",
+            "api-key", "abc123",
+            "endpoint", "somewhere",
+            "deployment-name", ""
         );
     }
 
@@ -60,7 +80,8 @@ void badDimensions() {
         expectError(
             "dimensions must have a numeric value; invalid value: abc",
             "api-key", "abc123",
-            "dimensions", "abc"
+            "dimensions", "abc",
+            "deployment-name", "anything"
         );
     }
 
@@ -69,7 +90,8 @@ void badMaxRetries() {
         expectError(
             "max-retries must have a numeric value; invalid value: abc",
             "max-retries", "abc",
-            "api-key", "abc123"
+            "api-key", "abc123",
+            "deployment-name", "anything"
         );
     }
 
@@ -78,7 +100,8 @@ void badDuration() {
         expectError(
             "duration must have a numeric value; invalid value: abc",
             "duration", "abc",
-            "api-key", "abc123"
+            "api-key", "abc123",
+            "deployment-name", "anything"
         );
     }