Remove feature flag for execute tool API

Signed-off-by: Nathalie Jonathan <nathhjo@amazon.com>

Author: nathaliellenaa

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

@@ -337,12 +337,6 @@ private MLCommonsSettings() {}
             Setting.Property.Dynamic
         );
 
-    // Feature flag for execute tool API
-    public static final Setting<Boolean> ML_COMMONS_EXECUTE_TOOL_ENABLED = Setting
-        .boolSetting(ML_PLUGIN_SETTING_PREFIX + "execute_tools_enabled", false, Setting.Property.NodeScope, Setting.Property.Dynamic);
-    public static final String ML_COMMONS_EXECUTE_TOOL_DISABLED_MESSAGE =
-        "The Execute Tool API is not enabled. To enable, please update the setting " + ML_COMMONS_EXECUTE_TOOL_ENABLED.getKey();
-
     public static final Setting<List<String>> ML_COMMONS_REMOTE_JOB_STATUS_FIELD = Setting
         .listSetting(
             ML_PLUGIN_SETTING_PREFIX + "remote_job.status_field",

common/src/main/java/org/opensearch/ml/common/settings/MLFeatureEnabledSetting.java

@@ -9,7 +9,6 @@
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_FRAMEWORK_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONNECTOR_PRIVATE_IP_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONTROLLER_ENABLED;
-import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_EXECUTE_TOOL_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_INDEX_INSIGHT_FEATURE_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_MCP_CONNECTOR_ENABLED;
@@ -54,8 +53,6 @@ public class MLFeatureEnabledSetting {
     private volatile Boolean isMetricCollectionEnabled;
     private volatile Boolean isStaticMetricCollectionEnabled;
 
-    private volatile Boolean isExecuteToolEnabled;
-
     private volatile Boolean isMcpConnectorEnabled;
 
     private volatile Boolean isAgenticMemoryEnabled;
@@ -79,7 +76,6 @@ public MLFeatureEnabledSetting(ClusterService clusterService, Settings settings)
         isRagSearchPipelineEnabled = ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED.get(settings);
         isMetricCollectionEnabled = ML_COMMONS_METRIC_COLLECTION_ENABLED.get(settings);
         isStaticMetricCollectionEnabled = ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED.get(settings);
-        isExecuteToolEnabled = ML_COMMONS_EXECUTE_TOOL_ENABLED.get(settings);
         isMcpConnectorEnabled = ML_COMMONS_MCP_CONNECTOR_ENABLED.get(settings);
         isAgenticMemoryEnabled = ML_COMMONS_AGENTIC_MEMORY_ENABLED.get(settings);
         isIndexInsightEnabled = ML_COMMONS_INDEX_INSIGHT_FEATURE_ENABLED.get(settings);
@@ -106,7 +102,6 @@ public MLFeatureEnabledSetting(ClusterService clusterService, Settings settings)
         clusterService
             .getClusterSettings()
             .addSettingsUpdateConsumer(MLCommonsSettings.ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED, it -> isRagSearchPipelineEnabled = it);
-        clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_EXECUTE_TOOL_ENABLED, it -> isExecuteToolEnabled = it);
         clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_MCP_CONNECTOR_ENABLED, it -> isMcpConnectorEnabled = it);
         clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_AGENTIC_MEMORY_ENABLED, it -> isAgenticMemoryEnabled = it);
         clusterService.getClusterSettings().addSettingsUpdateConsumer(ML_COMMONS_STREAM_ENABLED, it -> isStreamEnabled = it);
@@ -209,14 +204,6 @@ public boolean isStaticMetricCollectionEnabled() {
         return isStaticMetricCollectionEnabled;
     }
 
-    /**
-     * Whether the execute tool API is enabled. If disabled, execute tool API in ml-commons will be blocked
-     * @return whether the execute tool API is enabled.
-     */
-    public boolean isToolExecuteEnabled() {
-        return isExecuteToolEnabled;
-    }
-
     /**
      * Whether the Agentic memory APIs are enabled. If disabled, Agentic memory APIs in ml-commons will be blocked
      * @return whether the agentic memory feature is enabled.

common/src/test/java/org/opensearch/ml/common/settings/MLFeatureEnabledSettingTests.java

@@ -44,7 +44,6 @@ public void setUp() {
                     MLCommonsSettings.ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED,
                     MLCommonsSettings.ML_COMMONS_METRIC_COLLECTION_ENABLED,
                     MLCommonsSettings.ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED,
-                    MLCommonsSettings.ML_COMMONS_EXECUTE_TOOL_ENABLED,
                     MLCommonsSettings.ML_COMMONS_MCP_CONNECTOR_ENABLED,
                     MLCommonsSettings.ML_COMMONS_AGENTIC_MEMORY_ENABLED,
                     MLCommonsSettings.ML_COMMONS_INDEX_INSIGHT_FEATURE_ENABLED,

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

@@ -1359,7 +1359,6 @@ public List<Setting<?>> getSettings() {
                 MLCommonsSettings.ML_COMMONS_MCP_SERVER_ENABLED,
                 MLCommonsSettings.ML_COMMONS_METRIC_COLLECTION_ENABLED,
                 MLCommonsSettings.ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED,
-                MLCommonsSettings.ML_COMMONS_EXECUTE_TOOL_ENABLED,
                 MLCommonsSettings.ML_COMMONS_AGENTIC_MEMORY_ENABLED,
                 MLCommonsSettings.ML_COMMONS_INDEX_INSIGHT_FEATURE_ENABLED,
                 MLCommonsSettings.REMOTE_METADATA_GLOBAL_TENANT_ID,

plugin/src/main/java/org/opensearch/ml/rest/RestMLExecuteAction.java

@@ -8,7 +8,6 @@
 import static org.opensearch.core.rest.RestStatus.BAD_REQUEST;
 import static org.opensearch.core.rest.RestStatus.INTERNAL_SERVER_ERROR;
 import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
-import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_EXECUTE_TOOL_DISABLED_MESSAGE;
 import static org.opensearch.ml.plugin.MachineLearningPlugin.ML_BASE_URI;
 import static org.opensearch.ml.utils.MLExceptionUtils.AGENT_FRAMEWORK_DISABLED_ERR_MSG;
 import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_AGENT_ID;
@@ -129,9 +128,6 @@ MLExecuteTaskRequest getRequest(RestRequest request) throws IOException {
             ((AgentMLInput) input).setTenantId(tenantId);
             ((AgentMLInput) input).setIsAsync(async);
         } else if (uri.startsWith(ML_BASE_URI + "/tools/")) {
-            if (!mlFeatureEnabledSetting.isToolExecuteEnabled()) {
-                throw new IllegalStateException(ML_COMMONS_EXECUTE_TOOL_DISABLED_MESSAGE);
-            }
             String toolName = request.param(PARAMETER_TOOL_NAME);
             functionName = FunctionName.TOOL;
             input = MLInput.parse(parser, functionName.name());

plugin/src/test/java/org/opensearch/ml/rest/RestMLExecuteActionTests.java

@@ -75,7 +75,6 @@ public class RestMLExecuteActionTests extends OpenSearchTestCase {
     public void setup() {
         MockitoAnnotations.openMocks(this);
         when(mlFeatureEnabledSetting.isAgentFrameworkEnabled()).thenReturn(true);
-        when(mlFeatureEnabledSetting.isToolExecuteEnabled()).thenReturn(true);
         restMLExecuteAction = new RestMLExecuteAction(mlFeatureEnabledSetting);
 
         threadPool = new TestThreadPool(this.getClass().getSimpleName() + "ThreadPool");
@@ -230,13 +229,6 @@ public void testPrepareRequest_disabled() {
         assertThrows(IllegalStateException.class, () -> restMLExecuteAction.handleRequest(request, channel, client));
     }
 
-    public void testPrepareRequestToolExecute_disabled() {
-        RestRequest request = getExecuteToolRestRequest();
-
-        when(mlFeatureEnabledSetting.isToolExecuteEnabled()).thenReturn(false);
-        assertThrows(IllegalStateException.class, () -> restMLExecuteAction.handleRequest(request, channel, client));
-    }
-
     public void testPrepareRequestClientException() throws Exception {
         doAnswer(invocation -> {
             ActionListener<MLExecuteTaskResponse> actionListener = invocation.getArgument(2);

plugin/src/test/java/org/opensearch/ml/settings/MLFeatureEnabledSettingTests.java

@@ -15,7 +15,6 @@
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_FRAMEWORK_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONNECTOR_PRIVATE_IP_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONTROLLER_ENABLED;
-import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_EXECUTE_TOOL_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_INDEX_INSIGHT_FEATURE_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_MCP_CONNECTOR_ENABLED;
@@ -76,7 +75,6 @@ public void setUp() {
                             ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED,
                             ML_COMMONS_METRIC_COLLECTION_ENABLED,
                             ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED,
-                            ML_COMMONS_EXECUTE_TOOL_ENABLED,
                             ML_COMMONS_AGENTIC_MEMORY_ENABLED,
                             ML_COMMONS_MCP_CONNECTOR_ENABLED,
                             ML_COMMONS_INDEX_INSIGHT_FEATURE_ENABLED,
@@ -121,20 +119,4 @@ public void testMetricCollectionSettings() {
         assertFalse(mlFeatureEnabledSetting.isMetricCollectionEnabled());
         assertTrue(mlFeatureEnabledSetting.isStaticMetricCollectionEnabled());
     }
-
-    @Test
-    public void testToolExecuteSettings() {
-        // Test initial values
-        assertFalse(mlFeatureEnabledSetting.isToolExecuteEnabled());
-
-        // Simulate settings change
-        Settings newSettings = Settings.builder().put(ML_COMMONS_EXECUTE_TOOL_ENABLED.getKey(), true).build();
-
-        // Update settings through cluster service
-        when(clusterService.getSettings()).thenReturn(newSettings);
-        mlFeatureEnabledSetting = new MLFeatureEnabledSetting(clusterService, newSettings);
-
-        // Verify updated values
-        assertTrue(mlFeatureEnabledSetting.isToolExecuteEnabled());
-    }
 }