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..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 @@ -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[]; @@ -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-v2-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'); @@ -132,11 +132,11 @@ 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[1]).toHaveTextContent('Elastic'); + expect(rows[1]).toHaveTextContent('.elser-2-elastic'); - expect(rows[2]).toHaveTextContent('Elastic'); - expect(rows[2]).toHaveTextContent('.elser-v2-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'); @@ -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,14 +201,14 @@ 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'; const rows = screen.getAllByRole('row'); - expect(rows[1]).not.toHaveTextContent(techPreview); - expect(rows[2]).toHaveTextContent(techPreview); + expect(rows[1]).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); 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) ) {