feat: remove search index tool (#295)

* remove search index tool Signed-off-by: yuye-aws <[email protected]> * remove search index tool integration tests Signed-off-by: yuye-aws <[email protected]> * make processResponse private Signed-off-by: yuye-aws <[email protected]> * remove json file for search index tool it Signed-off-by: yuye-aws <[email protected]> * remove json file for search index tool ut Signed-off-by: yuye-aws <[email protected]> * Revert "remove json file for search index tool ut" This reverts commit 1db72bb. Signed-off-by: yuye-aws <[email protected]> --------- Signed-off-by: yuye-aws <[email protected]> (cherry picked from commit 0e65e62)
opensearch-project · Apr 26, 2024 · 264a5c4 · 264a5c4
1 parent eeb0d89
commit 264a5c4
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 333 deletions.
diff --git a/src/main/java/org/opensearch/agent/ToolPlugin.java b/src/main/java/org/opensearch/agent/ToolPlugin.java
@@ -16,7 +16,6 @@
 import org.opensearch.agent.tools.SearchAlertsTool;
 import org.opensearch.agent.tools.SearchAnomalyDetectorsTool;
 import org.opensearch.agent.tools.SearchAnomalyResultsTool;
-import org.opensearch.agent.tools.SearchIndexTool;
 import org.opensearch.agent.tools.SearchMonitorsTool;
 import org.opensearch.agent.tools.VectorDBTool;
 import org.opensearch.agent.tools.VisualizationsTool;
@@ -66,7 +65,6 @@ public Collection<Object> createComponents(
         VisualizationsTool.Factory.getInstance().init(client);
         NeuralSparseSearchTool.Factory.getInstance().init(client, xContentRegistry);
         VectorDBTool.Factory.getInstance().init(client, xContentRegistry);
-        SearchIndexTool.Factory.getInstance().init(client, xContentRegistry);
         RAGTool.Factory.getInstance().init(client, xContentRegistry);
         SearchAlertsTool.Factory.getInstance().init(client);
         SearchAnomalyDetectorsTool.Factory.getInstance().init(client, namedWriteableRegistry);
@@ -83,7 +81,6 @@ public List<Tool.Factory<? extends Tool>> getToolFactories() {
                 NeuralSparseSearchTool.Factory.getInstance(),
                 VectorDBTool.Factory.getInstance(),
                 VisualizationsTool.Factory.getInstance(),
-                SearchIndexTool.Factory.getInstance(),
                 RAGTool.Factory.getInstance(),
                 SearchAlertsTool.Factory.getInstance(),
                 SearchAnomalyDetectorsTool.Factory.getInstance(),

diff --git a/src/main/java/org/opensearch/agent/tools/AbstractRetrieverTool.java b/src/main/java/org/opensearch/agent/tools/AbstractRetrieverTool.java
@@ -68,7 +68,7 @@ protected AbstractRetrieverTool(
 
     protected abstract String getQueryBody(String queryText);
 
-    public static Map<String, Object> processResponse(SearchHit hit) {
+    private static Map<String, Object> processResponse(SearchHit hit) {
         Map<String, Object> docContent = new HashMap<>();
         docContent.put("_index", hit.getIndex());
         docContent.put("_id", hit.getId());

diff --git a/src/test/java/org/opensearch/agent/tools/SearchIndexToolTests.java b/src/test/java/org/opensearch/agent/tools/SearchIndexToolTests.java
diff --git a/src/test/java/org/opensearch/integTest/SearchIndexToolIT.java b/src/test/java/org/opensearch/integTest/SearchIndexToolIT.java
diff --git a/...ces/org/opensearch/agent/tools/register_flow_agent_of_search_index_tool_request_body.json b/...ces/org/opensearch/agent/tools/register_flow_agent_of_search_index_tool_request_body.json