[8.x] [Observability AI Assistant] migrate to inference client #197630 (

#199286) (#203399) # Backport This will backport the following commits from `main` to `8.x`: - [[Observability AI Assistant] migrate to inference client #197630 (#199286)](#199286)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Arturo Lidueña <[email protected]>
elastic · Dec 9, 2024 · 54d86c7 · 54d86c7
1 parent 4928233
commit 54d86c7
Show file tree

Hide file tree

Showing 47 changed files with 559 additions and 2,667 deletions.
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/connectors.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/common/connectors.ts
@@ -11,12 +11,6 @@ export enum ObservabilityAIAssistantConnectorType {
   Gemini = '.gemini',
 }
 
-export const SUPPORTED_CONNECTOR_TYPES = [
-  ObservabilityAIAssistantConnectorType.OpenAI,
-  ObservabilityAIAssistantConnectorType.Bedrock,
-  ObservabilityAIAssistantConnectorType.Gemini,
-];
-
 export function isSupportedConnectorType(
   type: string
 ): type is ObservabilityAIAssistantConnectorType {

diff --git a/...plugins/observability_solution/observability_ai_assistant/common/conversation_complete.ts b/...plugins/observability_solution/observability_ai_assistant/common/conversation_complete.ts
@@ -10,6 +10,7 @@ import { TokenCount as TokenCountType, type Message } from './types';
 
 export enum StreamingChatResponseEventType {
   ChatCompletionChunk = 'chatCompletionChunk',
+  ChatCompletionMessage = 'chatCompletionMessage',
   ConversationCreate = 'conversationCreate',
   ConversationUpdate = 'conversationUpdate',
   MessageAdd = 'messageAdd',
@@ -25,19 +26,26 @@ type StreamingChatResponseEventBase<
   type: TEventType;
 } & TData;
 
-export type ChatCompletionChunkEvent = StreamingChatResponseEventBase<
-  StreamingChatResponseEventType.ChatCompletionChunk,
-  {
-    id: string;
-    message: {
-      content?: string;
-      function_call?: {
-        name?: string;
-        arguments?: string;
+type BaseChatCompletionEvent<TType extends StreamingChatResponseEventType> =
+  StreamingChatResponseEventBase<
+    TType,
+    {
+      id: string;
+      message: {
+        content?: string;
+        function_call?: {
+          name?: string;
+          arguments?: string;
+        };
       };
-    };
-  }
->;
+    }
+  >;
+
+export type ChatCompletionChunkEvent =
+  BaseChatCompletionEvent<StreamingChatResponseEventType.ChatCompletionChunk>;
+
+export type ChatCompletionMessageEvent =
+  BaseChatCompletionEvent<StreamingChatResponseEventType.ChatCompletionMessage>;
 
 export type ConversationCreateEvent = StreamingChatResponseEventBase<
   StreamingChatResponseEventType.ConversationCreate,
@@ -100,6 +108,7 @@ export type TokenCountEvent = StreamingChatResponseEventBase<
 
 export type StreamingChatResponseEvent =
   | ChatCompletionChunkEvent
+  | ChatCompletionMessageEvent
   | ConversationCreateEvent
   | ConversationUpdateEvent
   | MessageAddEvent
@@ -112,7 +121,7 @@ export type StreamingChatResponseEventWithoutError = Exclude<
   ChatCompletionErrorEvent
 >;
 
-export type ChatEvent = ChatCompletionChunkEvent | TokenCountEvent;
+export type ChatEvent = ChatCompletionChunkEvent | TokenCountEvent | ChatCompletionMessageEvent;
 export type MessageOrChatEvent = ChatEvent | MessageAddEvent;
 
 export enum ChatCompletionErrorCode {

diff --git a/.../common/convert_messages_for_inference.ts → .../common/convert_messages_for_inference.ts b/.../common/convert_messages_for_inference.ts → .../common/convert_messages_for_inference.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { Message, MessageRole } from '@kbn/observability-ai-assistant-plugin/common';
 import {
   AssistantMessage,
   Message as InferenceMessage,
   MessageRole as InferenceMessageRole,
 } from '@kbn/inference-common';
 import { generateFakeToolCallId } from '@kbn/inference-plugin/common';
+import { Message, MessageRole } from '.';
 
 export function convertMessagesForInference(messages: Message[]): InferenceMessage[] {
   const inferenceMessages: InferenceMessage[] = [];

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/common/index.ts
@@ -17,6 +17,8 @@ export {
 
 export type {
   ChatCompletionChunkEvent,
+  ChatCompletionMessageEvent,
+  TokenCountEvent,
   ConversationCreateEvent,
   ConversationUpdateEvent,
   MessageAddEvent,

diff --git a/...ty_solution/observability_ai_assistant/common/utils/concatenate_chat_completion_chunks.ts b/...ty_solution/observability_ai_assistant/common/utils/concatenate_chat_completion_chunks.ts
@@ -6,8 +6,9 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { type Observable, scan } from 'rxjs';
-import type { ChatCompletionChunkEvent } from '../conversation_complete';
+import { type Observable, scan, filter, defaultIfEmpty } from 'rxjs';
+import type { ChatCompletionChunkEvent, ChatEvent } from '../conversation_complete';
+import { StreamingChatResponseEventType } from '../conversation_complete';
 import { MessageRole } from '../types';
 
 export interface ConcatenatedMessage {
@@ -24,8 +25,12 @@ export interface ConcatenatedMessage {
 
 export const concatenateChatCompletionChunks =
   () =>
-  (source: Observable<ChatCompletionChunkEvent>): Observable<ConcatenatedMessage> =>
+  (source: Observable<ChatEvent>): Observable<ConcatenatedMessage> =>
     source.pipe(
+      filter(
+        (event): event is ChatCompletionChunkEvent =>
+          event.type === StreamingChatResponseEventType.ChatCompletionChunk
+      ),
       scan(
         (acc, { message }) => {
           acc.message.content += message.content ?? '';
@@ -45,5 +50,16 @@ export const concatenateChatCompletionChunks =
             role: MessageRole.Assistant,
           },
         } as ConcatenatedMessage
-      )
+      ),
+      defaultIfEmpty({
+        message: {
+          content: '',
+          function_call: {
+            name: '',
+            arguments: '',
+            trigger: MessageRole.Assistant,
+          },
+          role: MessageRole.Assistant,
+        },
+      })
     );
diff --git a/...bility_solution/observability_ai_assistant/common/utils/emit_with_concatenated_message.ts b/...bility_solution/observability_ai_assistant/common/utils/emit_with_concatenated_message.ts
@@ -14,13 +14,15 @@ import {
   OperatorFunction,
   shareReplay,
   withLatestFrom,
+  filter,
 } from 'rxjs';
 import { withoutTokenCountEvents } from './without_token_count_events';
 import {
-  ChatCompletionChunkEvent,
+  type ChatCompletionChunkEvent,
   ChatEvent,
   MessageAddEvent,
   StreamingChatResponseEventType,
+  StreamingChatResponseEvent,
 } from '../conversation_complete';
 import {
   concatenateChatCompletionChunks,
@@ -51,13 +53,23 @@ function mergeWithEditedMessage(
   );
 }
 
+function filterChunkEvents(): OperatorFunction<
+  StreamingChatResponseEvent,
+  ChatCompletionChunkEvent
+> {
+  return filter(
+    (event): event is ChatCompletionChunkEvent =>
+      event.type === StreamingChatResponseEventType.ChatCompletionChunk
+  );
+}
+
 export function emitWithConcatenatedMessage<T extends ChatEvent>(
   callback?: ConcatenateMessageCallback
 ): OperatorFunction<T, T | MessageAddEvent> {
   return (source$) => {
     const shared = source$.pipe(shareReplay());
 
-    const withoutTokenCount$ = shared.pipe(withoutTokenCountEvents());
+    const withoutTokenCount$ = shared.pipe(filterChunkEvents());
 
     const response$ = concat(
       shared,

diff --git a/...s/observability_solution/observability_ai_assistant/common/utils/process_openai_stream.ts b/...s/observability_solution/observability_ai_assistant/common/utils/process_openai_stream.ts
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc b/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc
@@ -1,38 +1,26 @@
 {
   "type": "plugin",
   "id": "@kbn/observability-ai-assistant-plugin",
-  "owner": [
-    "@elastic/obs-ai-assistant"
-  ],
+  "owner": ["@elastic/obs-ai-assistant"],
   "group": "platform",
   "visibility": "shared",
   "plugin": {
     "id": "observabilityAIAssistant",
     "browser": true,
     "server": true,
-    "configPath": [
-      "xpack",
-      "observabilityAIAssistant"
-    ],
+    "configPath": ["xpack", "observabilityAIAssistant"],
     "requiredPlugins": [
       "actions",
       "features",
       "licensing",
       "security",
       "taskManager",
-      "dataViews"
-    ],
-    "optionalPlugins": [
-      "cloud",
-      "serverless"
-    ],
-    "requiredBundles": [
-      "kibanaReact",
-      "kibanaUtils"
-    ],
-    "runtimePluginDependencies": [
-      "ml"
+      "dataViews",
+      "inference"
     ],
+    "optionalPlugins": ["cloud", "serverless"],
+    "requiredBundles": ["kibanaReact", "kibanaUtils"],
+    "runtimePluginDependencies": ["ml"],
     "extraPublicDirs": []
   }
 }