Add tests

Author: Max Hniebergall

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceBaseRestTest.java

@@ -81,6 +81,21 @@ static String mockSparseServiceModelConfig(@Nullable TaskType taskTypeInBody) {
             """, taskType);
     }
 
+    static String updateConfig(@Nullable TaskType taskTypeInBody, String apiKey, int temperature) {
+        var taskType = taskTypeInBody == null ? "" : "\"task_type\": \"" + taskTypeInBody + "\",";
+        return Strings.format("""
+            {
+              %s
+              "service_settings": {
+                "api_key": "%s"
+              },
+              "task_settings": {
+                "temperature": %d
+              }
+            }
+            """, taskType, apiKey, temperature);
+    }
+
     static String mockCompletionServiceModelConfig(@Nullable TaskType taskTypeInBody) {
         var taskType = taskTypeInBody == null ? "" : "\"task_type\": \"" + taskTypeInBody + "\",";
         return Strings.format("""
@@ -196,6 +211,11 @@ protected Map<String, Object> putModel(String modelId, String modelConfig, TaskT
         return putRequest(endpoint, modelConfig);
     }
 
+    protected Map<String, Object> updateEndpoint(String inferenceID, String modelConfig, TaskType taskType) throws IOException {
+        String endpoint = Strings.format("_inference/%s/%s/_update", taskType, inferenceID);
+        return putRequest(endpoint, modelConfig);
+    }
+
     protected Map<String, Object> putPipeline(String pipelineId, String modelId) throws IOException {
         String endpoint = Strings.format("_ingest/pipeline/%s", pipelineId);
         String body = """

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceCrudIT.java

@@ -16,6 +16,8 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.IntStream;
@@ -29,7 +31,7 @@
 public class InferenceCrudIT extends InferenceBaseRestTest {
 
     @SuppressWarnings("unchecked")
-    public void testGet() throws IOException {
+    public void testCRUD() throws IOException {
         for (int i = 0; i < 5; i++) {
             putModel("se_model_" + i, mockSparseServiceModelConfig(), TaskType.SPARSE_EMBEDDING);
         }
@@ -53,11 +55,29 @@ public void testGet() throws IOException {
         for (var denseModel : getDenseModels) {
             assertEquals("text_embedding", denseModel.get("task_type"));
         }
-
-        var singleModel = getModels("se_model_1", TaskType.SPARSE_EMBEDDING);
-        assertThat(singleModel, hasSize(1));
-        assertEquals("se_model_1", singleModel.get(0).get("inference_id"));
-
+        String oldApiKey;
+        {
+            var singleModel = getModels("se_model_1", TaskType.SPARSE_EMBEDDING);
+            assertThat(singleModel, hasSize(1));
+            assertEquals("se_model_1", singleModel.get(0).get("inference_id"));
+            oldApiKey = (String) singleModel.get(0).get("api_key");
+        }
+        var newApiKey = randomAlphaOfLength(10);
+        int temperature = randomIntBetween(1, 10);
+        Map<String, Object> updatedEndpoint = updateEndpoint(
+            "se_model_1",
+            updateConfig(TaskType.SPARSE_EMBEDDING, newApiKey, temperature),
+            TaskType.SPARSE_EMBEDDING
+        );
+        Map<String, Objects> updatedTaskSettings = (Map<String, Objects>) updatedEndpoint.get("task_settings");
+        assertEquals(temperature, updatedTaskSettings.get("temperature"));
+        {
+            var singleModel = getModels("se_model_1", TaskType.SPARSE_EMBEDDING);
+            assertThat(singleModel, hasSize(1));
+            assertEquals("se_model_1", singleModel.get(0).get("inference_id"));
+            assertNotEquals(oldApiKey, newApiKey);
+            assertEquals(updatedEndpoint, singleModel.get(0));
+        }
         for (int i = 0; i < 5; i++) {
             deleteModel("se_model_" + i, TaskType.SPARSE_EMBEDDING);
         }

x-pack/plugin/inference/qa/test-service-plugin/src/main/java/org/elasticsearch/xpack/inference/mock/AbstractTestInferenceService.java

@@ -161,7 +161,7 @@ public TransportVersion getMinimalSupportedVersion() {
 
         @Override
         public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
-            return fromMap(newSettings);
+            return fromMap(new HashMap<>(newSettings));
         }
     }
 
@@ -214,7 +214,7 @@ public TransportVersion getMinimalSupportedVersion() {
 
         @Override
         public SecretSettings newSecretSettings(Map<String, Object> newSecrets) {
-            return TestSecretSettings.fromMap(newSecrets);
+            return TestSecretSettings.fromMap(new HashMap<>(newSecrets));
         }
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/completion/AlibabaCloudSearchCompletionTaskSettings.java

@@ -137,7 +137,9 @@ public Map<String, Object> getParameters() {
 
     @Override
     public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
-        AlibabaCloudSearchCompletionTaskSettings updatedSettings = AlibabaCloudSearchCompletionTaskSettings.fromMap(newSettings);
+        AlibabaCloudSearchCompletionTaskSettings updatedSettings = AlibabaCloudSearchCompletionTaskSettings.fromMap(
+            new HashMap<>(newSettings)
+        );
         return of(this, updatedSettings);
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/embeddings/AlibabaCloudSearchEmbeddingsTaskSettings.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -173,7 +174,7 @@ public static String invalidInputTypeMessage(InputType inputType) {
 
     @Override
     public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
-        AlibabaCloudSearchEmbeddingsTaskSettings newSettingsOnly = fromMap(newSettings);
+        AlibabaCloudSearchEmbeddingsTaskSettings newSettingsOnly = fromMap(new HashMap<>(newSettings));
         return of(this, newSettingsOnly, newSettingsOnly.inputType != null ? newSettingsOnly.inputType : this.getInputType());
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/alibabacloudsearch/sparse/AlibabaCloudSearchSparseTaskSettings.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -186,7 +187,7 @@ public static String invalidInputTypeMessage(InputType inputType) {
 
     @Override
     public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
-        AlibabaCloudSearchSparseTaskSettings updatedSettings = fromMap(newSettings);
+        AlibabaCloudSearchSparseTaskSettings updatedSettings = fromMap(new HashMap<>(newSettings));
         return of(this, updatedSettings, updatedSettings.getInputType() != null ? updatedSettings.getInputType() : this.inputType);
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockSecretSettings.java

@@ -18,6 +18,7 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -110,6 +111,6 @@ public int hashCode() {
 
     @Override
     public SecretSettings newSecretSettings(Map<String, Object> newSecrets) {
-        return fromMap(newSecrets);
+        return fromMap(new HashMap<>(newSecrets));
     }
 }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/completion/AmazonBedrockChatCompletionTaskSettings.java

@@ -17,6 +17,7 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -191,7 +192,7 @@ public int hashCode() {
     @Override
     public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
         AmazonBedrockChatCompletionRequestTaskSettings requestSettings = AmazonBedrockChatCompletionRequestTaskSettings.fromMap(
-            newSettings
+            new HashMap<>(newSettings)
         );
         return of(this, requestSettings);
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/anthropic/completion/AnthropicChatCompletionTaskSettings.java

@@ -19,6 +19,7 @@
 import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -61,7 +62,7 @@ private static AnthropicChatCompletionTaskSettings fromPersistedMap(Map<String,
 
     @Override
     public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
-        return fromRequestMap(newSettings);
+        return fromRequestMap(new HashMap<>(newSettings));
     }
 
     private record CommonFields(int maxTokens, Double temperature, Double topP, Integer topK) {}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/azureaistudio/completion/AzureAiStudioChatCompletionTaskSettings.java

@@ -20,6 +20,7 @@
 import org.elasticsearch.xpack.inference.services.azureopenai.embeddings.AzureOpenAiEmbeddingsTaskSettings;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
@@ -173,6 +174,20 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
+    @Override
+    public String toString() {
+        return "AzureAiStudioChatCompletionTaskSettings{"
+            + "temperature="
+            + temperature
+            + ", topP="
+            + topP
+            + ", doSample="
+            + doSample
+            + ", maxNewTokens="
+            + maxNewTokens
+            + '}';
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -192,7 +207,7 @@ public int hashCode() {
     @Override
     public TaskSettings updatedTaskSettings(Map<String, Object> newSettings) {
         AzureAiStudioChatCompletionRequestTaskSettings requestSettings = AzureAiStudioChatCompletionRequestTaskSettings.fromMap(
-            newSettings
+            new HashMap<>(newSettings)
         );
         return of(this, requestSettings);
     }