Remove hardcoded preconfigured ELSER endpoint (elastic#201300)

## Summary The Index mapping will have access to default elser inference endpoint so we do not need to hardcode endpoint names in the Kibana. This needs to go after #elastic/elasticsearch#117294 merges in `8.17` and further. https://github.com/user-attachments/assets/4a786fde-e250-440d-a9d7-2256dacc8edd --------- Co-authored-by: Elastic Machine <[email protected]>
kibanamachine · Nov 26, 2024 · b3d638b · b3d638b
1 parent c7b5b35
commit b3d638b
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 92 deletions.
diff --git a/...rch/public/applications/enterprise_search_content/components/search_index/index_error.tsx b/...rch/public/applications/enterprise_search_content/components/search_index/index_error.tsx
@@ -31,15 +31,10 @@ export interface IndexErrorProps {
 }
 
 interface SemanticTextProperty extends MappingPropertyBase {
-  inference_id?: string;
+  inference_id: string;
   type: 'semantic_text';
 }
 
-/*  
-  This will be repalce once we add default elser inference_id 
-  with the index mapping response.
-*/
-const ELSER_PRECONFIGURED_ENDPOINTS = '.elser-2-elasticsearch';
 const isInferencePreconfigured = (inferenceId: string) => inferenceId.startsWith('.');
 
 const parseMapping = (mappings: MappingTypeMapping) => {
@@ -56,11 +51,6 @@ const getSemanticTextFields = (
 ): Array<{ path: string; source: SemanticTextProperty }> => {
   return Object.entries(fields).flatMap(([key, value]) => {
     const currentPath: string = path ? `${path}.${key}` : key;
-    if (value.type === 'semantic_text') {
-      value = value.inference_id
-        ? value
-        : { ...value, inference_id: ELSER_PRECONFIGURED_ENDPOINTS };
-    }
     const currentField: Array<{ path: string; source: SemanticTextProperty }> =
       value.type === 'semantic_text' ? [{ path: currentPath, source: value }] : [];
     if (hasProperties(value)) {

diff --git a/...ex_management/__jest__/client_integration/index_details_page/select_inference_id.test.tsx b/...ex_management/__jest__/client_integration/index_details_page/select_inference_id.test.tsx
@@ -9,7 +9,7 @@ import {
   Form,
   useForm,
 } from '../../../public/application/components/mappings_editor/shared_imports';
-import { registerTestBed } from '@kbn/test-jest-helpers';
+import { findTestSubject, registerTestBed } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
 import {
   SelectInferenceId,
@@ -152,4 +152,34 @@ describe('SelectInferenceId', () => {
     expect(find('data-inference-endpoint-list').contains('endpoint-2')).toBe(true);
     expect(find('data-inference-endpoint-list').contains('endpoint-3')).toBe(false);
   });
+
+  it('select the first endpoint by default', () => {
+    find('inferenceIdButton').simulate('click');
+    const defaultElser = findTestSubject(
+      find('data-inference-endpoint-list'),
+      'custom-inference_.preconfigured-elser'
+    );
+    expect(defaultElser.prop('aria-checked')).toEqual(true);
+  });
+
+  it('does not select the other endpoints by default', () => {
+    find('inferenceIdButton').simulate('click');
+    const defaultE5 = findTestSubject(
+      find('data-inference-endpoint-list'),
+      'custom-inference_.preconfigured-e5'
+    );
+    expect(defaultE5.prop('aria-checked')).toEqual(false);
+
+    const endpoint1 = findTestSubject(
+      find('data-inference-endpoint-list'),
+      'custom-inference_endpoint-1'
+    );
+    expect(endpoint1.prop('aria-checked')).toEqual(false);
+
+    const endpoint2 = findTestSubject(
+      find('data-inference-endpoint-list'),
+      'custom-inference_endpoint-2'
+    );
+    expect(endpoint2.prop('aria-checked')).toEqual(false);
+  });
 });
diff --git a/...nents/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx b/...nents/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx
@@ -132,6 +132,14 @@ const SelectInferenceIdContent: React.FC<SelectInferenceIdContentProps> = ({
       'data-test-subj': `custom-inference_${endpoint.inference_id}`,
       checked: value === endpoint.inference_id ? 'on' : undefined,
     }));
+    /**
+     * Adding this check to ensure we have the preconfigured elser endpoint selected by default.
+     */
+    const hasInferenceSelected = newOptions.some((option) => option.checked === 'on');
+    if (!hasInferenceSelected && newOptions.length > 0) {
+      newOptions[0].checked = 'on';
+    }
+
     if (value && !newOptions.find((option) => option.label === value)) {
       // Sometimes we create a new endpoint but the backend is slow in updating so we need to optimistically update
       const newOption: EuiSelectableOption = {
@@ -273,6 +281,7 @@ const SelectInferenceIdContent: React.FC<SelectInferenceIdContentProps> = ({
           searchable
           isLoading={isLoading}
           singleSelection="always"
+          defaultChecked
           searchProps={{
             compressed: true,
             placeholder: i18n.translate(

diff --git a/...or/components/document_fields/fields/create_field/semantic_text/use_semantic_text.test.ts b/...or/components/document_fields/fields/create_field/semantic_text/use_semantic_text.test.ts
@@ -13,15 +13,15 @@ import { act } from 'react-dom/test-utils';
 jest.mock('../../../../../../../../hooks/use_details_page_mappings_model_management', () => ({
   useDetailsPageMappingsModelManagement: () => ({
     fetchInferenceToModelIdMap: () => ({
-      e5: {
+      '.preconfigured_elser': {
         isDeployed: false,
         isDeployable: true,
-        trainedModelId: '.multilingual-e5-small',
+        trainedModelId: '.elser_model_2',
       },
-      elser_model_2: {
+      '.preconfigured_e5': {
         isDeployed: false,
         isDeployable: true,
-        trainedModelId: '.elser_model_2',
+        trainedModelId: '.multilingual-e5-small',
       },
       openai: {
         isDeployed: false,
@@ -49,13 +49,13 @@ const mockField: Record<string, SemanticTextField> = {
   elser_model_2: {
     name: 'name',
     type: 'semantic_text',
-    inference_id: 'elser_model_2',
+    inference_id: '.preconfigured_elser',
     reference_field: 'title',
   },
   e5: {
     name: 'name',
     type: 'semantic_text',
-    inference_id: 'e5',
+    inference_id: '.preconfigured_e5',
     reference_field: 'title',
   },
   openai: {
@@ -100,15 +100,15 @@ const mockDispatch = jest.fn();
 jest.mock('../../../../../mappings_state_context', () => ({
   useMappingsState: jest.fn().mockReturnValue({
     inferenceToModelIdMap: {
-      e5: {
+      '.preconfigured_elser': {
         isDeployed: false,
         isDeployable: true,
-        trainedModelId: '.multilingual-e5-small',
+        trainedModelId: '.elser_model_2',
       },
-      elser_model_2: {
+      '.preconfigured_e5': {
         isDeployed: false,
         isDeployable: true,
-        trainedModelId: '.elser_model_2',
+        trainedModelId: '.multilingual-e5-small',
       },
       openai: {
         isDeployed: false,
@@ -142,7 +142,7 @@ jest.mock('../../../../../../../services/api', () => ({
   getInferenceEndpoints: jest.fn().mockResolvedValue({
     data: [
       {
-        inference_id: 'e5',
+        inference_id: '.preconfigured_e5',
         task_type: 'text_embedding',
         service: 'elasticsearch',
         service_settings: {
@@ -212,28 +212,6 @@ describe('useSemanticText', () => {
       mockConfig.openai.modelConfig
     );
   });
-  it('should handle semantic text with inference endpoint created from flyout correctly', async () => {
-    const { result } = renderHook(() =>
-      useSemanticText({
-        form: mockForm.elasticModelEndpointCreatedfromFlyout,
-        setErrorsInTrainedModelDeployment: jest.fn(),
-        ml: mlMock,
-      })
-    );
-    await act(async () => {
-      result.current.handleSemanticText(mockField.my_elser_endpoint, mockConfig.elser);
-    });
-
-    expect(mockDispatch).toHaveBeenCalledWith({
-      type: 'field.add',
-      value: mockField.my_elser_endpoint,
-    });
-    expect(mlMock.mlApi.inferenceModels.createInferenceEndpoint).toHaveBeenCalledWith(
-      'my_elser_endpoint',
-      'sparse_embedding',
-      mockConfig.elser.modelConfig
-    );
-  });
 
   it('should handle semantic text correctly', async () => {
     const { result } = renderHook(() =>
@@ -252,20 +230,6 @@ describe('useSemanticText', () => {
       type: 'field.add',
       value: mockField.elser_model_2,
     });
-    expect(mlMock.mlApi.inferenceModels.createInferenceEndpoint).toHaveBeenCalledWith(
-      'elser_model_2',
-      'sparse_embedding',
-      {
-        service: 'elser',
-        service_settings: {
-          adaptive_allocations: {
-            enabled: true,
-          },
-          num_threads: 1,
-          model_id: '.elser_model_2',
-        },
-      }
-    );
   });
   it('does not call create inference endpoint api, if default endpoint already exists', async () => {
     const { result } = renderHook(() =>

diff --git a/..._editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.ts b/..._editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.ts
@@ -19,7 +19,6 @@ import { useMLModelNotificationToasts } from '../../../../../../../../hooks/use_
 
 import { getInferenceEndpoints } from '../../../../../../../services/api';
 import { getFieldByPathName } from '../../../../../lib/utils';
-import { ELSER_PRECONFIGURED_ENDPOINTS } from '../../../../../constants';
 
 interface UseSemanticTextProps {
   form: FormHook<Field, Field>;
@@ -63,9 +62,6 @@ export function useSemanticText(props: UseSemanticTextProps) {
       if (!form.getFormData().reference_field) {
         form.setFieldValue('reference_field', referenceField);
       }
-      if (!form.getFormData().inference_id) {
-        form.setFieldValue('inference_id', ELSER_PRECONFIGURED_ENDPOINTS);
-      }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fieldTypeValue]);

diff --git a/...ication/components/mappings_editor/components/document_fields/fields/fields_list_item.tsx b/...ication/components/mappings_editor/components/document_fields/fields/fields_list_item.tsx
@@ -19,11 +19,7 @@ import { i18n } from '@kbn/i18n';
 
 import { NormalizedField, NormalizedFields, State } from '../../../types';
 import { getTypeLabelFromField } from '../../../lib';
-import {
-  CHILD_FIELD_INDENT_SIZE,
-  ELSER_PRECONFIGURED_ENDPOINTS,
-  LEFT_PADDING_SIZE_FIELD_ITEM_WRAPPER,
-} from '../../../constants';
+import { CHILD_FIELD_INDENT_SIZE, LEFT_PADDING_SIZE_FIELD_ITEM_WRAPPER } from '../../../constants';
 
 import { FieldsList } from './fields_list';
 import { CreateField } from './create_field';
@@ -109,7 +105,6 @@ function FieldListItemComponent(
   const indent = treeDepth * CHILD_FIELD_INDENT_SIZE - substractIndentAmount;
 
   const isSemanticText = source.type === 'semantic_text';
-  const inferenceId: string = (source.inference_id as string) ?? ELSER_PRECONFIGURED_ENDPOINTS;
 
   const indentCreateField =
     (treeDepth + 1) * CHILD_FIELD_INDENT_SIZE +
@@ -298,7 +293,7 @@ function FieldListItemComponent(
 
             {isSemanticText && (
               <EuiFlexItem grow={false}>
-                <EuiBadge color="hollow">{inferenceId}</EuiBadge>
+                <EuiBadge color="hollow">{source.inference_id as string}</EuiBadge>
               </EuiFlexItem>
             )}
 

diff --git a/...ndex_management/public/application/components/mappings_editor/constants/default_values.ts b/...ndex_management/public/application/components/mappings_editor/constants/default_values.ts
@@ -13,9 +13,3 @@
 export const INDEX_DEFAULT = 'index_default';
 
 export const STANDARD = 'standard';
-
-/*  
-  This will be repalce once we add default elser inference_id 
-  with the index mapping response.
-*/
-export const ELSER_PRECONFIGURED_ENDPOINTS = '.elser-2-elasticsearch';
diff --git a/...agement/public/application/components/mappings_editor/constants/parameters_definition.tsx b/...agement/public/application/components/mappings_editor/constants/parameters_definition.tsx
@@ -1126,22 +1126,10 @@ export const PARAMETERS_DEFINITION: { [key in ParameterName]: ParameterDefinitio
   },
   inference_id: {
     fieldConfig: {
-      defaultValue: 'elser_model_2',
+      defaultValue: '',
       label: i18n.translate('xpack.idxMgmt.mappingsEditor.parameters.inferenceIdLabel', {
         defaultMessage: 'Select an inference endpoint:',
       }),
-      validations: [
-        {
-          validator: emptyField(
-            i18n.translate(
-              'xpack.idxMgmt.mappingsEditor.parameters.validations.inferenceIdIsRequiredErrorMessage',
-              {
-                defaultMessage: 'Inference ID is required.',
-              }
-            )
-          ),
-        },
-      ],
     },
     schema: t.string,
   },

diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
@@ -23310,7 +23310,6 @@
     "xpack.idxMgmt.mappingsEditor.parameters.validations.fieldDataFrequency.numberGreaterThanOneErrorMessage": "La valeur doit être supérieure à un.",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.greaterThanZeroErrorMessage": "Le facteur de montée en charge doit être supérieur à 0.",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.ignoreAboveIsRequiredErrorMessage": "Limite de longueur de caractère obligatoire.",
-    "xpack.idxMgmt.mappingsEditor.parameters.validations.inferenceIdIsRequiredErrorMessage": "L’ID d’inférence est requis.",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.localeFieldRequiredErrorMessage": "Spécifiez un paramètre régional.",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.maxInputLengthFieldRequiredErrorMessage": "Spécifiez une longueur d'entrée maximale.",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.nameIsRequiredErrorMessage": "Donnez un nom au champ.",

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -23282,7 +23282,6 @@
     "xpack.idxMgmt.mappingsEditor.parameters.validations.fieldDataFrequency.numberGreaterThanOneErrorMessage": "値は1よりも大きい値でなければなりません。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.greaterThanZeroErrorMessage": "スケーリングファクターは0よりも大きくなくてはなりません。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.ignoreAboveIsRequiredErrorMessage": "文字数制限が必要です。",
-    "xpack.idxMgmt.mappingsEditor.parameters.validations.inferenceIdIsRequiredErrorMessage": "推論IDは必須です。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.localeFieldRequiredErrorMessage": "ロケールを指定します。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.maxInputLengthFieldRequiredErrorMessage": "最大入力長さを指定します。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.nameIsRequiredErrorMessage": "フィールドに名前を付けます。",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -22886,7 +22886,6 @@
     "xpack.idxMgmt.mappingsEditor.parameters.validations.fieldDataFrequency.numberGreaterThanOneErrorMessage": "值必须大于 1。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.greaterThanZeroErrorMessage": "缩放因数必须大于 0。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.ignoreAboveIsRequiredErrorMessage": "字符长度限制必填。",
-    "xpack.idxMgmt.mappingsEditor.parameters.validations.inferenceIdIsRequiredErrorMessage": "'推理 ID'必填。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.localeFieldRequiredErrorMessage": "指定区域设置。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.maxInputLengthFieldRequiredErrorMessage": "指定最大输入长度。",
     "xpack.idxMgmt.mappingsEditor.parameters.validations.nameIsRequiredErrorMessage": "为字段提供名称。",