From c7b38d76291227f9543ff432b60ab5132c327c92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 9 Oct 2024 20:47:15 +0000 Subject: [PATCH] Bumped minimum compatibility to 2.18.0 (#413) Signed-off-by: saimedhi (cherry picked from commit d991f1934c93464f4ccf342a6761975cf4d7a8f3) Signed-off-by: github-actions[bot] --- opensearch_dashboards.json | 14 ++++------- server/resources/templates/custom.json | 19 +++++++-------- server/resources/templates/hybrid_search.json | 23 ++++++++----------- .../templates/multimodal_search.json | 23 ++++++++----------- server/resources/templates/rag.json | 23 ++++++++----------- .../resources/templates/semantic_search.json | 23 ++++++++----------- .../templates/sentiment_analysis.json | 23 ++++++++----------- test/utils.ts | 2 +- 8 files changed, 63 insertions(+), 87 deletions(-) diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 7c55a881..79146b51 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -5,18 +5,12 @@ "server": true, "ui": true, "requiredBundles": [], - "requiredPlugins": [ - "navigation", - "opensearchDashboardsUtils" - ], + "requiredPlugins": ["navigation", "opensearchDashboardsUtils"], "optionalPlugins": [ "dataSource", "dataSourceManagement", "contentManagement" ], - "supportedOSDataSourceVersions": ">=2.17.0 <4.0.0", - "requiredOSDataSourcePlugins": [ - "opensearch-ml", - "opensearch-flow-framework" - ] -} \ No newline at end of file + "supportedOSDataSourceVersions": ">=2.18.0 <4.0.0", + "requiredOSDataSourcePlugins": ["opensearch-ml", "opensearch-flow-framework"] +} diff --git a/server/resources/templates/custom.json b/server/resources/templates/custom.json index 6bfefc5b..28aaea56 100644 --- a/server/resources/templates/custom.json +++ b/server/resources/templates/custom.json @@ -1,12 +1,9 @@ { - "name": "Custom", - "description": "A blank workflow with no preset configurations", - "use_case": "CUSTOM", - "version": { - "template": "1.0.0", - "compatibility": [ - "2.17.0", - "3.0.0" - ] - } -} \ No newline at end of file + "name": "Custom", + "description": "A blank workflow with no preset configurations", + "use_case": "CUSTOM", + "version": { + "template": "1.0.0", + "compatibility": ["2.18.0", "3.0.0"] + } +} diff --git a/server/resources/templates/hybrid_search.json b/server/resources/templates/hybrid_search.json index 770383e0..a8204676 100644 --- a/server/resources/templates/hybrid_search.json +++ b/server/resources/templates/hybrid_search.json @@ -1,14 +1,11 @@ { - "name": "Hybrid Search", - "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing hybrid search", - "version": { - "template": "1.0.0", - "compatibility": [ - "2.17.0", - "3.0.0" - ] - }, - "ui_metadata": { - "type": "Hybrid search" - } -} \ No newline at end of file + "name": "Hybrid Search", + "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing hybrid search", + "version": { + "template": "1.0.0", + "compatibility": ["2.18.0", "3.0.0"] + }, + "ui_metadata": { + "type": "Hybrid search" + } +} diff --git a/server/resources/templates/multimodal_search.json b/server/resources/templates/multimodal_search.json index 97b94349..59c1fac8 100644 --- a/server/resources/templates/multimodal_search.json +++ b/server/resources/templates/multimodal_search.json @@ -1,14 +1,11 @@ { - "name": "Multimodal Search", - "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing multimodal search", - "version": { - "template": "1.0.0", - "compatibility": [ - "2.17.0", - "3.0.0" - ] - }, - "ui_metadata": { - "type": "Multimodal search" - } -} \ No newline at end of file + "name": "Multimodal Search", + "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing multimodal search", + "version": { + "template": "1.0.0", + "compatibility": ["2.18.0", "3.0.0"] + }, + "ui_metadata": { + "type": "Multimodal search" + } +} diff --git a/server/resources/templates/rag.json b/server/resources/templates/rag.json index bba2c1cc..49b4200b 100644 --- a/server/resources/templates/rag.json +++ b/server/resources/templates/rag.json @@ -1,14 +1,11 @@ { - "name": "Retrieval-Augmented Generation (RAG)", - "description": "A basic workflow containing the index and search pipeline configurations for performing basic retrieval-augmented generation (RAG)", - "version": { - "template": "1.0.0", - "compatibility": [ - "2.17.0", - "3.0.0" - ] - }, - "ui_metadata": { - "type": "Retrieval-augmented generation" - } -} \ No newline at end of file + "name": "Retrieval-Augmented Generation (RAG)", + "description": "A basic workflow containing the index and search pipeline configurations for performing basic retrieval-augmented generation (RAG)", + "version": { + "template": "1.0.0", + "compatibility": ["2.18.0", "3.0.0"] + }, + "ui_metadata": { + "type": "Retrieval-augmented generation" + } +} diff --git a/server/resources/templates/semantic_search.json b/server/resources/templates/semantic_search.json index e3cbb1cb..a2c61166 100644 --- a/server/resources/templates/semantic_search.json +++ b/server/resources/templates/semantic_search.json @@ -1,14 +1,11 @@ { - "name": "Semantic Search", - "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing semantic search", - "version": { - "template": "1.0.0", - "compatibility": [ - "2.17.0", - "3.0.0" - ] - }, - "ui_metadata": { - "type": "Semantic search" - } -} \ No newline at end of file + "name": "Semantic Search", + "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing semantic search", + "version": { + "template": "1.0.0", + "compatibility": ["2.18.0", "3.0.0"] + }, + "ui_metadata": { + "type": "Semantic search" + } +} diff --git a/server/resources/templates/sentiment_analysis.json b/server/resources/templates/sentiment_analysis.json index ed2d4c92..70db4a51 100644 --- a/server/resources/templates/sentiment_analysis.json +++ b/server/resources/templates/sentiment_analysis.json @@ -1,14 +1,11 @@ { - "name": "Sentiment Analysis", - "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing sentiment analysis", - "version": { - "template": "1.0.0", - "compatibility": [ - "2.17.0", - "3.0.0" - ] - }, - "ui_metadata": { - "type": "Sentiment analysis" - } -} \ No newline at end of file + "name": "Sentiment Analysis", + "description": "A basic workflow containing the ingest pipeline, search pipeline, and index configurations for performing sentiment analysis", + "version": { + "template": "1.0.0", + "compatibility": ["2.18.0", "3.0.0"] + }, + "ui_metadata": { + "type": "Sentiment analysis" + } +} diff --git a/test/utils.ts b/test/utils.ts index 45a3c2df..980e05c5 100644 --- a/test/utils.ts +++ b/test/utils.ts @@ -49,7 +49,7 @@ function generateWorkflow({ id, name, type }: WorkflowInput): Workflow { return { id, name, - version: { template: '1.0.0', compatibility: ['2.17.0', '3.0.0'] }, + version: { template: '1.0.0', compatibility: ['2.18.0', '3.0.0'] }, ui_metadata: getConfig(type), }; }