Fix FTRs

elastic · Sep 17, 2024 · 0d44e5b · 0d44e5b
1 parent d6599c9
commit 0d44e5b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1 deletion.
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/mock.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant/public/mock.tsx
@@ -60,6 +60,7 @@ export const mockService: ObservabilityAIAssistantService = {
     predefinedConversation$: new Observable(),
   },
   navigate: async () => of(),
+  scope: 'all',
 };
 
 function createSetupContract(): ObservabilityAIAssistantPublicSetup {

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/storybook_mock.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant/public/storybook_mock.tsx
@@ -52,4 +52,5 @@ export const createStorybookService = (): ObservabilityAIAssistantService => ({
     predefinedConversation$: new Observable(),
   },
   navigate: async () => of(),
+  scope: 'observability',
 });
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/chat/route.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/chat/route.ts
@@ -30,7 +30,6 @@ const chatCompleteBaseRt = t.type({
       messages: t.array(messageRt),
       connectorId: t.string,
       persist: toBooleanRt,
-      scope: assistantScopeType,
     }),
     t.partial({
       conversationId: t.string,
@@ -62,6 +61,7 @@ const chatCompleteInternalRt = t.intersection([
   t.type({
     body: t.type({
       screenContexts: t.array(screenContextRt),
+      scope: assistantScopeType,
     }),
   }),
 ]);
@@ -310,6 +310,7 @@ const publicChatCompleteRoute = createObservabilityAIAssistantServerRoute({
       params: {
         body: {
           ...restOfBody,
+          scope: 'observability',
           screenContexts: [
             {
               actions,

diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
@@ -84,6 +84,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             connectorId,
             persist: true,
             screenContexts: params.screenContexts || [],
+            scope: 'all',
           })
           .then((response) => resolve(response))
           .catch((err) => reject(err));
@@ -136,6 +137,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           connectorId,
           persist: false,
           screenContexts: [],
+          scope: 'all',
         })
         .pipe(passThrough);
 
@@ -402,6 +404,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 connectorId,
                 persist: true,
                 screenContexts: [],
+                scope: 'observability',
               },
             },
           })
@@ -444,6 +447,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 persist: true,
                 screenContexts: [],
                 conversationId,
+                scope: 'observability',
               },
             },
           })

diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts
@@ -12,6 +12,7 @@ import {
   StreamingChatResponseEvent,
 } from '@kbn/observability-ai-assistant-plugin/common';
 import { Readable } from 'stream';
+import { AssistantScope } from '@kbn/observability-ai-assistant-plugin/common/types';
 import { CreateTest } from '../../../common/config';
 
 function decodeEvents(body: Readable | string) {
@@ -32,12 +33,14 @@ export async function invokeChatCompleteWithFunctionRequest({
   connectorId,
   observabilityAIAssistantAPIClient,
   functionCall,
+  scope,
 }: {
   connectorId: string;
   observabilityAIAssistantAPIClient: Awaited<
     ReturnType<CreateTest['services']['observabilityAIAssistantAPIClient']>
   >;
   functionCall: Message['message']['function_call'];
+  scope?: AssistantScope;
 }) {
   const { body } = await observabilityAIAssistantAPIClient
     .editorUser({
@@ -57,6 +60,7 @@ export async function invokeChatCompleteWithFunctionRequest({
           connectorId,
           persist: false,
           screenContexts: [],
+          scope: scope || 'observability',
         },
       },
     })

diff --git a/...i_assistant_api_integration/tests/knowledge_base/knowledge_base_user_instructions.spec.ts b/...i_assistant_api_integration/tests/knowledge_base/knowledge_base_user_instructions.spec.ts
@@ -249,6 +249,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               connectorId,
               persist: true,
               screenContexts: [],
+              scope: 'observability',
             },
           },
         }).expect(200);