Skip to content

Commit 9e417e6

Browse files
dhrubo-osdhrubo-os
authored
moving ML-Commons Settings from plugin module to common module (#3764)
* moving ML-Commons Settings from plugin module to commond module Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * addressed comment Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * removed extra semi colon Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * apply spotless Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * added unit tests for the settings classes Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> --------- Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>
1 parent 8ba07fe commit 9e417e6

File tree

218 files changed

+567
-387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+567
-387
lines changed

‎common/src/main/java/org/opensearch/ml/common/conversation/ConversationalIndexConstants.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
*/
1818
package org.opensearch.ml.common.conversation;
1919

20-
import org.opensearch.common.settings.Setting;
20+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED;
21+
2122
import org.opensearch.ml.common.MLIndex;
2223

2324
/**
@@ -66,10 +67,6 @@ public class ConversationalIndexConstants {
6667
/** Mappings for the interactions index */
6768
public final static String INTERACTIONS_MAPPINGS = MLIndex.MEMORY_MESSAGE.getMapping();
6869

69-
/** Feature Flag setting for conversational memory */
70-
public static final Setting<Boolean> ML_COMMONS_MEMORY_FEATURE_ENABLED = Setting
71-
.boolSetting("plugins.ml_commons.memory_feature_enabled", true, Setting.Property.NodeScope, Setting.Property.Dynamic);
72-
7370
public static final String ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE =
7471
"The Conversation Memory feature is not enabled. To enable, please update the setting "
7572
+ ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey();

‎plugin/src/main/java/org/opensearch/ml/settings/MLCommonsSettings.java renamed to ‎common/src/main/java/org/opensearch/ml/common/settings/MLCommonsSettings.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.ml.settings;
6+
package org.opensearch.ml.common.settings;
77

88
import static org.opensearch.remote.metadata.common.CommonValue.REMOTE_METADATA_ENDPOINT_KEY;
99
import static org.opensearch.remote.metadata.common.CommonValue.REMOTE_METADATA_REGION_KEY;
@@ -17,8 +17,6 @@
1717
import org.opensearch.core.common.unit.ByteSizeUnit;
1818
import org.opensearch.core.common.unit.ByteSizeValue;
1919
import org.opensearch.ml.common.CommonValue;
20-
import org.opensearch.ml.common.conversation.ConversationalIndexConstants;
21-
import org.opensearch.searchpipelines.questionanswering.generative.GenerativeQAProcessorConstants;
2220

2321
import com.google.common.collect.ImmutableList;
2422

@@ -215,13 +213,15 @@ private MLCommonsSettings() {}
215213
Setting.Property.Dynamic
216214
);
217215

218-
public static final Setting<Boolean> ML_COMMONS_MEMORY_FEATURE_ENABLED = ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED;
216+
/** Feature Flag setting for conversational memory */
217+
public static final Setting<Boolean> ML_COMMONS_MEMORY_FEATURE_ENABLED = Setting
218+
.boolSetting("plugins.ml_commons.memory_feature_enabled", true, Setting.Property.NodeScope, Setting.Property.Dynamic);
219219

220220
public static final Setting<Boolean> ML_COMMONS_MCP_FEATURE_ENABLED = CommonValue.ML_COMMONS_MCP_FEATURE_ENABLED;
221221

222222
// Feature flag for enabling search processors for Retrieval Augmented Generation using OpenSearch and Remote Inference.
223-
public static final Setting<Boolean> ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED =
224-
GenerativeQAProcessorConstants.RAG_PIPELINE_FEATURE_ENABLED;
223+
public static final Setting<Boolean> ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED = Setting
224+
.boolSetting("plugins.ml_commons.rag_pipeline_feature_enabled", true, Setting.Property.NodeScope, Setting.Property.Dynamic);
225225

226226
// This setting is to enable/disable agent related API register/execute/delete/get/search agent.
227227
public static final Setting<Boolean> ML_COMMONS_AGENT_FRAMEWORK_ENABLED = Setting

‎plugin/src/main/java/org/opensearch/ml/settings/MLFeatureEnabledSetting.java renamed to ‎common/src/main/java/org/opensearch/ml/common/settings/MLFeatureEnabledSetting.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@
55
*
66
*/
77

8-
package org.opensearch.ml.settings;
8+
package org.opensearch.ml.common.settings;
99

10-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_AGENT_FRAMEWORK_ENABLED;
11-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_CONNECTOR_PRIVATE_IP_ENABLED;
12-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_CONTROLLER_ENABLED;
13-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ENABLED;
14-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_MULTI_TENANCY_ENABLED;
15-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_OFFLINE_BATCH_INFERENCE_ENABLED;
16-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_OFFLINE_BATCH_INGESTION_ENABLED;
17-
import static org.opensearch.ml.settings.MLCommonsSettings.ML_COMMONS_REMOTE_INFERENCE_ENABLED;
10+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_FRAMEWORK_ENABLED;
11+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONNECTOR_PRIVATE_IP_ENABLED;
12+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONTROLLER_ENABLED;
13+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ENABLED;
14+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_MULTI_TENANCY_ENABLED;
15+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_OFFLINE_BATCH_INFERENCE_ENABLED;
16+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_OFFLINE_BATCH_INGESTION_ENABLED;
17+
import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_REMOTE_INFERENCE_ENABLED;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
2121
import java.util.concurrent.atomic.AtomicBoolean;
2222

2323
import org.opensearch.cluster.service.ClusterService;
2424
import org.opensearch.common.settings.Settings;
25-
import org.opensearch.ml.common.settings.SettingsChangeListener;
2625

2726
import com.google.common.annotations.VisibleForTesting;
2827

@@ -137,7 +136,7 @@ public void addListener(SettingsChangeListener listener) {
137136
}
138137

139138
@VisibleForTesting
140-
void notifyMultiTenancyListeners(boolean isEnabled) {
139+
public void notifyMultiTenancyListeners(boolean isEnabled) {
141140
for (SettingsChangeListener listener : listeners) {
142141
listener.onMultiTenancyEnabledChanged(isEnabled);
143142
}

‎common/src/test/java/org/opensearch/ml/common/settings/MLCommonsSettingsTests.java

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package org.opensearch.ml.common.settings;
7+
8+
import static org.junit.Assert.assertEquals;
9+
import static org.junit.Assert.assertFalse;
10+
import static org.junit.Assert.assertTrue;
11+
12+
import java.util.List;
13+
14+
import org.junit.Test;
15+
import org.opensearch.core.common.unit.ByteSizeUnit;
16+
import org.opensearch.core.common.unit.ByteSizeValue;
17+
18+
public class MLCommonsSettingsTests {
19+
20+
@Test
21+
public void testMaxModelsPerNodeDefaultValue() {
22+
assertEquals(10, MLCommonsSettings.ML_COMMONS_MAX_MODELS_PER_NODE.getDefault(null).intValue());
23+
}
24+
25+
@Test
26+
public void testOnlyRunOnMLNodeDefaultValue() {
27+
assertTrue(MLCommonsSettings.ML_COMMONS_ONLY_RUN_ON_ML_NODE.getDefault(null));
28+
}
29+
30+
@Test
31+
public void testInHousePythonModelDisabledByDefault() {
32+
assertFalse(MLCommonsSettings.ML_COMMONS_ENABLE_INHOUSE_PYTHON_MODEL.getDefault(null));
33+
}
34+
35+
@Test
36+
public void testDiskFreeSpaceThresholdDefault() {
37+
ByteSizeValue expected = new ByteSizeValue(5L, ByteSizeUnit.GB);
38+
assertEquals(expected, MLCommonsSettings.ML_COMMONS_DISK_FREE_SPACE_THRESHOLD.getDefault(null));
39+
}
40+
41+
@Test
42+
public void testTrustedUrlRegexDefault() {
43+
String expectedRegex = "^(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]";
44+
assertEquals(expectedRegex, MLCommonsSettings.ML_COMMONS_TRUSTED_URL_REGEX.getDefault(null));
45+
}
46+
47+
@Test
48+
public void testRemoteModelEligibleNodeRolesDefault() {
49+
List<String> expected = List.of("data", "ml");
50+
assertEquals(expected, MLCommonsSettings.ML_COMMONS_REMOTE_MODEL_ELIGIBLE_NODE_ROLES.getDefault(null));
51+
}
52+
53+
@Test
54+
public void testLocalModelEligibleNodeRolesDefault() {
55+
List<String> expected = List.of("data", "ml");
56+
assertEquals(expected, MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ELIGIBLE_NODE_ROLES.getDefault(null));
57+
}
58+
59+
@Test
60+
public void testMultiTenancyDisabledByDefault() {
61+
assertFalse(MLCommonsSettings.ML_COMMONS_MULTI_TENANCY_ENABLED.getDefault(null));
62+
}
63+
64+
@Test
65+
public void testRemoteInferenceEnabledByDefault() {
66+
assertTrue(MLCommonsSettings.ML_COMMONS_REMOTE_INFERENCE_ENABLED.getDefault(null));
67+
}
68+
69+
@Test
70+
public void testAllowModelUrlDisabledByDefault() {
71+
assertFalse(MLCommonsSettings.ML_COMMONS_ALLOW_MODEL_URL.getDefault(null));
72+
}
73+
}

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package org.opensearch.ml.common.settings;
7+
8+
import static org.junit.Assert.assertFalse;
9+
import static org.junit.Assert.assertTrue;
10+
import static org.mockito.Mockito.mock;
11+
import static org.mockito.Mockito.verify;
12+
import static org.mockito.Mockito.when;
13+
14+
import java.util.Set;
15+
16+
import org.junit.Before;
17+
import org.junit.Test;
18+
import org.opensearch.cluster.service.ClusterService;
19+
import org.opensearch.common.settings.ClusterSettings;
20+
import org.opensearch.common.settings.Settings;
21+
22+
public class MLFeatureEnabledSettingTests {
23+
24+
private ClusterService mockClusterService;
25+
private ClusterSettings mockClusterSettings;
26+
27+
@Before
28+
public void setUp() {
29+
mockClusterService = mock(ClusterService.class);
30+
// Create a real ClusterSettings instance with an empty set of registered settings
31+
mockClusterSettings = new ClusterSettings(
32+
Settings.EMPTY,
33+
Set
34+
.of(
35+
MLCommonsSettings.ML_COMMONS_REMOTE_INFERENCE_ENABLED,
36+
MLCommonsSettings.ML_COMMONS_AGENT_FRAMEWORK_ENABLED,
37+
MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ENABLED,
38+
MLCommonsSettings.ML_COMMONS_CONNECTOR_PRIVATE_IP_ENABLED,
39+
MLCommonsSettings.ML_COMMONS_CONTROLLER_ENABLED,
40+
MLCommonsSettings.ML_COMMONS_OFFLINE_BATCH_INGESTION_ENABLED,
41+
MLCommonsSettings.ML_COMMONS_OFFLINE_BATCH_INFERENCE_ENABLED,
42+
MLCommonsSettings.ML_COMMONS_MULTI_TENANCY_ENABLED
43+
)
44+
);
45+
when(mockClusterService.getClusterSettings()).thenReturn(mockClusterSettings);
46+
}
47+
48+
@Test
49+
public void testDefaults_allFeaturesEnabled() {
50+
Settings settings = Settings
51+
.builder()
52+
.put("plugins.ml_commons.remote_inference.enabled", true)
53+
.put("plugins.ml_commons.agent_framework_enabled", true)
54+
.put("plugins.ml_commons.local_model.enabled", true)
55+
.put("plugins.ml_commons.connector.private_ip_enabled", true)
56+
.put("plugins.ml_commons.controller_enabled", true)
57+
.put("plugins.ml_commons.offline_batch_ingestion_enabled", true)
58+
.put("plugins.ml_commons.offline_batch_inference_enabled", true)
59+
.put("plugins.ml_commons.multi_tenancy_enabled", true)
60+
.build();
61+
62+
MLFeatureEnabledSetting setting = new MLFeatureEnabledSetting(mockClusterService, settings);
63+
64+
assertTrue(setting.isRemoteInferenceEnabled());
65+
assertTrue(setting.isAgentFrameworkEnabled());
66+
assertTrue(setting.isLocalModelEnabled());
67+
assertTrue(setting.isConnectorPrivateIpEnabled().get());
68+
assertTrue(setting.isControllerEnabled());
69+
assertTrue(setting.isOfflineBatchIngestionEnabled());
70+
assertTrue(setting.isOfflineBatchInferenceEnabled());
71+
assertTrue(setting.isMultiTenancyEnabled());
72+
}
73+
74+
@Test
75+
public void testDefaults_someFeaturesDisabled() {
76+
Settings settings = Settings
77+
.builder()
78+
.put("plugins.ml_commons.remote_inference.enabled", false)
79+
.put("plugins.ml_commons.agent_framework_enabled", false)
80+
.put("plugins.ml_commons.local_model.enabled", false)
81+
.put("plugins.ml_commons.connector.private_ip_enabled", false)
82+
.put("plugins.ml_commons.controller_enabled", false)
83+
.put("plugins.ml_commons.offline_batch_ingestion_enabled", false)
84+
.put("plugins.ml_commons.offline_batch_inference_enabled", false)
85+
.put("plugins.ml_commons.multi_tenancy_enabled", false)
86+
.build();
87+
88+
MLFeatureEnabledSetting setting = new MLFeatureEnabledSetting(mockClusterService, settings);
89+
90+
assertFalse(setting.isRemoteInferenceEnabled());
91+
assertFalse(setting.isAgentFrameworkEnabled());
92+
assertFalse(setting.isLocalModelEnabled());
93+
assertFalse(setting.isConnectorPrivateIpEnabled().get());
94+
assertFalse(setting.isControllerEnabled());
95+
assertFalse(setting.isOfflineBatchIngestionEnabled());
96+
assertFalse(setting.isOfflineBatchInferenceEnabled());
97+
assertFalse(setting.isMultiTenancyEnabled());
98+
}
99+
100+
@Test
101+
public void testMultiTenancyChangeNotifiesListeners() {
102+
Settings settings = Settings.builder().put("plugins.ml_commons.multi_tenancy_enabled", false).build();
103+
104+
MLFeatureEnabledSetting setting = new MLFeatureEnabledSetting(mockClusterService, settings);
105+
106+
SettingsChangeListener mockListener = mock(SettingsChangeListener.class);
107+
setting.addListener(mockListener);
108+
109+
setting.notifyMultiTenancyListeners(true);
110+
verify(mockListener).onMultiTenancyEnabledChanged(true);
111+
}
112+
}

‎memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.opensearch.common.inject.Inject;
2929
import org.opensearch.common.util.concurrent.ThreadContext;
3030
import org.opensearch.core.action.ActionListener;
31-
import org.opensearch.ml.common.conversation.ConversationalIndexConstants;
31+
import org.opensearch.ml.common.settings.MLCommonsSettings;
3232
import org.opensearch.ml.memory.ConversationalMemoryHandler;
3333
import org.opensearch.ml.memory.index.OpenSearchConversationalMemoryHandler;
3434
import org.opensearch.tasks.Task;
@@ -67,10 +67,10 @@ public CreateConversationTransportAction(
6767
super(CreateConversationAction.NAME, transportService, actionFilters, CreateConversationRequest::new);
6868
this.cmHandler = cmHandler;
6969
this.client = client;
70-
this.featureIsEnabled = ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
70+
this.featureIsEnabled = MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
7171
clusterService
7272
.getClusterSettings()
73-
.addSettingsUpdateConsumer(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
73+
.addSettingsUpdateConsumer(MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
7474
}
7575

7676
@Override

‎memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.opensearch.common.inject.Inject;
3232
import org.opensearch.common.util.concurrent.ThreadContext;
3333
import org.opensearch.core.action.ActionListener;
34-
import org.opensearch.ml.common.conversation.ConversationalIndexConstants;
34+
import org.opensearch.ml.common.settings.MLCommonsSettings;
3535
import org.opensearch.ml.memory.ConversationalMemoryHandler;
3636
import org.opensearch.ml.memory.index.OpenSearchConversationalMemoryHandler;
3737
import org.opensearch.tasks.Task;
@@ -70,10 +70,10 @@ public CreateInteractionTransportAction(
7070
super(CreateInteractionAction.NAME, transportService, actionFilters, CreateInteractionRequest::new);
7171
this.client = client;
7272
this.cmHandler = cmHandler;
73-
this.featureIsEnabled = ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
73+
this.featureIsEnabled = MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
7474
clusterService
7575
.getClusterSettings()
76-
.addSettingsUpdateConsumer(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
76+
.addSettingsUpdateConsumer(MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
7777
}
7878

7979
@Override

‎memory/src/main/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.opensearch.common.inject.Inject;
2727
import org.opensearch.common.util.concurrent.ThreadContext;
2828
import org.opensearch.core.action.ActionListener;
29-
import org.opensearch.ml.common.conversation.ConversationalIndexConstants;
29+
import org.opensearch.ml.common.settings.MLCommonsSettings;
3030
import org.opensearch.ml.memory.ConversationalMemoryHandler;
3131
import org.opensearch.ml.memory.index.OpenSearchConversationalMemoryHandler;
3232
import org.opensearch.tasks.Task;
@@ -65,10 +65,10 @@ public DeleteConversationTransportAction(
6565
super(DeleteConversationAction.NAME, transportService, actionFilters, DeleteConversationRequest::new);
6666
this.client = client;
6767
this.cmHandler = cmHandler;
68-
this.featureIsEnabled = ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
68+
this.featureIsEnabled = MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
6969
clusterService
7070
.getClusterSettings()
71-
.addSettingsUpdateConsumer(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
71+
.addSettingsUpdateConsumer(MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
7272
}
7373

7474
@Override

‎memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.opensearch.common.util.concurrent.ThreadContext;
2828
import org.opensearch.core.action.ActionListener;
2929
import org.opensearch.ml.common.conversation.ConversationMeta;
30-
import org.opensearch.ml.common.conversation.ConversationalIndexConstants;
30+
import org.opensearch.ml.common.settings.MLCommonsSettings;
3131
import org.opensearch.ml.memory.ConversationalMemoryHandler;
3232
import org.opensearch.ml.memory.index.OpenSearchConversationalMemoryHandler;
3333
import org.opensearch.tasks.Task;
@@ -65,10 +65,10 @@ public GetConversationTransportAction(
6565
super(GetConversationAction.NAME, transportService, actionFilters, GetConversationRequest::new);
6666
this.client = client;
6767
this.cmHandler = cmHandler;
68-
this.featureIsEnabled = ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
68+
this.featureIsEnabled = MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
6969
clusterService
7070
.getClusterSettings()
71-
.addSettingsUpdateConsumer(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
71+
.addSettingsUpdateConsumer(MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
7272
}
7373

7474
@Override

‎memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.opensearch.common.util.concurrent.ThreadContext;
3030
import org.opensearch.core.action.ActionListener;
3131
import org.opensearch.ml.common.conversation.ConversationMeta;
32-
import org.opensearch.ml.common.conversation.ConversationalIndexConstants;
32+
import org.opensearch.ml.common.settings.MLCommonsSettings;
3333
import org.opensearch.ml.memory.ConversationalMemoryHandler;
3434
import org.opensearch.ml.memory.index.OpenSearchConversationalMemoryHandler;
3535
import org.opensearch.tasks.Task;
@@ -68,10 +68,10 @@ public GetConversationsTransportAction(
6868
super(GetConversationsAction.NAME, transportService, actionFilters, GetConversationsRequest::new);
6969
this.client = client;
7070
this.cmHandler = cmHandler;
71-
this.featureIsEnabled = ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
71+
this.featureIsEnabled = MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED.get(clusterService.getSettings());
7272
clusterService
7373
.getClusterSettings()
74-
.addSettingsUpdateConsumer(ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
74+
.addSettingsUpdateConsumer(MLCommonsSettings.ML_COMMONS_MEMORY_FEATURE_ENABLED, it -> featureIsEnabled = it);
7575
}
7676

7777
@Override

0 commit comments

Comments
 (0)