From c4cf1b22095d501577b7383bfe0f436998653001 Mon Sep 17 00:00:00 2001 From: Dhrubo Saha Date: Mon, 1 Jul 2024 10:13:29 -0700 Subject: [PATCH] removing experimental from the Conversation memory feature (#2592) * removing experimental from the Conversation memory feature Signed-off-by: Dhrubo Saha * reflecting another unit test Signed-off-by: Dhrubo Saha --------- Signed-off-by: Dhrubo Saha --- .../ConversationalIndexConstants.java | 8 ++++--- .../CreateConversationTransportAction.java | 10 +++------ .../CreateInteractionTransportAction.java | 20 +++++++----------- .../DeleteConversationTransportAction.java | 10 +++------ .../GetConversationTransportAction.java | 21 +++++++------------ .../GetConversationsTransportAction.java | 16 ++++++-------- .../GetInteractionTransportAction.java | 20 +++++++----------- .../GetInteractionsTransportAction.java | 20 +++++++----------- .../SearchConversationsTransportAction.java | 10 +++------ .../SearchInteractionsTransportAction.java | 16 ++++++-------- .../UpdateConversationTransportAction.java | 10 +++------ .../UpdateInteractionTransportAction.java | 10 +++------ ...reateConversationTransportActionTests.java | 3 ++- ...CreateInteractionTransportActionTests.java | 3 ++- ...eleteConversationTransportActionTests.java | 3 ++- .../GetConversationTransportActionTests.java | 3 ++- .../GetConversationsTransportActionTests.java | 3 ++- .../GetInteractionTransportActionTests.java | 3 ++- .../GetInteractionsTransportActionTests.java | 3 ++- ...archConversationsTransportActionTests.java | 3 ++- ...archInteractionsTransportActionsTests.java | 3 ++- 21 files changed, 82 insertions(+), 116 deletions(-) diff --git a/common/src/main/java/org/opensearch/ml/common/conversation/ConversationalIndexConstants.java b/common/src/main/java/org/opensearch/ml/common/conversation/ConversationalIndexConstants.java index a2ecced3e3..bf65b778dd 100644 --- a/common/src/main/java/org/opensearch/ml/common/conversation/ConversationalIndexConstants.java +++ b/common/src/main/java/org/opensearch/ml/common/conversation/ConversationalIndexConstants.java @@ -40,7 +40,7 @@ public class ConversationalIndexConstants { /** Mappings for the conversational metadata index */ public final static String META_MAPPING = "{\n" + " \"_meta\": {\n" - + " \"schema_version\": " + META_INDEX_SCHEMA_VERSION + "\n" + + " \"schema_version\": " + META_INDEX_SCHEMA_VERSION + "\n" + " },\n" + " \"properties\": {\n" + " \"" @@ -86,7 +86,7 @@ public class ConversationalIndexConstants { /** Mappings for the interactions index */ public final static String INTERACTIONS_MAPPINGS = "{\n" + " \"_meta\": {\n" - + " \"schema_version\": " + INTERACTIONS_INDEX_SCHEMA_VERSION + "\n" + + " \"schema_version\": " + INTERACTIONS_INDEX_SCHEMA_VERSION + "\n" + " },\n" + " \"properties\": {\n" + " \"" @@ -122,4 +122,6 @@ public class ConversationalIndexConstants { /** Feature Flag setting for conversational memory */ public static final Setting ML_COMMONS_MEMORY_FEATURE_ENABLED = Setting .boolSetting("plugins.ml_commons.memory_feature_enabled", true, Setting.Property.NodeScope, Setting.Property.Dynamic); -} \ No newline at end of file + + public static final String ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE = "The Conversation Memory feature is not enabled. To enable, please update the setting " + ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey(); +} diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportAction.java index c671b3e8e3..0a882b00dd 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import org.opensearch.OpenSearchException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; @@ -72,13 +74,7 @@ public CreateConversationTransportAction( @Override protected void doExecute(Task task, CreateConversationRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } String name = request.getName(); diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportAction.java index cf3a2cf4e1..a4515bcbd4 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import java.util.HashMap; import java.util.Map; @@ -44,8 +46,8 @@ @Log4j2 public class CreateInteractionTransportAction extends HandledTransportAction { - private ConversationalMemoryHandler cmHandler; - private Client client; + private final ConversationalMemoryHandler cmHandler; + private final Client client; private volatile boolean featureIsEnabled; @@ -77,13 +79,7 @@ public CreateInteractionTransportAction( @Override protected void doExecute(Task task, CreateInteractionRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } String cid = request.getConversationId(); @@ -95,18 +91,18 @@ protected void doExecute(Task task, CreateInteractionRequest request, ActionList String parintIid = request.getParentIid(); Integer traceNumber = request.getTraceNumber(); try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { - ActionListener internalListener = ActionListener.runBefore(actionListener, () -> context.restore()); + ActionListener internalListener = ActionListener.runBefore(actionListener, context::restore); ActionListener al = ActionListener.wrap(iid -> { cmHandler.updateConversation(cid, new HashMap<>(), getUpdateResponseListener(cid, iid, internalListener)); log.info("Updating the memory {} after the message {} is created", cid, iid); - }, e -> { internalListener.onFailure(e); }); + }, internalListener::onFailure); if (parintIid == null || traceNumber == null) { cmHandler.createInteraction(cid, inp, prompt, rsp, ogn, additionalInfo, al); } else { cmHandler.createInteraction(cid, inp, prompt, rsp, ogn, additionalInfo, al, parintIid, traceNumber); } } catch (Exception e) { - log.error("Failed to create message for memory " + cid, e); + log.error("Failed to create message for memory {}", cid, e); actionListener.onFailure(e); } } diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportAction.java index 25cb833843..dce6dd4094 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import org.opensearch.OpenSearchException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; @@ -72,13 +74,7 @@ public DeleteConversationTransportAction( @Override public void doExecute(Task task, DeleteConversationRequest request, ActionListener listener) { if (!featureIsEnabled) { - listener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + listener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } String conversationId = request.getId(); diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportAction.java index 31e574229c..bd3f0caa4a 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import org.opensearch.OpenSearchException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; @@ -39,8 +41,8 @@ */ @Log4j2 public class GetConversationTransportAction extends HandledTransportAction { - private Client client; - private ConversationalMemoryHandler cmHandler; + private final Client client; + private final ConversationalMemoryHandler cmHandler; private volatile boolean featureIsEnabled; @@ -72,25 +74,18 @@ public GetConversationTransportAction( @Override public void doExecute(Task task, GetConversationRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } else { String conversationId = request.getConversationId(); try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { - ActionListener internalListener = ActionListener - .runBefore(actionListener, () -> context.restore()); + ActionListener internalListener = ActionListener.runBefore(actionListener, context::restore); ActionListener al = ActionListener.wrap(conversationMeta -> { internalListener.onResponse(new GetConversationResponse(conversationMeta)); - }, e -> { internalListener.onFailure(e); }); + }, internalListener::onFailure); cmHandler.getConversation(conversationId, al); } catch (Exception e) { - log.error("Failed to get memory " + conversationId, e); + log.error("Failed to get memory {}", conversationId, e); actionListener.onFailure(e); } diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportAction.java index 5f1be12a61..fbe30a3762 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import java.util.List; import org.opensearch.OpenSearchException; @@ -42,8 +44,8 @@ @Log4j2 public class GetConversationsTransportAction extends HandledTransportAction { - private Client client; - private ConversationalMemoryHandler cmHandler; + private final Client client; + private final ConversationalMemoryHandler cmHandler; private volatile boolean featureIsEnabled; @@ -75,19 +77,13 @@ public GetConversationsTransportAction( @Override public void doExecute(Task task, GetConversationsRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } int maxResults = request.getMaxResults(); int from = request.getFrom(); try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { - ActionListener internalListener = ActionListener.runBefore(actionListener, () -> context.restore()); + ActionListener internalListener = ActionListener.runBefore(actionListener, context::restore); ActionListener> al = ActionListener.wrap(conversations -> { internalListener .onResponse(new GetConversationsResponse(conversations, from + maxResults, conversations.size() == maxResults)); diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportAction.java index 7d56815c48..32411969ed 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import org.opensearch.OpenSearchException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; @@ -37,8 +39,8 @@ @Log4j2 public class GetInteractionTransportAction extends HandledTransportAction { - private Client client; - private ConversationalMemoryHandler cmHandler; + private final Client client; + private final ConversationalMemoryHandler cmHandler; private volatile boolean featureIsEnabled; @@ -70,24 +72,18 @@ public GetInteractionTransportAction( @Override public void doExecute(Task task, GetInteractionRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } String interactionId = request.getInteractionId(); try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { - ActionListener internalListener = ActionListener.runBefore(actionListener, () -> context.restore()); + ActionListener internalListener = ActionListener.runBefore(actionListener, context::restore); ActionListener al = ActionListener.wrap(interaction -> { internalListener.onResponse(new GetInteractionResponse(interaction)); - }, e -> { internalListener.onFailure(e); }); + }, internalListener::onFailure); cmHandler.getInteraction(interactionId, al); } catch (Exception e) { - log.error("Failed to get message " + interactionId, e); + log.error("Failed to get message {}", interactionId, e); actionListener.onFailure(e); } } diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportAction.java index 5aab5459e3..49a2ebe19b 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import java.util.List; import org.opensearch.OpenSearchException; @@ -42,8 +44,8 @@ @Log4j2 public class GetInteractionsTransportAction extends HandledTransportAction { - private Client client; - private ConversationalMemoryHandler cmHandler; + private final Client client; + private final ConversationalMemoryHandler cmHandler; private volatile boolean featureIsEnabled; @@ -75,26 +77,20 @@ public GetInteractionsTransportAction( @Override public void doExecute(Task task, GetInteractionsRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } int maxResults = request.getMaxResults(); int from = request.getFrom(); try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { - ActionListener internalListener = ActionListener.runBefore(actionListener, () -> context.restore()); + ActionListener internalListener = ActionListener.runBefore(actionListener, context::restore); ActionListener> al = ActionListener.wrap(interactions -> { internalListener .onResponse(new GetInteractionsResponse(interactions, from + maxResults, interactions.size() == maxResults)); - }, e -> { internalListener.onFailure(e); }); + }, internalListener::onFailure); cmHandler.getInteractions(request.getConversationId(), from, maxResults, al); } catch (Exception e) { - log.error("Failed to get messages for memory " + request.getConversationId(), e); + log.error("Failed to get messages for memory {}", request.getConversationId(), e); actionListener.onFailure(e); } diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportAction.java index 93aade9f94..b598d63e25 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import org.opensearch.OpenSearchException; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; @@ -71,13 +73,7 @@ public SearchConversationsTransportAction( @Override public void doExecute(Task task, SearchRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } else { try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportAction.java index 8345ba3433..a378e93dd8 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportAction.java @@ -17,6 +17,8 @@ */ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import org.opensearch.OpenSearchException; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; @@ -37,8 +39,8 @@ @Log4j2 public class SearchInteractionsTransportAction extends HandledTransportAction { - private ConversationalMemoryHandler cmHandler; - private Client client; + private final ConversationalMemoryHandler cmHandler; + private final Client client; private volatile boolean featureIsEnabled; @@ -70,17 +72,11 @@ public SearchInteractionsTransportAction( @Override public void doExecute(Task task, SearchInteractionsRequest request, ActionListener actionListener) { if (!featureIsEnabled) { - actionListener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + actionListener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } else { try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().newStoredContext(true)) { - ActionListener internalListener = ActionListener.runBefore(actionListener, () -> context.restore()); + ActionListener internalListener = ActionListener.runBefore(actionListener, context::restore); cmHandler.searchInteractions(request.getConversationId(), request, internalListener); } catch (Exception e) { log.error("Failed to search memories", e); diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateConversationTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateConversationTransportAction.java index e9fa816a65..cbbb3a7ce0 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateConversationTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateConversationTransportAction.java @@ -5,6 +5,8 @@ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import java.time.Instant; import java.util.Map; @@ -54,13 +56,7 @@ public UpdateConversationTransportAction( @Override protected void doExecute(Task task, ActionRequest request, ActionListener listener) { if (!featureIsEnabled) { - listener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + listener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } else { UpdateConversationRequest updateConversationRequest = UpdateConversationRequest.fromActionRequest(request); diff --git a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateInteractionTransportAction.java b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateInteractionTransportAction.java index 2df5b64cfa..31130f8057 100644 --- a/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateInteractionTransportAction.java +++ b/memory/src/main/java/org/opensearch/ml/memory/action/conversation/UpdateInteractionTransportAction.java @@ -5,6 +5,8 @@ package org.opensearch.ml.memory.action.conversation; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; + import java.util.Map; import org.opensearch.OpenSearchException; @@ -53,13 +55,7 @@ public UpdateInteractionTransportAction( @Override protected void doExecute(Task task, ActionRequest request, ActionListener listener) { if (!featureIsEnabled) { - listener - .onFailure( - new OpenSearchException( - "The experimental Conversation Memory feature is not enabled. To enable, please update the setting " - + ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_ENABLED.getKey() - ) - ); + listener.onFailure(new OpenSearchException(ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE)); return; } UpdateInteractionRequest updateInteractionRequest = UpdateInteractionRequest.fromActionRequest(request); diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportActionTests.java index 575e443461..c6df207d16 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateConversationTransportActionTests.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.util.Set; @@ -161,7 +162,7 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportActionTests.java index 182f4ed79e..2899c3b4d9 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/CreateInteractionTransportActionTests.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.util.Collections; @@ -234,7 +235,7 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportActionTests.java index 3907402906..2ac75b443c 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/DeleteConversationTransportActionTests.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.util.Set; @@ -162,7 +163,7 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportActionTests.java index bb88a5c1ed..83137292db 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationTransportActionTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.time.Instant; @@ -145,6 +146,6 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportActionTests.java index f0cd87f0e4..f349ac6c97 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetConversationsTransportActionTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.time.Instant; @@ -200,6 +201,6 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportActionTests.java index 8f2878e9e7..5778672b80 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionTransportActionTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.time.Instant; @@ -154,6 +155,6 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportActionTests.java index 81f20277f4..6439d5afbb 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/GetInteractionsTransportActionTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.time.Instant; @@ -192,6 +193,6 @@ public void testFeatureDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportActionTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportActionTests.java index 2a43ed0176..1cee8c2ddf 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportActionTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchConversationsTransportActionTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.util.Set; @@ -116,6 +117,6 @@ public void testDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } } diff --git a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportActionsTests.java b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportActionsTests.java index db6c2c20a3..0a22db107d 100644 --- a/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportActionsTests.java +++ b/memory/src/test/java/org/opensearch/ml/memory/action/conversation/SearchInteractionsTransportActionsTests.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ml.common.conversation.ConversationalIndexConstants.ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE; import java.io.IOException; import java.util.Set; @@ -116,7 +117,7 @@ public void testDisabled_ThenFail() { action.doExecute(null, request, actionListener); ArgumentCaptor argCaptor = ArgumentCaptor.forClass(Exception.class); verify(actionListener).onFailure(argCaptor.capture()); - assert (argCaptor.getValue().getMessage().startsWith("The experimental Conversation Memory feature is not enabled.")); + assertEquals(argCaptor.getValue().getMessage(), ML_COMMONS_MEMORY_FEATURE_DISABLED_MESSAGE); } }