[8.15] BedrockChat & GeminiChat (elastic#186809) (elastic#189008)

# Backport This will backport the following commits from `main` to `8.15`: - [`BedrockChat` & `GeminiChat` (elastic#186809)](elastic#186809)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  --------- Co-authored-by: Patryk Kopyciński <[email protected]>
pmuellr · Jul 23, 2024 · aa450a4 · aa450a4
1 parent 2f6e82d
commit aa450a4
Show file tree

Hide file tree

Showing 40 changed files with 2,015 additions and 215 deletions.
diff --git a/package.json b/package.json
@@ -80,14 +80,15 @@
   "resolutions": {
     "**/@bazel/typescript/protobufjs": "6.11.4",
     "**/@hello-pangea/dnd": "16.6.0",
-    "**/@langchain/core": "0.2.3",
+    "**/@langchain/core": "^0.2.17",
     "**/@types/node": "20.10.5",
     "**/@typescript-eslint/utils": "5.62.0",
     "**/chokidar": "^3.5.3",
     "**/d3-scale/**/d3-color": "npm:@elastic/[email protected]",
     "**/globule/minimatch": "^3.1.2",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-fetch/node-fetch": "^2.6.7",
+    "**/langchain": "^0.2.10",
     "**/react-intl/**/@types/react": "^17.0.45",
     "**/remark-parse/trim": "1.0.1",
     "**/sharp": "0.32.6",
@@ -96,6 +97,8 @@
   },
   "dependencies": {
     "@appland/sql-parser": "^1.5.1",
+    "@aws-crypto/sha256-js": "^5.2.0",
+    "@aws-crypto/util": "^5.2.0",
     "@babel/runtime": "^7.24.7",
     "@cfworker/json-schema": "^1.12.7",
     "@dnd-kit/core": "^6.1.0",
@@ -131,6 +134,7 @@
     "@formatjs/intl-pluralrules": "^5.2.12",
     "@formatjs/intl-relativetimeformat": "^11.2.12",
     "@formatjs/intl-utils": "^3.8.4",
+    "@google/generative-ai": "^0.7.0",
     "@grpc/grpc-js": "^1.8.22",
     "@hapi/accept": "^5.0.2",
     "@hapi/boom": "^9.1.4",
@@ -933,10 +937,11 @@
     "@kbn/watcher-plugin": "link:x-pack/plugins/watcher",
     "@kbn/xstate-utils": "link:packages/kbn-xstate-utils",
     "@kbn/zod-helpers": "link:packages/kbn-zod-helpers",
-    "@langchain/community": "^0.2.4",
-    "@langchain/core": "0.2.3",
-    "@langchain/langgraph": "^0.0.23",
-    "@langchain/openai": "^0.0.34",
+    "@langchain/community": "0.2.18",
+    "@langchain/core": "^0.2.17",
+    "@langchain/google-genai": "^0.0.23",
+    "@langchain/langgraph": "^0.0.29",
+    "@langchain/openai": "^0.1.3",
     "@langtrase/trace-attributes": "^3.0.8",
     "@launchdarkly/node-server-sdk": "^9.4.6",
     "@loaders.gl/core": "^3.4.7",
@@ -958,9 +963,11 @@
     "@paralleldrive/cuid2": "^2.2.2",
     "@reduxjs/toolkit": "1.9.7",
     "@slack/webhook": "^7.0.1",
-    "@smithy/eventstream-codec": "^3.0.0",
-    "@smithy/eventstream-serde-node": "^3.0.0",
-    "@smithy/types": "^3.0.0",
+    "@smithy/eventstream-codec": "^3.1.1",
+    "@smithy/eventstream-serde-node": "^3.0.3",
+    "@smithy/protocol-http": "^4.0.2",
+    "@smithy/signature-v4": "^3.1.1",
+    "@smithy/types": "^3.2.0",
     "@smithy/util-utf8": "^3.0.0",
     "@tanstack/react-query": "^4.29.12",
     "@tanstack/react-query-devtools": "^4.29.12",
@@ -1073,8 +1080,8 @@
     "jsonwebtoken": "^9.0.2",
     "jsts": "^1.6.2",
     "kea": "^2.6.0",
-    "langchain": "0.2.3",
-    "langsmith": "^0.1.30",
+    "langchain": "^0.2.10",
+    "langsmith": "^0.1.37",
     "launchdarkly-js-client-sdk": "^3.4.0",
     "launchdarkly-node-server-sdk": "^7.0.3",
     "load-json-file": "^6.2.0",

diff --git a/x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts b/x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts
@@ -21,4 +21,5 @@ export type AssistantFeatureKey = keyof AssistantFeatures;
 export const defaultAssistantFeatures = Object.freeze({
   assistantKnowledgeBaseByDefault: false,
   assistantModelEvaluation: false,
+  assistantBedrockChat: false,
 });
diff --git a/...ages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts b/...ages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts
@@ -18,6 +18,7 @@ import { z } from 'zod';
 
 export type GetCapabilitiesResponse = z.infer<typeof GetCapabilitiesResponse>;
 export const GetCapabilitiesResponse = z.object({
+  assistantBedrockChat: z.boolean(),
   assistantKnowledgeBaseByDefault: z.boolean(),
   assistantModelEvaluation: z.boolean(),
 });
diff --git a/...kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.schema.yaml b/...kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.schema.yaml
@@ -19,11 +19,14 @@ paths:
               schema:
                 type: object
                 properties:
+                  assistantBedrockChat:
+                    type: boolean
                   assistantKnowledgeBaseByDefault:
                     type: boolean
                   assistantModelEvaluation:
                     type: boolean
                 required:
+                  - assistantBedrockChat
                   - assistantKnowledgeBaseByDefault
                   - assistantModelEvaluation
         '400':

diff --git a/x-pack/packages/kbn-langchain/server/index.ts b/x-pack/packages/kbn-langchain/server/index.ts
@@ -5,9 +5,11 @@
  * 2.0.
  */
 
+import { ActionsClientBedrockChatModel } from './language_models/bedrock_chat';
 import { ActionsClientChatOpenAI } from './language_models/chat_openai';
 import { ActionsClientLlm } from './language_models/llm';
 import { ActionsClientSimpleChatModel } from './language_models/simple_chat_model';
+import { ActionsClientGeminiChatModel } from './language_models/gemini_chat';
 import { parseBedrockStream } from './utils/bedrock';
 import { parseGeminiResponse } from './utils/gemini';
 import { getDefaultArguments } from './language_models/constants';
@@ -16,7 +18,9 @@ export {
   parseBedrockStream,
   parseGeminiResponse,
   getDefaultArguments,
+  ActionsClientBedrockChatModel,
   ActionsClientChatOpenAI,
+  ActionsClientGeminiChatModel,
   ActionsClientLlm,
   ActionsClientSimpleChatModel,
 };
diff --git a/x-pack/packages/kbn-langchain/server/language_models/bedrock_chat.ts b/x-pack/packages/kbn-langchain/server/language_models/bedrock_chat.ts
@@ -0,0 +1,84 @@
+/*
+ * 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 { BedrockChat as _BedrockChat } from '@langchain/community/chat_models/bedrock/web';
+import type { ActionsClient } from '@kbn/actions-plugin/server';
+import { BaseChatModelParams } from '@langchain/core/language_models/chat_models';
+import { Logger } from '@kbn/logging';
+import { Readable } from 'stream';
+import { PublicMethodsOf } from '@kbn/utility-types';
+
+export const DEFAULT_BEDROCK_MODEL = 'anthropic.claude-3-5-sonnet-20240620-v1:0';
+export const DEFAULT_BEDROCK_REGION = 'us-east-1';
+
+export interface CustomChatModelInput extends BaseChatModelParams {
+  actionsClient: PublicMethodsOf<ActionsClient>;
+  connectorId: string;
+  logger: Logger;
+  temperature?: number;
+  signal?: AbortSignal;
+  model?: string;
+  maxTokens?: number;
+}
+
+export class ActionsClientBedrockChatModel extends _BedrockChat {
+  constructor({ actionsClient, connectorId, logger, ...params }: CustomChatModelInput) {
+    super({
+      ...params,
+      credentials: { accessKeyId: '', secretAccessKey: '' },
+      // only needed to force BedrockChat to use messages api for Claude v2
+      model: params.model ?? DEFAULT_BEDROCK_MODEL,
+      region: DEFAULT_BEDROCK_REGION,
+      fetchFn: async (url, options) => {
+        const inputBody = JSON.parse(options?.body as string);
+
+        if (this.streaming && !inputBody.tools?.length) {
+          const data = (await actionsClient.execute({
+            actionId: connectorId,
+            params: {
+              subAction: 'invokeStream',
+              subActionParams: {
+                messages: inputBody.messages,
+                temperature: params.temperature ?? inputBody.temperature,
+                stopSequences: inputBody.stop_sequences,
+                system: inputBody.system,
+                maxTokens: params.maxTokens ?? inputBody.max_tokens,
+                tools: inputBody.tools,
+                anthropicVersion: inputBody.anthropic_version,
+              },
+            },
+          })) as { data: Readable };
+
+          return {
+            body: Readable.toWeb(data.data),
+          } as unknown as Response;
+        }
+
+        const data = (await actionsClient.execute({
+          actionId: connectorId,
+          params: {
+            subAction: 'invokeAIRaw',
+            subActionParams: {
+              messages: inputBody.messages,
+              temperature: params.temperature ?? inputBody.temperature,
+              stopSequences: inputBody.stop_sequences,
+              system: inputBody.system,
+              maxTokens: params.maxTokens ?? inputBody.max_tokens,
+              tools: inputBody.tools,
+              anthropicVersion: inputBody.anthropic_version,
+            },
+          },
+        })) as { status: string; data: { message: string } };
+
+        return {
+          ok: data.status === 'ok',
+          json: () => data.data,
+        } as unknown as Response;
+      },
+    });
+  }
+}