Merge branch 'feature/3.4-release-prep' into ag-ui-support

Signed-off-by: Jiaping Zeng <[email protected]>

Author: jiapingzeng

common/src/main/java/org/opensearch/ml/common/CommonValue.java

@@ -28,6 +28,8 @@ public class CommonValue {
     public static final String CREATE_TIME_FIELD = "create_time";
     public static final String LAST_UPDATE_TIME_FIELD = "last_update_time";
 
+    public static final String AGENTIC_MEMORY_THREAD_POOL = "opensearch_ml_agentic_memory";
+
     public static final String BOX_TYPE_KEY = "box_type";
     // hot node
     public static String HOT_BOX_TYPE = "hot";
@@ -54,6 +56,7 @@ public class CommonValue {
     public static final String TASK_POLLING_JOB_INDEX = ".ml_commons_task_polling_job";
     public static final String MCP_SESSION_MANAGEMENT_INDEX = ".plugins-ml-mcp-session-management";
     public static final String MCP_TOOLS_INDEX = ".plugins-ml-mcp-tools";
+    public static final String ML_CONTEXT_MANAGEMENT_TEMPLATES_INDEX = ".plugins-ml-context-management-templates";
     // index created in 3.1 to track all ml jobs created via job scheduler
     public static final String ML_JOBS_INDEX = ".plugins-ml-jobs";
     public static final Set<String> stopWordsIndices = ImmutableSet.of(".plugins-ml-stop-words");
@@ -76,6 +79,7 @@ public class CommonValue {
     public static final String ML_LONG_MEMORY_HISTORY_INDEX_MAPPING_PATH = "index-mappings/ml_memory_long_term_history.json";
     public static final String ML_MCP_SESSION_MANAGEMENT_INDEX_MAPPING_PATH = "index-mappings/ml_mcp_session_management.json";
     public static final String ML_MCP_TOOLS_INDEX_MAPPING_PATH = "index-mappings/ml_mcp_tools.json";
+    public static final String ML_CONTEXT_MANAGEMENT_TEMPLATES_INDEX_MAPPING_PATH = "index-mappings/ml_context_management_templates.json";
     public static final String ML_JOBS_INDEX_MAPPING_PATH = "index-mappings/ml_jobs.json";
     public static final String ML_INDEX_INSIGHT_CONFIG_INDEX_MAPPING_PATH = "index-mappings/ml_index_insight_config.json";
     public static final String ML_INDEX_INSIGHT_STORAGE_INDEX_MAPPING_PATH = "index-mappings/ml_index_insight_storage.json";
@@ -97,6 +101,7 @@ public class CommonValue {
     public static final Version VERSION_3_1_0 = Version.fromString("3.1.0");
     public static final Version VERSION_3_2_0 = Version.fromString("3.2.0");
     public static final Version VERSION_3_3_0 = Version.fromString("3.3.0");
+    public static final Version VERSION_3_4_0 = Version.fromString("3.4.0");
 
     // Connector Constants
     public static final String NAME_FIELD = "name";
@@ -113,6 +118,7 @@ public class CommonValue {
     public static final String CLIENT_CONFIG_FIELD = "client_config";
     public static final String URL_FIELD = "url";
     public static final String HEADERS_FIELD = "headers";
+    public static final String CONNECTOR_ACTION_FIELD = "connector_action";
 
     // MCP Constants
     public static final String MCP_TOOL_NAME_FIELD = "name";

common/src/main/java/org/opensearch/ml/common/MLAgentType.java

@@ -21,7 +21,7 @@ public static MLAgentType from(String value) {
         try {
             return MLAgentType.valueOf(value.toUpperCase(Locale.ROOT));
         } catch (Exception e) {
-            throw new IllegalArgumentException("Wrong Agent type");
+            throw new IllegalArgumentException(value + " is not a valid Agent Type");
         }
     }
 }

common/src/main/java/org/opensearch/ml/common/MLMemoryType.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.ml.common;
+
+import java.util.Locale;
+
+public enum MLMemoryType {
+    CONVERSATION_INDEX,
+    AGENTIC_MEMORY,
+    REMOTE_AGENTIC_MEMORY;
+
+    public static MLMemoryType from(String value) {
+        if (value != null) {
+            try {
+                return MLMemoryType.valueOf(value.toUpperCase(Locale.ROOT));
+            } catch (Exception e) {
+                throw new IllegalArgumentException("Wrong Memory type");
+            }
+        }
+        return null;
+    }
+}

common/src/main/java/org/opensearch/ml/common/MLModel.java

@@ -882,14 +882,14 @@ public Tags getTags(Connector connector) {
      * - The service provider (e.g., bedrock, sagemaker, azure, etc.)
      * - The specific model being used
      * - The model type (e.g., llm, embedding, image_generation, speech_audio)
-     * 
+     *
      * The method attempts to extract this information in the following order:
      * 1. From the predict action URL (for service provider and some model identifiers)
      * 2. From the request body JSON (for model name)
      * 3. From the connector parameters (as a fallback for model name)
-     * 
+     *
      * If any information cannot be determined, it will be marked as "unknown" in the tags.
-     * 
+     *
      * @param connector The connector associated with the remote model, containing the predict action configuration
      * @return Tags object containing deployment type, service provider, algorithm, model name, and model type
      * @throws RuntimeException if there are issues parsing the connector configuration
@@ -958,10 +958,10 @@ Tags getRemoteModelTags(Connector connector) {
      * - textract
      * - mistral
      * - x.ai
-     * 
+     *
      * If no matching provider keyword is found in the URL,
      * returns "unknown" as the service provider.
-     * 
+     *
      * @param url The URL to analyze for service provider identification
      * @return The identified service provider name, or "unknown" if not found
      */
@@ -981,10 +981,10 @@ String identifyServiceProvider(String url) {
      * 1. For Bedrock models: Extracts model name from the URL path after '/model/'
      * 2. From request body JSON: Checks for 'model' or 'ModelName' fields
      * 3. From connector parameters: Uses the 'model' parameter if available
-     * 
+     *
      * If the model name cannot be determined through any of these methods,
      * returns "unknown".
-     * 
+     *
      * @param provider The service provider (e.g., bedrock, sagemaker, azure)
      * @param url The predict action URL from the connector
      * @param requestBody The JSON request body from the predict action
@@ -1041,10 +1041,10 @@ private static boolean containsAny(String target, List<String> keywords) {
      * - Embedding: checks for keywords like "embedding", "embed", "ada", etc.
      * - Image Generation: checks for keywords like "diffusion", "dall-e", "imagen", etc.
      * - Speech/Audio: checks for keywords like "whisper", "audio", "speech", etc.
-     * 
+     *
      * If no matching keywords are found or if the model name is null/unknown,
      * returns "unknown" as the model type.
-     * 
+     *
      * @param model The name of the model to identify
      * @return The identified model type (llm, embedding, image_generation, speech_audio, or unknown)
      */
@@ -1079,14 +1079,14 @@ String identifyModelType(String model) {
      * Generates tags for a pre-trained ML model based on its name and configuration.
      * This method is specifically designed for models that follow the naming convention
      * "provider/algorithm/model" (e.g., "amazon/bert/model-name" or "huggingface/bert/model-name").
-     * 
+     *
      * The method extracts the following information:
      * - Service provider from the first part of the model name
      * - Algorithm from the model's algorithm field
      * - Model name from the third part of the model name
      * - Model type from the model configuration (if available)
      * - Model format from the model's format field (if available)
-     * 
+     *
      * @return Tags object containing deployment type (pre-trained), service provider,
      *         algorithm, model name, model type, and model format (if available)
      */
@@ -1117,11 +1117,11 @@ Tags getPreTrainedModelTags() {
      * Generates tags for a custom ML model based on its configuration.
      * This method is used for models that do not follow the pre-trained naming convention
      * (e.g., "model-name" or "model-name/model-name").
-     * 
+     *
      * The method extracts the following information:
      * - Model type from the model configuration (if available)
      * - Model format from the model's format field (if available)
-     * 
+     *
      * @return Tags object containing deployment type (custom), algorithm, and model type (if available)
      */
     @VisibleForTesting