match ElasticsearchInternalService implementation of defaults

Author: Max Hniebergall

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceService.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.inference.ChunkedInference;
 import org.elasticsearch.inference.EmptySettingsConfiguration;
-import org.elasticsearch.inference.EmptyTaskSettings;
 import org.elasticsearch.inference.InferenceServiceConfiguration;
 import org.elasticsearch.inference.InferenceServiceResults;
 import org.elasticsearch.inference.InputType;
@@ -80,6 +79,8 @@ public class ElasticInferenceService extends SenderService {
 
     public static final String DEFAULT_EIS_COMPLETION_ENDPOINT_ID = "eis-alpha-1";
 
+    public static final List<String> DEFAULT_EIS_ENDPOINT_IDS = List.of(DEFAULT_EIS_COMPLETION_ENDPOINT_ID);
+
     public ElasticInferenceService(
         HttpRequestSender.Factory factory,
         ServiceComponents serviceComponents,
@@ -183,8 +184,18 @@ public void parseRequestConfig(
         Map<String, Object> config,
         ActionListener<Model> parsedModelListener
     ) {
-        try {
-            Map<String, Object> serviceSettingsMap = removeFromMapOrThrowIfNull(config, ModelConfigurations.SERVICE_SETTINGS);
+        if (DEFAULT_EIS_ENDPOINT_IDS.contains(inferenceEntityId)) {
+            parsedModelListener.onFailure(
+                new ElasticsearchStatusException(
+                    "[{}] is a reserved inference Id. Cannot create a new inference endpoint with a reserved Id",
+                    RestStatus.BAD_REQUEST,
+                    inferenceEntityId
+                )
+            );
+            return;
+        }
+
+        try {Map<String, Object> serviceSettingsMap = removeFromMapOrThrowIfNull(config, ModelConfigurations.SERVICE_SETTINGS);
             Map<String, Object> taskSettingsMap = removeFromMapOrDefaultEmpty(config, ModelConfigurations.TASK_SETTINGS);
 
             ElasticInferenceServiceModel model = createModel(
@@ -225,25 +236,30 @@ public List<DefaultConfigId> defaultConfigIds() {
 
     @Override
     public void defaultConfigs(ActionListener<List<Model>> defaultsListener) {
-        var serviceSettings = new HashMap<String, Object>(1);
-        serviceSettings.put(MODEL_ID, "elastic-model"); // TODO
 
         defaultsListener.onResponse(
             List.of(
-                new ElasticInferenceServiceCompletionModel(
-                    DEFAULT_EIS_COMPLETION_ENDPOINT_ID,
-                    TaskType.COMPLETION,
-                    NAME,
-                    serviceSettings,
-                    null,
-                    null,
-                    new ElasticInferenceServiceComponents("http://localhost:8080"), // TODO
-                    ConfigurationParseContext.PERSISTENT
-                )
+                firstDefaultCompletionModel()
             )
         );
     }
 
+    private static ElasticInferenceServiceCompletionModel firstDefaultCompletionModel() {
+        var serviceSettings = new HashMap<String, Object>(1);
+        serviceSettings.put(MODEL_ID, "elastic-model"); // TODO
+
+        return new ElasticInferenceServiceCompletionModel(
+            DEFAULT_EIS_COMPLETION_ENDPOINT_ID,
+            TaskType.COMPLETION,
+            NAME,
+            serviceSettings,
+            null,
+            null,
+            new ElasticInferenceServiceComponents("http://localhost:8080"), // TODO
+            ConfigurationParseContext.PERSISTENT
+        );
+    }
+
     private static ElasticInferenceServiceModel createModel(
         String inferenceEntityId,
         TaskType taskType,
@@ -305,33 +321,14 @@ public Model parsePersistedConfig(String inferenceEntityId, TaskType taskType, M
         Map<String, Object> serviceSettingsMap = removeFromMapOrThrowIfNull(config, ModelConfigurations.SERVICE_SETTINGS);
         Map<String, Object> taskSettingsMap = removeFromMapOrDefaultEmpty(config, ModelConfigurations.TASK_SETTINGS);
 
-        if (DEFAULT_EIS_COMPLETION_ENDPOINT_ID.equals(inferenceEntityId)) {
-            var defaultServiceSettings = new HashMap<String, Object>(1);
-            defaultServiceSettings.put(MODEL_ID, "elastic-model"); // TODO
-            var serviceSettings = ElasticInferenceServiceCompletionServiceSettings.fromMap(
-                defaultServiceSettings,
-                ConfigurationParseContext.PERSISTENT
-            );
-
-            return new ElasticInferenceServiceCompletionModel(
-                V1_EIS_COMPLETION_MODEL_ID,
-                TaskType.COMPLETION,
-                NAME,
-                serviceSettings,
-                EmptyTaskSettings.INSTANCE,
-                null,
-                null
-            );
-        } else {
-            return createModelFromPersistent(
-                inferenceEntityId,
-                taskType,
-                serviceSettingsMap,
-                taskSettingsMap,
-                null,
-                parsePersistedConfigErrorMsg(inferenceEntityId, NAME)
-            );
-        }
+        return createModelFromPersistent(
+            inferenceEntityId,
+            taskType,
+            serviceSettingsMap,
+            taskSettingsMap,
+            null,
+            parsePersistedConfigErrorMsg(inferenceEntityId, NAME)
+        );
     }
 
     @Override