[8.17] [Search][ES3] Enable Inference Management UI in ES3 (elastic#2…

…00109) (elastic#201464) # Backport This will backport the following commits from `main` to `8.17`: - [[Search][ES3] Enable Inference Management UI in ES3 (elastic#200109)](elastic#200109)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Samiul Monir <[email protected]>
kibanamachine · Nov 22, 2024 · 5d8b8eb · 5d8b8eb
1 parent 43b243b
commit 5d8b8eb
Show file tree

Hide file tree

Showing 45 changed files with 609 additions and 393 deletions.
diff --git a/config/serverless.es.yml b/config/serverless.es.yml
@@ -81,7 +81,7 @@ data_visualizer.resultLinks.fileBeat.enabled: false
 xpack.searchPlayground.ui.enabled: true
 
 # Search InferenceEndpoints
-xpack.searchInferenceEndpoints.ui.enabled: false
+xpack.searchInferenceEndpoints.ui.enabled: true
 
 # Search Notebooks
 xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json

diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -1002,5 +1002,8 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       context: `${KIBANA_DOCS}playground-context.html`,
       hiddenFields: `${KIBANA_DOCS}playground-query.html#playground-hidden-fields`,
     },
+    inferenceManagement: {
+      inferenceAPIDocumentation: `${ELASTIC_WEBSITE_URL}docs/api/doc/elasticsearch/operation/operation-inference-put`,
+    },
   });
 };
diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
@@ -677,6 +677,9 @@ export interface DocLinks {
     readonly context: string;
     readonly hiddenFields: string;
   };
+  readonly inferenceManagement: {
+    readonly inferenceAPIDocumentation: string;
+  };
 }
 
 export type BuildFlavor = 'serverless' | 'traditional';
diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -211,7 +211,7 @@ export const SEARCH_RELEVANCE_PLUGIN = {
   DESCRIPTION: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.description', {
     defaultMessage: 'Manage your inference endpoints for semantic search and AI use cases.',
   }),
-  URL: '/app/enterprise_search/relevance',
+  URL: '/app/elasticsearch/relevance',
   LOGO: 'logoEnterpriseSearch',
   SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/',
 };

diff --git a/x-pack/plugins/enterprise_search/common/locators/index.ts b/x-pack/plugins/enterprise_search/common/locators/index.ts
@@ -6,14 +6,17 @@
  */
 
 import type { SharePluginSetup } from '@kbn/share-plugin/public';
+import { SerializableRecord } from '@kbn/utility-types';
 
 import {
   CreateIndexLocatorDefinition,
   type CreateIndexLocatorParams,
 } from './create_index_locator';
+import { SearchInferenceEndpointLocatorDefinition } from './inference_locator';
 import { PlaygroundLocatorDefinition, type PlaygroundLocatorParams } from './playground_locator';
 
 export function registerLocators(share: SharePluginSetup) {
   share.url.locators.create<CreateIndexLocatorParams>(new CreateIndexLocatorDefinition());
   share.url.locators.create<PlaygroundLocatorParams>(new PlaygroundLocatorDefinition());
+  share.url.locators.create<SerializableRecord>(new SearchInferenceEndpointLocatorDefinition());
 }
diff --git a/x-pack/plugins/enterprise_search/common/locators/inference_locator.tsx b/x-pack/plugins/enterprise_search/common/locators/inference_locator.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { LocatorDefinition } from '@kbn/share-plugin/common';
+import type { SharePluginSetup } from '@kbn/share-plugin/public';
+import type { SerializableRecord } from '@kbn/utility-types';
+
+import { SEARCH_RELEVANCE_PLUGIN } from '../constants';
+
+export function registerLocators(share: SharePluginSetup) {
+  share.url.locators.create<SerializableRecord>(new SearchInferenceEndpointLocatorDefinition());
+}
+
+export class SearchInferenceEndpointLocatorDefinition
+  implements LocatorDefinition<SerializableRecord>
+{
+  public readonly getLocation = async () => {
+    return {
+      app: SEARCH_RELEVANCE_PLUGIN.ID,
+      path: '/inference_endpoints',
+      state: {},
+    };
+  };
+
+  public readonly id = 'SEARCH_INFERENCE_ENDPOINTS';
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
@@ -101,7 +101,7 @@ const baseNavItems = [
     items: [
       {
         'data-test-subj': 'searchSideNav-InferenceEndpoints',
-        href: '/app/enterprise_search/relevance/inference_endpoints',
+        href: '/app/elasticsearch/relevance/inference_endpoints',
         id: 'inference_endpoints',
         items: undefined,
         name: 'Inference Endpoints',
@@ -205,7 +205,7 @@ const mockNavLinks = [
   {
     id: 'searchInferenceEndpoints:inferenceEndpoints',
     title: 'Inference Endpoints',
-    url: '/app/enterprise_search/relevance/inference_endpoints',
+    url: '/app/elasticsearch/relevance/inference_endpoints',
   },
   {
     id: 'appSearch:engines',

diff --git a/...dex_management/__jest__/client_integration/index_details_page/index_details_page.test.tsx b/...dex_management/__jest__/client_integration/index_details_page/index_details_page.test.tsx
@@ -727,6 +727,11 @@ describe('<IndexDetailsPage />', () => {
           isActive: true,
           hasAtLeast: jest.fn((type) => true),
         };
+        const INFERENCE_LOCATOR = 'SEARCH_INFERENCE_ENDPOINTS';
+        const createMockLocator = (id: string) => ({
+          useUrl: jest.fn().mockReturnValue('https://redirect.me/to/inference_endpoints'),
+        });
+        const mockInferenceManagementLocator = createMockLocator(INFERENCE_LOCATOR);
         beforeEach(async () => {
           httpRequestsMockHelpers.setInferenceModels({
             data: [
@@ -750,7 +755,9 @@ describe('<IndexDetailsPage />', () => {
                 docLinks: {
                   links: {
                     ml: '',
-                    enterpriseSearch: '',
+                    inferenceManagement: {
+                      inferenceAPIDocumentation: 'https://abc.com/inference-api-create',
+                    },
                   },
                 },
                 core: {
@@ -819,6 +826,20 @@ describe('<IndexDetailsPage />', () => {
                       },
                     },
                   },
+                  share: {
+                    url: {
+                      locators: {
+                        get: jest.fn((id) => {
+                          switch (id) {
+                            case INFERENCE_LOCATOR:
+                              return mockInferenceManagementLocator;
+                            default:
+                              throw new Error(`Unknown locator id: ${id}`);
+                          }
+                        }),
+                      },
+                    },
+                  },
                 },
               },
             });

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
@@ -20,6 +20,11 @@ import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
 
 const createInferenceEndpointMock = jest.fn();
 const mockDispatch = jest.fn();
+const INFERENCE_LOCATOR = 'SEARCH_INFERENCE_ENDPOINTS';
+const createMockLocator = (id: string) => ({
+  useUrl: jest.fn().mockReturnValue('https://redirect.me/to/inference_endpoints'),
+});
+const mockInferenceManagementLocator = createMockLocator(INFERENCE_LOCATOR);
 
 jest.mock('../../../public/application/app_context', () => ({
   useAppContext: jest.fn().mockReturnValue({
@@ -33,8 +38,8 @@ jest.mock('../../../public/application/app_context', () => ({
     },
     docLinks: {
       links: {
-        enterpriseSearch: {
-          inferenceApiCreate: 'https://abc.com/inference-api-create',
+        inferenceManagement: {
+          inferenceAPIDocumentation: 'https://abc.com/inference-api-create',
         },
       },
     },
@@ -47,6 +52,20 @@ jest.mock('../../../public/application/app_context', () => ({
           },
         },
       },
+      share: {
+        url: {
+          locators: {
+            get: jest.fn((id) => {
+              switch (id) {
+                case INFERENCE_LOCATOR:
+                  return mockInferenceManagementLocator;
+                default:
+                  throw new Error(`Unknown locator id: ${id}`);
+              }
+            }),
+          },
+        },
+      },
     },
   }),
 }));

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
@@ -80,13 +80,15 @@ const SelectInferenceIdContent: React.FC<SelectInferenceIdContentProps> = ({
   value,
 }) => {
   const {
-    core: { application, http },
+    core: { application },
     docLinks,
-    plugins: { ml },
+    plugins: { ml, share },
   } = useAppContext();
   const config = getFieldConfig('inference_id');
 
-  const inferenceEndpointsPageLink = `${http.basePath.get()}/app/enterprise_search/relevance/inference_endpoints`;
+  const inferenceEndpointsPageLink = share?.url.locators
+    .get('SEARCH_INFERENCE_ENDPOINTS')
+    ?.useUrl({});
 
   const [isInferenceFlyoutVisible, setIsInferenceFlyoutVisible] = useState<boolean>(false);
   const [availableTrainedModels, setAvailableTrainedModels] = useState<
@@ -224,24 +226,28 @@ const SelectInferenceIdContent: React.FC<SelectInferenceIdContentProps> = ({
       panelPaddingSize="m"
       closePopover={() => setIsInferencePopoverVisible(!isInferencePopoverVisible)}
     >
-      <EuiContextMenuPanel>
-        <EuiContextMenuItem
-          key="manageInferenceEndpointButton"
-          icon="gear"
-          size="s"
-          data-test-subj="manageInferenceEndpointButton"
-          onClick={async () => {
-            application.navigateToUrl(inferenceEndpointsPageLink);
-          }}
-        >
-          {i18n.translate(
-            'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.manageInferenceEndpointButton',
-            {
-              defaultMessage: 'Manage Inference Endpoints',
-            }
-          )}
-        </EuiContextMenuItem>
-      </EuiContextMenuPanel>
+      {inferenceEndpointsPageLink && (
+        <EuiContextMenuPanel>
+          <EuiContextMenuItem
+            key="manageInferenceEndpointButton"
+            icon="gear"
+            size="s"
+            data-test-subj="manageInferenceEndpointButton"
+            href={inferenceEndpointsPageLink}
+            onClick={(e) => {
+              e.preventDefault();
+              application.navigateToUrl(inferenceEndpointsPageLink);
+            }}
+          >
+            {i18n.translate(
+              'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.manageInferenceEndpointButton',
+              {
+                defaultMessage: 'Manage Inference Endpoints',
+              }
+            )}
+          </EuiContextMenuItem>
+        </EuiContextMenuPanel>
+      )}
       <EuiHorizontalRule margin="none" />
       <EuiPanel color="transparent" paddingSize="s">
         <EuiTitle size="xxxs">
@@ -292,7 +298,7 @@ const SelectInferenceIdContent: React.FC<SelectInferenceIdContentProps> = ({
       <EuiHorizontalRule margin="none" />
       <EuiContextMenuItem icon={<EuiIcon type="help" color="primary" />} size="s">
         <EuiLink
-          href={docLinks.links.enterpriseSearch.inferenceApiCreate}
+          href={docLinks.links.inferenceManagement.inferenceAPIDocumentation}
           target="_blank"
           data-test-subj="learn-how-to-create-inference-endpoints"
         >

diff --git a/x-pack/plugins/search_inference_endpoints/common/doc_links.ts b/x-pack/plugins/search_inference_endpoints/common/doc_links.ts
@@ -15,7 +15,7 @@ class InferenceEndpointsDocLinks {
   constructor() {}
 
   setDocLinks(newDocLinks: DocLinks) {
-    this.createInferenceEndpoint = newDocLinks.enterpriseSearch.inferenceApiCreate;
+    this.createInferenceEndpoint = newDocLinks.inferenceManagement.inferenceAPIDocumentation;
     this.semanticSearchElser = newDocLinks.enterpriseSearch.elser;
     this.semanticSearchE5 = newDocLinks.enterpriseSearch.e5Model;
   }

diff --git a/x-pack/plugins/search_inference_endpoints/common/translations.ts b/x-pack/plugins/search_inference_endpoints/common/translations.ts
@@ -26,49 +26,6 @@ export const MANAGE_INFERENCE_ENDPOINTS_LABEL = i18n.translate(
   }
 );
 
-export const CREATE_FIRST_INFERENCE_ENDPOINT_DESCRIPTION = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.createFirstInferenceEndpointDescription',
-  {
-    defaultMessage:
-      "Inference endpoints enable you to perform inference tasks using NLP models provided by third-party services or Elastic's built-in models like ELSER and E5. Set up tasks such as text embedding, completions, reranking, and more by using the Create Inference API.",
-  }
-);
-
-export const START_WITH_PREPARED_ENDPOINTS_LABEL = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.startWithPreparedEndpointsLabel',
-  {
-    defaultMessage: 'Learn more about built-in NLP models:',
-  }
-);
-
-export const ELSER_TITLE = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.elserTitle',
-  {
-    defaultMessage: 'ELSER',
-  }
-);
-
-export const LEARN_HOW_TO_CREATE_INFERENCE_ENDPOINTS_LINK = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.learnHowToCreateInferenceEndpoints',
-  {
-    defaultMessage: 'Learn how to create inference endpoints',
-  }
-);
-
-export const SEMANTIC_SEARCH_WITH_ELSER_LINK = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.semanticSearchWithElser',
-  {
-    defaultMessage: 'Semantic search with ELSER',
-  }
-);
-
-export const SEMANTIC_SEARCH_WITH_E5_LINK = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.semanticSearchWithE5',
-  {
-    defaultMessage: 'Semantic search with E5 Multilingual',
-  }
-);
-
 export const VIEW_YOUR_MODELS_LINK = i18n.translate(
   'xpack.searchInferenceEndpoints.viewYourModels',
   {
@@ -83,25 +40,6 @@ export const API_DOCUMENTATION_LINK = i18n.translate(
   }
 );
 
-export const ELSER_DESCRIPTION = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.elserDescription',
-  {
-    defaultMessage: "ELSER is Elastic's sparse vector NLP model for semantic search in English.",
-  }
-);
-
-export const E5_TITLE = i18n.translate('xpack.searchInferenceEndpoints.addEmptyPrompt.e5Title', {
-  defaultMessage: 'E5 Multilingual',
-});
-
-export const E5_DESCRIPTION = i18n.translate(
-  'xpack.searchInferenceEndpoints.addEmptyPrompt.e5Description',
-  {
-    defaultMessage:
-      'E5 is a third-party NLP model that enables you to perform multilingual semantic search by using dense vector representations.',
-  }
-);
-
 export const ERROR_TITLE = i18n.translate('xpack.searchInferenceEndpoints.inferenceId.errorTitle', {
   defaultMessage: 'Error adding inference endpoint',
 });

diff --git a/x-pack/plugins/search_inference_endpoints/kibana.jsonc b/x-pack/plugins/search_inference_endpoints/kibana.jsonc
@@ -24,6 +24,7 @@
     "optionalPlugins": [
       "cloud",
       "console",
+      "serverless"
     ],
     "requiredBundles": [
       "kibanaReact"

diff --git a/...plugins/search_inference_endpoints/public/components/all_inference_endpoints/constants.ts b/...plugins/search_inference_endpoints/public/components/all_inference_endpoints/constants.ts
@@ -34,3 +34,4 @@ export const DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE: AllInferenceEndpointsTable
 };
 
 export const PIPELINE_URL = 'ingest/ingest_pipelines';
+export const SERVERLESS_INDEX_MANAGEMENT_URL = 'index_details';
diff --git a/...erence_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.tsx b/...erence_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.tsx
@@ -33,6 +33,7 @@ interface UseFilterParams {
   options: MultiSelectFilterOption[];
   renderOption?: (option: MultiSelectFilterOption) => React.ReactNode;
   selectedOptionKeys?: string[];
+  dataTestSubj?: string;
 }
 
 export const MultiSelectFilter: React.FC<UseFilterParams> = ({
@@ -41,6 +42,7 @@ export const MultiSelectFilter: React.FC<UseFilterParams> = ({
   options: rawOptions,
   selectedOptionKeys = [],
   renderOption,
+  dataTestSubj,
 }) => {
   const { euiTheme } = useEuiTheme();
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
@@ -55,7 +57,7 @@ export const MultiSelectFilter: React.FC<UseFilterParams> = ({
   );
 
   return (
-    <EuiFilterGroup>
+    <EuiFilterGroup data-test-subj={dataTestSubj}>
       <EuiPopover
         ownFocus
         button={

diff --git a/...ce_endpoints/public/components/all_inference_endpoints/filter/service_provider_filter.tsx b/...ce_endpoints/public/components/all_inference_endpoints/filter/service_provider_filter.tsx
@@ -38,6 +38,7 @@ export const ServiceProviderFilter: React.FC<Props> = ({ optionKeys, onChange })
       options={options}
       renderOption={(option) => option.label}
       selectedOptionKeys={optionKeys}
+      dataTestSubj="service-field-endpoints"
     />
   );
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,4 @@ export const DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE: AllInferenceEndpointsTable
		};

		export const PIPELINE_URL = 'ingest/ingest_pipelines';
		export const SERVERLESS_INDEX_MANAGEMENT_URL = 'index_details';