From 9c26bdfbc6726f96abd5adba47adbd72675079f2 Mon Sep 17 00:00:00 2001 From: Tim Grein Date: Mon, 30 Jun 2025 16:15:40 +0200 Subject: [PATCH 1/7] Rename ELSER defaults --- .../common/preconfigured_inference_ids.ts | 2 +- .../all_inference_endpoints/tabular_page.test.tsx | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x-pack/platform/plugins/shared/observability_ai_assistant/common/preconfigured_inference_ids.ts b/x-pack/platform/plugins/shared/observability_ai_assistant/common/preconfigured_inference_ids.ts index fdffc45a13c78..25114658927c5 100644 --- a/x-pack/platform/plugins/shared/observability_ai_assistant/common/preconfigured_inference_ids.ts +++ b/x-pack/platform/plugins/shared/observability_ai_assistant/common/preconfigured_inference_ids.ts @@ -8,7 +8,7 @@ export const LEGACY_CUSTOM_INFERENCE_ID = 'obs_ai_assistant_kb_inference'; export const ELSER_ON_ML_NODE_INFERENCE_ID = '.elser-2-elasticsearch'; -export const ELSER_IN_EIS_INFERENCE_ID = '.elser-v2-elastic'; +export const ELSER_IN_EIS_INFERENCE_ID = '.elser-2-elastic'; export const E5_SMALL_INFERENCE_ID = '.multilingual-e5-small-elasticsearch'; export const E5_LARGE_IN_EIS_INFERENCE_ID = '.multilingual-e5-large-elastic'; // TODO: verify the inference ID once it's created in EIS diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx index 64aca18d5eca6..f5b6f65d27463 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx @@ -89,11 +89,11 @@ const inferenceEndpoints = [ }, }, { - inference_id: '.elser-v2-elastic', + inference_id: '.elser-2-elastic', task_type: 'sparse_embedding', service: 'elastic', service_settings: { - model_id: 'elser-v2', + model_id: 'elser_model_2', }, }, { @@ -101,7 +101,7 @@ const inferenceEndpoints = [ task_type: 'sparse_embedding', service: 'elastic', service_settings: { - model_id: 'elser-v2', + model_id: 'elser_model_2', }, }, ] as InferenceAPIConfigResponse[]; @@ -118,7 +118,7 @@ describe('When the tabular page is loaded', () => { const rows = screen.getAllByRole('row'); expect(rows[1]).toHaveTextContent('.elser-2-elasticsearch'); - expect(rows[2]).toHaveTextContent('.elser-v2-elastic'); + expect(rows[2]).toHaveTextContent('.elser-2-elastic'); expect(rows[3]).toHaveTextContent('.multilingual-e5-small-elasticsearch'); expect(rows[4]).toHaveTextContent('.sparkles'); expect(rows[5]).toHaveTextContent('custom-inference-id'); @@ -136,7 +136,7 @@ describe('When the tabular page is loaded', () => { expect(rows[1]).toHaveTextContent('.elser_model_2'); expect(rows[2]).toHaveTextContent('Elastic'); - expect(rows[2]).toHaveTextContent('.elser-v2-elastic'); + expect(rows[2]).toHaveTextContent('.elser-2-elastic'); expect(rows[3]).toHaveTextContent('Elasticsearch'); expect(rows[3]).toHaveTextContent('.multilingual-e5-small'); @@ -145,7 +145,7 @@ describe('When the tabular page is loaded', () => { expect(rows[4]).toHaveTextContent('rainbow-sprinkles'); expect(rows[5]).toHaveTextContent('Elastic'); - expect(rows[5]).toHaveTextContent('elser-v2'); + expect(rows[5]).toHaveTextContent('elser_model_2'); expect(rows[6]).toHaveTextContent('Elasticsearch'); expect(rows[6]).toHaveTextContent('.rerank-v1'); @@ -201,7 +201,7 @@ describe('When the tabular page is loaded', () => { expect(rows[9]).not.toHaveTextContent(preconfigured); }); - it('should show tech preview badge only for reranker-v1 model, rainbow-sprinkles, and preconfigured elser-v2', () => { + it('should show tech preview badge only for reranker-v1 model, rainbow-sprinkles, and preconfigured elser_model_2', () => { render(); const techPreview = 'TECH PREVIEW'; From b03f1978355ee296bf5244ec5d656f4d8dbdb93d Mon Sep 17 00:00:00 2001 From: Tim Grein Date: Tue, 1 Jul 2025 10:34:38 +0200 Subject: [PATCH 2/7] Update tabular_page.test.tsx --- .../components/all_inference_endpoints/tabular_page.test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx index f5b6f65d27463..51d1fe1db72fe 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx @@ -117,8 +117,8 @@ describe('When the tabular page is loaded', () => { render(); const rows = screen.getAllByRole('row'); - expect(rows[1]).toHaveTextContent('.elser-2-elasticsearch'); - expect(rows[2]).toHaveTextContent('.elser-2-elastic'); + expect(rows[1]).toHaveTextContent('.elser-2-elastic'); + expect(rows[2]).toHaveTextContent('.elser-2-elasticsearch'); expect(rows[3]).toHaveTextContent('.multilingual-e5-small-elasticsearch'); expect(rows[4]).toHaveTextContent('.sparkles'); expect(rows[5]).toHaveTextContent('custom-inference-id'); From 9d5dc2568271e0424bee76458b2371353e124575 Mon Sep 17 00:00:00 2001 From: Tim Grein Date: Tue, 1 Jul 2025 08:42:51 +0000 Subject: [PATCH 3/7] Adjust tech preview logic --- .../public/utils/reranker_helper.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/utils/reranker_helper.ts b/x-pack/solutions/search/plugins/search_inference_endpoints/public/utils/reranker_helper.ts index f9c4529b0be0f..99346ce539c49 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/utils/reranker_helper.ts +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/utils/reranker_helper.ts @@ -23,12 +23,12 @@ export const isProviderTechPreview = (provider: InferenceInferenceEndpointInfo) /* For rerank task type, model ID starting with '.' indicates tech preview - Special case for 'rainbow-sprinkles' model + Special case for 'rainbow-sprinkles' model and ELSER on EIS */ if ( (taskType === 'rerank' && modelId.startsWith('.')) || modelId === 'rainbow-sprinkles' || - (modelId === 'elser-v2' && + (modelId === 'elser_model_2' && inferenceId.startsWith('.') && service === ServiceProviderKeys.elastic) ) { From f2d827ed7be0e8c881f44ca095083904f619a865 Mon Sep 17 00:00:00 2001 From: Tim Grein Date: Tue, 1 Jul 2025 16:25:57 +0200 Subject: [PATCH 4/7] Update tabular_page.test.tsx --- .../components/all_inference_endpoints/tabular_page.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx index 51d1fe1db72fe..75e3fb345a9c8 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx @@ -207,7 +207,7 @@ describe('When the tabular page is loaded', () => { const techPreview = 'TECH PREVIEW'; const rows = screen.getAllByRole('row'); - expect(rows[1]).not.toHaveTextContent(techPreview); + expect(rows[1]).toHaveTextContent(techPreview); expect(rows[2]).toHaveTextContent(techPreview); expect(rows[3]).not.toHaveTextContent(techPreview); expect(rows[4]).toHaveTextContent(techPreview); From 78af6657bd4b882be5842473ec7b5553438147cf Mon Sep 17 00:00:00 2001 From: Tim Grein Date: Tue, 1 Jul 2025 16:28:21 +0200 Subject: [PATCH 5/7] Update tabular_page.test.tsx --- .../all_inference_endpoints/tabular_page.test.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx index 75e3fb345a9c8..6ece9ed562d84 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx @@ -132,12 +132,12 @@ describe('When the tabular page is loaded', () => { render(); const rows = screen.getAllByRole('row'); - expect(rows[1]).toHaveTextContent('Elasticsearch'); - expect(rows[1]).toHaveTextContent('.elser_model_2'); - - expect(rows[2]).toHaveTextContent('Elastic'); - expect(rows[2]).toHaveTextContent('.elser-2-elastic'); + expect(rows[1]).toHaveTextContent('Elastic'); + expect(rows[1]).toHaveTextContent('.elser-2-elastic'); + expect(rows[2]).toHaveTextContent('Elasticsearch'); + expect(rows[2]).toHaveTextContent('.elser_model_2'); + expect(rows[3]).toHaveTextContent('Elasticsearch'); expect(rows[3]).toHaveTextContent('.multilingual-e5-small'); From 48c4da69168e07b181bd52bf78b52b3ef683f216 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Tue, 1 Jul 2025 14:53:02 +0000 Subject: [PATCH 6/7] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- .../components/all_inference_endpoints/tabular_page.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx index 6ece9ed562d84..1299950777947 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx @@ -137,7 +137,7 @@ describe('When the tabular page is loaded', () => { expect(rows[2]).toHaveTextContent('Elasticsearch'); expect(rows[2]).toHaveTextContent('.elser_model_2'); - + expect(rows[3]).toHaveTextContent('Elasticsearch'); expect(rows[3]).toHaveTextContent('.multilingual-e5-small'); From f2c1b81336d90b42b5100177c149535670d95964 Mon Sep 17 00:00:00 2001 From: Tim Grein Date: Thu, 3 Jul 2025 15:35:11 +0200 Subject: [PATCH 7/7] Update tabular_page.test.tsx --- .../components/all_inference_endpoints/tabular_page.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx index 1299950777947..780d7236cc3b9 100644 --- a/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx +++ b/x-pack/solutions/search/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx @@ -208,7 +208,7 @@ describe('When the tabular page is loaded', () => { const rows = screen.getAllByRole('row'); expect(rows[1]).toHaveTextContent(techPreview); - expect(rows[2]).toHaveTextContent(techPreview); + expect(rows[2]).not.toHaveTextContent(techPreview); expect(rows[3]).not.toHaveTextContent(techPreview); expect(rows[4]).toHaveTextContent(techPreview); expect(rows[5]).not.toHaveTextContent(techPreview);