change the settings name and fixed a bug in delete model (#861) (#864)

Signed-off-by: Dhrubo Saha <[email protected]>
(cherry picked from commit d2fb391)

Co-authored-by: Dhrubo Saha <[email protected]>

Author: opensearch-trigger-bot[bot]

plugin/src/main/java/org/opensearch/ml/action/models/DeleteModelTransportAction.java

@@ -125,6 +125,9 @@ public void onFailure(Exception e) {
                         log.error("Failed to parse ml model" + r.getId(), e);
                         actionListener.onFailure(e);
                     }
+                } else {
+                    actionListener
+                        .onFailure(new IllegalArgumentException("Failed to find model to delete with the provided model id: " + modelId));
                 }
             }, e -> { actionListener.onFailure(new MLResourceNotFoundException("Fail to find model")); }));
         } catch (Exception e) {

plugin/src/main/java/org/opensearch/ml/action/models/GetModelTransportAction.java

@@ -79,7 +79,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<MLMode
                         actionListener.onFailure(e);
                     }
                 } else {
-                    actionListener.onFailure(new MLResourceNotFoundException("Fail to find model"));
+                    actionListener.onFailure(new IllegalArgumentException("Failed to find model with the provided model id: " + modelId));
                 }
             }, e -> {
                 if (e instanceof IndexNotFoundException) {

plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java

@@ -504,7 +504,7 @@ public List<Setting<?>> getSettings() {
                 MLCommonsSettings.ML_COMMONS_NATIVE_MEM_THRESHOLD,
                 MLCommonsSettings.ML_COMMONS_EXCLUDE_NODE_NAMES,
                 MLCommonsSettings.ML_COMMONS_ALLOW_CUSTOM_DEPLOYMENT_PLAN,
-                MLCommonsSettings.ML_COMMONS_ENABLE_MCORR,
+                MLCommonsSettings.ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL,
                 MLCommonsSettings.ML_COMMONS_MODEL_AUTO_REDEPLOY_ENABLE,
                 MLCommonsSettings.ML_COMMONS_MODEL_AUTO_REDEPLOY_LIFETIME_RETRY_TIMES
             );

plugin/src/main/java/org/opensearch/ml/settings/MLCommonsSettings.java

@@ -32,10 +32,8 @@ private MLCommonsSettings() {}
     public static final Setting<Boolean> ML_COMMONS_ONLY_RUN_ON_ML_NODE = Setting
         .boolSetting("plugins.ml_commons.only_run_on_ml_node", true, Setting.Property.NodeScope, Setting.Property.Dynamic);
 
-    // in opensource 2.7 release, we are releasing metrics correlation feature as experimental.
-    // by default this algorithm will be disabled. client needs to explicitly enable this setting
-    public static final Setting<Boolean> ML_COMMONS_ENABLE_MCORR = Setting
-        .boolSetting("plugins.ml_commons.enable_metrics_correlation", false, Setting.Property.NodeScope, Setting.Property.Dynamic);
+    public static final Setting<Boolean> ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL = Setting
+        .boolSetting("plugins.ml_commons.enable_inhouse_python_model", false, Setting.Property.NodeScope, Setting.Property.Dynamic);
     public static final Setting<Integer> ML_COMMONS_SYNC_UP_JOB_INTERVAL_IN_SECONDS = Setting
         .intSetting(
             "plugins.ml_commons.sync_up_job_interval_in_seconds",

plugin/src/main/java/org/opensearch/ml/task/MLExecuteTaskRunner.java

@@ -6,7 +6,7 @@
 package org.opensearch.ml.task;
 
 import static org.opensearch.ml.plugin.MachineLearningPlugin.EXECUTE_THREAD_POOL;
-import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_ENABLE_MCORR;
+import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL;
 
 import lombok.extern.log4j.Log4j2;
 
@@ -42,7 +42,7 @@ public class MLExecuteTaskRunner extends MLTaskRunner<MLExecuteTaskRequest, MLEx
     private final MLInputDatasetHandler mlInputDatasetHandler;
     protected final DiscoveryNodeHelper nodeHelper;
     private final MLEngine mlEngine;
-    private volatile Boolean isMcorrEnabled;
+    private volatile Boolean isPythonModelEnabled;
 
     public MLExecuteTaskRunner(
         ThreadPool threadPool,
@@ -63,8 +63,10 @@ public MLExecuteTaskRunner(
         this.mlInputDatasetHandler = mlInputDatasetHandler;
         this.nodeHelper = nodeHelper;
         this.mlEngine = mlEngine;
-        isMcorrEnabled = ML_COMMONS_ENABLE_MCORR.get(this.clusterService.getSettings());
-        this.clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_ENABLE_MCORR, it -> isMcorrEnabled = it);
+        isPythonModelEnabled = ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL.get(this.clusterService.getSettings());
+        this.clusterService
+            .getClusterSettings()
+            .addSettingsUpdateConsumer(ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL, it -> isPythonModelEnabled = it);
     }
 
     @Override
@@ -96,7 +98,7 @@ protected void executeTask(MLExecuteTaskRequest request, ActionListener<MLExecut
                 Input input = request.getInput();
                 FunctionName functionName = request.getFunctionName();
                 if (FunctionName.METRICS_CORRELATION.equals(functionName)) {
-                    if (!isMcorrEnabled) {
+                    if (!isPythonModelEnabled) {
                         Exception exception = new IllegalArgumentException("This algorithm is not enabled from settings");
                         listener.onFailure(exception);
                         return;

plugin/src/test/java/org/opensearch/ml/action/models/GetModelTransportActionTests.java

@@ -80,7 +80,7 @@ public void testGetModel_NullResponse() {
         getModelTransportAction.doExecute(null, mlModelGetRequest, actionListener);
         ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(Exception.class);
         verify(actionListener).onFailure(argumentCaptor.capture());
-        assertEquals("Fail to find model", argumentCaptor.getValue().getMessage());
+        assertEquals("Failed to find model with the provided model id: test_id", argumentCaptor.getValue().getMessage());
     }
 
     public void testGetModel_RuntimeException() {

plugin/src/test/java/org/opensearch/ml/task/MLExecuteTaskRunnerTests.java

@@ -102,14 +102,14 @@ public void setup() {
         settings = Settings.builder().put(ML_COMMONS_MAX_REGISTER_MODEL_TASKS_PER_NODE.getKey(), 10).build();
         settings = Settings.builder().put(ML_COMMONS_MONITORING_REQUEST_COUNT.getKey(), 10).build();
         settings = Settings.builder().put(ML_COMMONS_MAX_DEPLOY_MODEL_TASKS_PER_NODE.getKey(), 10).build();
-        settings = Settings.builder().put(ML_COMMONS_ENABLE_MCORR.getKey(), false).build();
+        settings = Settings.builder().put(ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL.getKey(), false).build();
         ClusterSettings clusterSettings = clusterSetting(
             settings,
             ML_COMMONS_MAX_MODELS_PER_NODE,
             ML_COMMONS_MAX_REGISTER_MODEL_TASKS_PER_NODE,
             ML_COMMONS_MONITORING_REQUEST_COUNT,
             ML_COMMONS_MAX_DEPLOY_MODEL_TASKS_PER_NODE,
-            ML_COMMONS_ENABLE_MCORR
+            ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL
         );
         clusterService = spy(new ClusterService(settings, clusterSettings, null));
         when(clusterService.getClusterSettings()).thenReturn(clusterSettings);