[8.x] [Obs AI Assistant] Use architecture-specific elser model (#205851…

…) (#205951) # Backport This will backport the following commits from `main` to `8.x`: - [[Obs AI Assistant] Use architecture-specific elser model (#205851)](#205851)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Søren Louv-Jansen <[email protected]> Co-authored-by: Dario Gieselaar <[email protected]>
elastic · Jan 9, 2025 · 874859d · 874859d
1 parent fada2e8
commit 874859d
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 44 deletions.
diff --git a/...s/shared/observability_solution/observability_ai_assistant/server/service/client/index.ts b/...s/shared/observability_solution/observability_ai_assistant/server/service/client/index.ts
@@ -80,6 +80,7 @@ import {
 } from '../task_manager_definitions/register_migrate_knowledge_base_entries_task';
 import { ObservabilityAIAssistantPluginStartDependencies } from '../../types';
 import { ObservabilityAIAssistantConfig } from '../../config';
+import { getElserModelId } from '../knowledge_base_service/get_elser_model_id';
 
 const MAX_FUNCTION_CALLS = 8;
 
@@ -660,6 +661,10 @@ export class ObservabilityAIAssistantClient {
   setupKnowledgeBase = async (modelId: string | undefined) => {
     const { esClient, core, logger, knowledgeBaseService } = this.dependencies;
 
+    if (!modelId) {
+      modelId = await getElserModelId({ core, logger });
+    }
+
     // setup the knowledge base
     const res = await knowledgeBaseService.setup(esClient, modelId);
 

diff --git a/...ed/observability_solution/observability_ai_assistant/server/service/inference_endpoint.ts b/...ed/observability_solution/observability_ai_assistant/server/service/inference_endpoint.ts
@@ -16,13 +16,13 @@ export const AI_ASSISTANT_KB_INFERENCE_ID = 'obs_ai_assistant_kb_inference';
 export async function createInferenceEndpoint({
   esClient,
   logger,
-  modelId = '.elser_model_2',
+  modelId,
 }: {
   esClient: {
     asCurrentUser: ElasticsearchClient;
   };
   logger: Logger;
-  modelId: string | undefined;
+  modelId: string;
 }) {
   try {
     logger.debug(`Creating inference endpoint "${AI_ASSISTANT_KB_INFERENCE_ID}"`);

diff --git a/...on/observability_ai_assistant/server/service/knowledge_base_service/get_elser_model_id.ts b/...on/observability_ai_assistant/server/service/knowledge_base_service/get_elser_model_id.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 { Logger } from '@kbn/logging';
+import { CoreSetup } from '@kbn/core-lifecycle-server';
+import { firstValueFrom } from 'rxjs';
+import { ObservabilityAIAssistantPluginStartDependencies } from '../../types';
+
+export async function getElserModelId({
+  core,
+  logger,
+}: {
+  core: CoreSetup<ObservabilityAIAssistantPluginStartDependencies>;
+  logger: Logger;
+}) {
+  const defaultModelId = '.elser_model_2';
+  const [_, pluginsStart] = await core.getStartServices();
+
+  // Wait for the license to be available so the ML plugin's guards pass once we ask for ELSER stats
+  const license = await firstValueFrom(pluginsStart.licensing.license$);
+  if (!license.hasAtLeast('enterprise')) {
+    return defaultModelId;
+  }
+
+  try {
+    // Wait for the ML plugin's dependency on the internal saved objects client to be ready
+    const { ml } = await core.plugins.onSetup<{
+      ml: {
+        trainedModelsProvider: (
+          request: {},
+          soClient: {}
+        ) => { getELSER: () => Promise<{ model_id: string }> };
+      };
+    }>('ml');
+
+    if (!ml.found) {
+      throw new Error('Could not find ML plugin');
+    }
+
+    const elserModelDefinition = await ml.contract
+      .trainedModelsProvider({} as any, {} as any) // request, savedObjectsClient (but we fake it to use the internal user)
+      .getELSER();
+
+    return elserModelDefinition.model_id;
+  } catch (error) {
+    logger.error(`Failed to resolve ELSER model definition: ${error}`);
+    return defaultModelId;
+  }
+}
diff --git a/...bility_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts b/...bility_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
@@ -58,7 +58,7 @@ export class KnowledgeBaseService {
       asCurrentUser: ElasticsearchClient;
       asInternalUser: ElasticsearchClient;
     },
-    modelId: string | undefined
+    modelId: string
   ) {
     await deleteInferenceEndpoint({ esClient }).catch((e) => {}); // ensure existing inference endpoint is deleted
     return createInferenceEndpoint({ esClient, logger: this.dependencies.logger, modelId });

diff --git a/...ility_ai_assistant/server/service/knowledge_base_service/recall_from_search_connectors.ts b/...ility_ai_assistant/server/service/knowledge_base_service/recall_from_search_connectors.ts
@@ -10,10 +10,10 @@ import { IUiSettingsClient } from '@kbn/core-ui-settings-server';
 import { isEmpty, orderBy, compact } from 'lodash';
 import type { Logger } from '@kbn/logging';
 import { CoreSetup } from '@kbn/core-lifecycle-server';
-import { firstValueFrom } from 'rxjs';
 import { RecalledEntry } from '.';
 import { aiAssistantSearchConnectorIndexPattern } from '../../../common';
 import { ObservabilityAIAssistantPluginStartDependencies } from '../../types';
+import { getElserModelId } from './get_elser_model_id';
 
 export async function recallFromSearchConnectors({
   queries,
@@ -128,7 +128,7 @@ async function recallFromLegacyConnectors({
 }): Promise<RecalledEntry[]> {
   const ML_INFERENCE_PREFIX = 'ml.inference.';
 
-  const modelIdPromise = getElserModelId(core, logger); // pre-fetch modelId in parallel with fieldCaps
+  const modelIdPromise = getElserModelId({ core, logger }); // pre-fetch modelId in parallel with fieldCaps
   const fieldCaps = await esClient.asCurrentUser.fieldCaps({
     index: connectorIndices,
     fields: `${ML_INFERENCE_PREFIX}*`,
@@ -230,42 +230,3 @@ async function getConnectorIndices(
 
   return connectorIndices;
 }
-
-async function getElserModelId(
-  core: CoreSetup<ObservabilityAIAssistantPluginStartDependencies>,
-  logger: Logger
-) {
-  const defaultModelId = '.elser_model_2';
-  const [_, pluginsStart] = await core.getStartServices();
-
-  // Wait for the license to be available so the ML plugin's guards pass once we ask for ELSER stats
-  const license = await firstValueFrom(pluginsStart.licensing.license$);
-  if (!license.hasAtLeast('enterprise')) {
-    return defaultModelId;
-  }
-
-  try {
-    // Wait for the ML plugin's dependency on the internal saved objects client to be ready
-    const { ml } = await core.plugins.onSetup('ml');
-
-    if (!ml.found) {
-      throw new Error('Could not find ML plugin');
-    }
-
-    const elserModelDefinition = await (
-      ml.contract as {
-        trainedModelsProvider: (
-          request: {},
-          soClient: {}
-        ) => { getELSER: () => Promise<{ model_id: string }> };
-      }
-    )
-      .trainedModelsProvider({} as any, {} as any) // request, savedObjectsClient (but we fake it to use the internal user)
-      .getELSER();
-
-    return elserModelDefinition.model_id;
-  } catch (error) {
-    logger.error(`Failed to resolve ELSER model definition: ${error}`);
-    return defaultModelId;
-  }
-}