[8.x] [Security Solution] [GenAi] refactor security ai assistant tool…

…s to use tool helper method (#212865) (#212928) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution] [GenAi] refactor security ai assistant tools to use tool helper method (#212865)](#212865)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Kenneth Kreindler <42113355+KDKHD@users.noreply.github.com>
elastic · Mar 3, 2025 · 9d69b19 · 9d69b19
1 parent dd55c99
commit 9d69b19
Show file tree

Hide file tree

Showing 14 changed files with 318 additions and 248 deletions.
diff --git a/...ns/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/agentRunnable.ts b/...ns/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/agentRunnable.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { ToolDefinition } from '@langchain/core/language_models/base';
+import {
+  ActionsClientChatBedrockConverse,
+  ActionsClientChatVertexAI,
+  ActionsClientChatOpenAI,
+} from '@kbn/langchain/server';
+import type { StructuredToolInterface } from '@langchain/core/tools';
+import {
+  AgentRunnableSequence,
+  createOpenAIToolsAgent,
+  createStructuredChatAgent,
+  createToolCallingAgent,
+} from 'langchain/agents';
+import { ChatPromptTemplate } from '@langchain/core/prompts';
+
+export const TOOL_CALLING_LLM_TYPES = new Set(['bedrock', 'gemini']);
+
+export const agentRunableFactory = async ({
+  llm,
+  isOpenAI,
+  llmType,
+  tools,
+  isStream,
+  prompt,
+}: {
+  llm: ActionsClientChatBedrockConverse | ActionsClientChatVertexAI | ActionsClientChatOpenAI;
+  isOpenAI: boolean;
+  llmType: string | undefined;
+  tools: StructuredToolInterface[] | ToolDefinition[];
+  isStream: boolean;
+  prompt: ChatPromptTemplate;
+}): Promise<AgentRunnableSequence> => {
+  const params = {
+    llm,
+    tools,
+    streamRunnable: isStream,
+    prompt,
+  } as const;
+
+  if (isOpenAI || llmType === 'inference') {
+    return createOpenAIToolsAgent(params);
+  }
+
+  if (llmType && TOOL_CALLING_LLM_TYPES.has(llmType)) {
+    return createToolCallingAgent(params);
+  }
+
+  return createStructuredChatAgent(params);
+};
diff --git a/...ty/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/graph.ts b/...ty/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/graph.ts
@@ -5,15 +5,13 @@
  * 2.0.
  */
 
-import { Annotation, END, START, StateGraph } from '@langchain/langgraph';
-import { AgentAction, AgentFinish, AgentStep } from '@langchain/core/agents';
+import { END, START, StateGraph } from '@langchain/langgraph';
 import { AgentRunnableSequence } from 'langchain/dist/agents/agent';
 import { StructuredTool } from '@langchain/core/tools';
 import type { Logger } from '@kbn/logging';
 
-import { BaseMessage } from '@langchain/core/messages';
 import { BaseChatModel } from '@langchain/core/language_models/chat_models';
-import { ConversationResponse, Replacements } from '@kbn/elastic-assistant-common';
+import { Replacements } from '@kbn/elastic-assistant-common';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { ActionsClient } from '@kbn/actions-plugin/server';
 import { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
@@ -29,6 +27,7 @@ import { getPersistedConversation } from './nodes/get_persisted_conversation';
 import { persistConversationChanges } from './nodes/persist_conversation_changes';
 import { respond } from './nodes/respond';
 import { NodeType } from './constants';
+import { getStateAnnotation } from './state';
 
 export const DEFAULT_ASSISTANT_GRAPH_ID = 'Default Security Assistant Graph';
 
@@ -61,87 +60,17 @@ export const getDefaultAssistantGraph = ({
   getFormattedTime,
 }: GetDefaultAssistantGraphParams) => {
   try {
-    // Default graph state
-    const graphAnnotation = Annotation.Root({
-      input: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => '',
-      }),
-      lastNode: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => 'start',
-      }),
-      steps: Annotation<AgentStep[]>({
-        reducer: (x: AgentStep[], y: AgentStep[]) => x.concat(y),
-        default: () => [],
-      }),
-      hasRespondStep: Annotation<boolean>({
-        reducer: (x: boolean, y?: boolean) => y ?? x,
-        default: () => false,
-      }),
-      agentOutcome: Annotation<AgentAction | AgentFinish | undefined>({
-        reducer: (
-          x: AgentAction | AgentFinish | undefined,
-          y?: AgentAction | AgentFinish | undefined
-        ) => y ?? x,
-        default: () => undefined,
-      }),
-      messages: Annotation<BaseMessage[]>({
-        reducer: (x: BaseMessage[], y: BaseMessage[]) => y ?? x,
-        default: () => [],
-      }),
-      chatTitle: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => '',
-      }),
-      llmType: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => 'unknown',
-      }),
-      isStream: Annotation<boolean>({
-        reducer: (x: boolean, y?: boolean) => y ?? x,
-        default: () => false,
-      }),
-      isOssModel: Annotation<boolean>({
-        reducer: (x: boolean, y?: boolean) => y ?? x,
-        default: () => false,
-      }),
-      connectorId: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => '',
-      }),
-      conversation: Annotation<ConversationResponse | undefined>({
-        reducer: (x: ConversationResponse | undefined, y?: ConversationResponse | undefined) =>
-          y ?? x,
-        default: () => undefined,
-      }),
-      conversationId: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => '',
-      }),
-      responseLanguage: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => 'English',
-      }),
-      provider: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: () => '',
-      }),
-      formattedTime: Annotation<string>({
-        reducer: (x: string, y?: string) => y ?? x,
-        default: getFormattedTime ?? (() => ''),
-      }),
-    });
-
     // Default node parameters
     const nodeParams: NodeParamsBase = {
       actionsClient,
       logger,
       savedObjectsClient,
     };
 
+    const stateAnnotation = getStateAnnotation({ getFormattedTime });
+
     // Put together a new graph using default state from above
-    const graph = new StateGraph(graphAnnotation)
+    const graph = new StateGraph(stateAnnotation)
       .addNode(NodeType.GET_PERSISTED_CONVERSATION, (state: AgentState) =>
         getPersistedConversation({
           ...nodeParams,

diff --git a/...ty/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/index.ts b/...ty/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/index.ts
@@ -7,11 +7,6 @@
 
 import { StructuredTool } from '@langchain/core/tools';
 import { getDefaultArguments } from '@kbn/langchain/server';
-import {
-  createOpenAIToolsAgent,
-  createStructuredChatAgent,
-  createToolCallingAgent,
-} from 'langchain/agents';
 import { APMTracer } from '@kbn/langchain/server/tracers/apm';
 import { TelemetryTracer } from '@kbn/langchain/server/tracers/telemetry';
 import { pruneContentReferences, MessageMetadata } from '@kbn/elastic-assistant-common';
@@ -25,12 +20,13 @@ import { getLlmClass } from '../../../../routes/utils';
 import { EsAnonymizationFieldsSchema } from '../../../../ai_assistant_data_clients/anonymization_fields/types';
 import { AssistantToolParams } from '../../../../types';
 import { AgentExecutor } from '../../executors/types';
-import { formatPrompt, formatPromptStructured } from './prompts';
+import { formatPrompt } from './prompts';
 import { GraphInputs } from './types';
 import { getDefaultAssistantGraph } from './graph';
 import { invokeGraph, streamGraph } from './helpers';
 import { transformESSearchToAnonymizationFields } from '../../../../ai_assistant_data_clients/anonymization_fields/helpers';
 import { DEFAULT_DATE_FORMAT_TZ } from '../../../../../common/constants';
+import { agentRunableFactory } from './agentRunnable';
 
 export const callAssistantGraph: AgentExecutor<true | false> = async ({
   abortSignal,
@@ -179,28 +175,21 @@ export const callAssistantGraph: AgentExecutor<true | false> = async ({
     savedObjectsClient,
   });
 
-  const agentRunnable =
-    isOpenAI || llmType === 'inference'
-      ? await createOpenAIToolsAgent({
-          llm: createLlmInstance(),
-          tools,
-          prompt: formatPrompt(defaultSystemPrompt, systemPrompt),
-          streamRunnable: isStream,
-        })
-      : llmType && ['bedrock', 'gemini'].includes(llmType)
-      ? await createToolCallingAgent({
-          llm: createLlmInstance(),
-          tools,
-          prompt: formatPrompt(defaultSystemPrompt, systemPrompt),
-          streamRunnable: isStream,
-        })
-      : // used with OSS models
-        await createStructuredChatAgent({
-          llm: createLlmInstance(),
-          tools,
-          prompt: formatPromptStructured(defaultSystemPrompt, systemPrompt),
-          streamRunnable: isStream,
-        });
+  const chatPromptTemplate = formatPrompt({
+    prompt: defaultSystemPrompt,
+    additionalPrompt: systemPrompt,
+    llmType,
+    isOpenAI,
+  });
+
+  const agentRunnable = await agentRunableFactory({
+    llm: createLlmInstance(),
+    isOpenAI,
+    llmType,
+    tools,
+    isStream,
+    prompt: chatPromptTemplate,
+  });
 
   const apmTracer = new APMTracer({ projectName: traceOptions?.projectName ?? 'default' }, logger);
   const telemetryTracer = telemetryParams
@@ -214,6 +203,7 @@ export const callAssistantGraph: AgentExecutor<true | false> = async ({
         logger
       )
     : undefined;
+
   const { provider } =
     !llmType || llmType === 'inference'
       ? await resolveProviderAndModel({
@@ -240,7 +230,7 @@ export const callAssistantGraph: AgentExecutor<true | false> = async ({
     ...(llmType === 'bedrock' ? { signal: abortSignal } : {}),
     getFormattedTime: () =>
       getFormattedTime({
-        screenContextTimezone: request.body.screenContext?.timeZone,
+        screenContextTimezone: screenContext?.timeZone,
         uiSettingsDateFormatTimezone,
       }),
   });

diff --git a/.../plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/prompts.ts b/.../plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/prompts.ts
@@ -6,8 +6,9 @@
  */
 
 import { ChatPromptTemplate } from '@langchain/core/prompts';
+import { TOOL_CALLING_LLM_TYPES } from './agentRunnable';
 
-export const formatPrompt = (prompt: string, additionalPrompt?: string) =>
+const formatPromptToolcalling = (prompt: string, additionalPrompt?: string) =>
   ChatPromptTemplate.fromMessages([
     ['system', additionalPrompt ? `${prompt}\n\n${additionalPrompt}` : prompt],
     ['placeholder', '{knowledge_history}'],
@@ -16,7 +17,7 @@ export const formatPrompt = (prompt: string, additionalPrompt?: string) =>
     ['placeholder', '{agent_scratchpad}'],
   ]);
 
-export const formatPromptStructured = (prompt: string, additionalPrompt?: string) =>
+const formatPromptStructured = (prompt: string, additionalPrompt?: string) =>
   ChatPromptTemplate.fromMessages([
     ['system', additionalPrompt ? `${prompt}\n\n${additionalPrompt}` : prompt],
     ['placeholder', '{knowledge_history}'],
@@ -26,3 +27,20 @@ export const formatPromptStructured = (prompt: string, additionalPrompt?: string
       '{input}\n\n{agent_scratchpad}\n\n(reminder to respond in a JSON blob no matter what)',
     ],
   ]);
+
+export const formatPrompt = ({
+  isOpenAI,
+  llmType,
+  prompt,
+  additionalPrompt,
+}: {
+  isOpenAI: boolean;
+  llmType: string | undefined;
+  prompt: string;
+  additionalPrompt?: string;
+}) => {
+  if (isOpenAI || llmType === 'inference' || (llmType && TOOL_CALLING_LLM_TYPES.has(llmType))) {
+    return formatPromptToolcalling(prompt, additionalPrompt);
+  }
+  return formatPromptStructured(prompt, additionalPrompt);
+};
diff --git a/...ty/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/state.ts b/...ty/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/state.ts
@@ -0,0 +1,86 @@
+/*
+ * 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 { ConversationResponse } from '@kbn/elastic-assistant-common';
+import { BaseMessage } from '@langchain/core/messages';
+import { Annotation } from '@langchain/langgraph';
+import { AgentStep, AgentAction, AgentFinish } from 'langchain/agents';
+
+export const getStateAnnotation = ({ getFormattedTime }: { getFormattedTime?: () => string }) => {
+  const graphAnnotation = Annotation.Root({
+    input: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => '',
+    }),
+    lastNode: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => 'start',
+    }),
+    steps: Annotation<AgentStep[]>({
+      reducer: (x: AgentStep[], y: AgentStep[]) => x.concat(y),
+      default: () => [],
+    }),
+    hasRespondStep: Annotation<boolean>({
+      reducer: (x: boolean, y?: boolean) => y ?? x,
+      default: () => false,
+    }),
+    agentOutcome: Annotation<AgentAction | AgentFinish | undefined>({
+      reducer: (
+        x: AgentAction | AgentFinish | undefined,
+        y?: AgentAction | AgentFinish | undefined
+      ) => y ?? x,
+      default: () => undefined,
+    }),
+    messages: Annotation<BaseMessage[]>({
+      reducer: (x: BaseMessage[], y: BaseMessage[]) => y ?? x,
+      default: () => [],
+    }),
+    chatTitle: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => '',
+    }),
+    llmType: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => 'unknown',
+    }),
+    isStream: Annotation<boolean>({
+      reducer: (x: boolean, y?: boolean) => y ?? x,
+      default: () => false,
+    }),
+    isOssModel: Annotation<boolean>({
+      reducer: (x: boolean, y?: boolean) => y ?? x,
+      default: () => false,
+    }),
+    connectorId: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => '',
+    }),
+    conversation: Annotation<ConversationResponse | undefined>({
+      reducer: (x: ConversationResponse | undefined, y?: ConversationResponse | undefined) =>
+        y ?? x,
+      default: () => undefined,
+    }),
+    conversationId: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => '',
+    }),
+    responseLanguage: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => 'English',
+    }),
+    provider: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: () => '',
+    }),
+    formattedTime: Annotation<string>({
+      reducer: (x: string, y?: string) => y ?? x,
+      default: getFormattedTime ?? (() => ''),
+    }),
+  });
+
+  return graphAnnotation;
+};