Use Default Query

Signed-off-by: rithin-pullela-aws <rithinp@amazon.com>

Author: rithin-pullela-aws

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/QueryPlanningTool.java

@@ -472,7 +472,7 @@ private Parser createParserWithDefaultExtractJson(Map<String, Object> params) {
             Map<String, Object> extractJsonConfig = new HashMap<>();
             extractJsonConfig.put("type", "extract_json");
             extractJsonConfig.put("extract_type", "object"); // Extract JSON objects only
-            extractJsonConfig.put("default", DEFAULT_SEARCH_TEMPLATE); // Return default search template if no JSON found
+            extractJsonConfig.put("default", DEFAULT_QUERY); // Return default match all query if no JSON found
 
             // Combine: default extract_json first, then any custom processors
             List<Map<String, Object>> combinedProcessorConfigs = new ArrayList<>();

ml-algorithms/src/test/java/org/opensearch/ml/engine/tools/QueryPlanningToolTests.java

@@ -20,8 +20,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.opensearch.ml.common.utils.StringUtils.gson;
+import static org.opensearch.ml.engine.tools.QueryPlanningPromptTemplate.DEFAULT_QUERY;
 import static org.opensearch.ml.engine.tools.QueryPlanningPromptTemplate.DEFAULT_QUERY_PLANNING_SYSTEM_PROMPT;
-import static org.opensearch.ml.engine.tools.QueryPlanningPromptTemplate.DEFAULT_SEARCH_TEMPLATE;
 import static org.opensearch.ml.engine.tools.QueryPlanningTool.DEFAULT_DESCRIPTION;
 import static org.opensearch.ml.engine.tools.QueryPlanningTool.INDEX_MAPPING_FIELD;
 import static org.opensearch.ml.engine.tools.QueryPlanningTool.INDEX_NAME_FIELD;
@@ -1415,7 +1415,7 @@ public void testFactoryCreatedTool_DefaultExtractJsonParser() {
         // Test case 3: No valid JSON - should return default template
         Object parsedResult3 = outputParser.parse("No JSON here at all");
         String resultNoJson = parsedResult3 instanceof String ? (String) parsedResult3 : gson.toJson(parsedResult3);
-        assertEquals(DEFAULT_SEARCH_TEMPLATE, resultNoJson);
+        assertEquals(DEFAULT_QUERY, resultNoJson);
     }
 
     // Test 2: Create tool from factory with custom processors, verify both default and custom processors work
@@ -1474,7 +1474,7 @@ public void testQueryPlanningTool_WithMockedMLModelTool_EndToEnd() {
         Map<String, Object> extractJsonConfig = new HashMap<>();
         extractJsonConfig.put("type", "extract_json");
         extractJsonConfig.put("extract_type", "object");
-        extractJsonConfig.put("default", DEFAULT_SEARCH_TEMPLATE);
+        extractJsonConfig.put("default", DEFAULT_QUERY);
 
         // Set the parser on the tool
         tool.setOutputParser(ToolParser.createProcessingParser(null, List.of(extractJsonConfig)));