Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Obs AI Assistant] Use preconfigured Elser inference endpoint #201108

Closed
wants to merge 14 commits into from
Closed
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { ConnectorSelectorBase } from '@kbn/observability-ai-assistant-plugin/public';
import type { UseGenAIConnectorsResult } from '../hooks/use_genai_connectors';
import { useKibana } from '../hooks/use_kibana';
import { useKnowledgeBase } from '../hooks';
import { useKnowledgeBaseStatus } from '../hooks';

export function ChatActionsMenu({
connectors,
Expand All @@ -32,7 +32,7 @@ export function ChatActionsMenu({
onCopyConversationClick: () => void;
}) {
const { application, http } = useKibana().services;
const knowledgeBase = useKnowledgeBase();
const knowledgeBase = useKnowledgeBaseStatus();
const [isOpen, setIsOpen] = useState(false);

const handleNavigateToConnectors = () => {
Expand Down
12 changes: 0 additions & 12 deletions x-pack/packages/kbn-ai-assistant/src/chat/chat_body.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@ const defaultProps: ComponentStoryObj<typeof Component> = {
},
},
],
knowledgeBase: {
status: {
loading: false,
value: {
ready: true,
enabled: true,
},
refresh: () => {},
},
isInstalling: false,
install: async () => {},
},
connectors: {
connectors: [
{
Expand Down
10 changes: 1 addition & 9 deletions x-pack/packages/kbn-ai-assistant/src/chat/chat_body.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import type { AuthenticatedUser } from '@kbn/security-plugin/common';
import { euiThemeVars } from '@kbn/ui-theme';
import { findLastIndex } from 'lodash';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import type { UseKnowledgeBaseResult } from '../hooks/use_knowledge_base';
import { ASSISTANT_SETUP_TITLE, EMPTY_CONVERSATION_TITLE, UPGRADE_LICENSE_TITLE } from '../i18n';
import { useAIAssistantChatService } from '../hooks/use_ai_assistant_chat_service';
import { useSimulatedFunctionCalling } from '../hooks/use_simulated_function_calling';
Expand Down Expand Up @@ -107,7 +106,6 @@ export function ChatBody({
initialConversationId,
initialMessages,
initialTitle,
knowledgeBase,
showLinkToConversationsApp,
onConversationUpdate,
onToggleFlyoutPositionMode,
Expand All @@ -119,7 +117,6 @@ export function ChatBody({
initialTitle?: string;
initialMessages?: Message[];
initialConversationId?: string;
knowledgeBase: UseKnowledgeBaseResult;
showLinkToConversationsApp: boolean;
onConversationUpdate: (conversation: { conversation: Conversation['conversation'] }) => void;
onToggleFlyoutPositionMode?: (flyoutPositionMode: FlyoutPositionMode) => void;
Expand Down Expand Up @@ -148,10 +145,7 @@ export function ChatBody({
let footer: React.ReactNode;

const isLoading = Boolean(
connectors.loading ||
knowledgeBase.status.loading ||
state === ChatState.Loading ||
conversation.loading
connectors.loading || state === ChatState.Loading || conversation.loading
);

let title = conversation.value?.conversation.title || initialTitle;
Expand Down Expand Up @@ -352,7 +346,6 @@ export function ChatBody({
{connectors.connectors?.length === 0 || messages.length === 1 ? (
<WelcomeMessage
connectors={connectors}
knowledgeBase={knowledgeBase}
onSelectPrompt={(message) =>
next(
messages.concat([
Expand All @@ -367,7 +360,6 @@ export function ChatBody({
) : (
<ChatTimeline
messages={messages}
knowledgeBase={knowledgeBase}
chatService={chatService}
currentUser={currentUser}
chatState={state}
Expand Down
4 changes: 0 additions & 4 deletions x-pack/packages/kbn-ai-assistant/src/chat/chat_flyout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { ChatBody } from './chat_body';
import { ChatInlineEditingContent } from './chat_inline_edit';
import { ConversationList } from './conversation_list';
import { useKibana } from '../hooks/use_kibana';
import { useKnowledgeBase } from '../hooks/use_knowledge_base';
import { NewChatButton } from '../buttons/new_chat_button';

const CONVERSATIONS_SIDEBAR_WIDTH = 260;
Expand Down Expand Up @@ -64,8 +63,6 @@ export function ChatFlyout({

const connectors = useGenAIConnectors();

const knowledgeBase = useKnowledgeBase();

const [conversationId, setConversationId] = useState<string | undefined>(undefined);

const [flyoutPositionMode, setFlyoutPositionMode] = useState<FlyoutPositionMode>(
Expand Down Expand Up @@ -266,7 +263,6 @@ export function ChatFlyout({
initialTitle={initialTitle}
initialMessages={initialMessages}
initialConversationId={conversationId}
knowledgeBase={knowledgeBase}
showLinkToConversationsApp
onConversationUpdate={(conversation) => {
if (!conversationId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,6 @@ const Template: ComponentStory<typeof Component> = (props: ChatTimelineProps) =>
};

const defaultProps: ComponentProps<typeof Component> = {
knowledgeBase: {
status: {
loading: false,
value: {
ready: true,
enabled: true,
},
refresh: () => {},
},
isInstalling: false,
installError: undefined,
install: async () => {},
},
chatService: {
hasRenderFunction: () => false,
} as unknown as ObservabilityAIAssistantChatService,
Expand Down
2 changes: 0 additions & 2 deletions x-pack/packages/kbn-ai-assistant/src/chat/chat_timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
type ObservabilityAIAssistantChatService,
type TelemetryEventTypeWithPayload,
} from '@kbn/observability-ai-assistant-plugin/public';
import type { UseKnowledgeBaseResult } from '../hooks/use_knowledge_base';
import { ChatItem } from './chat_item';
import { ChatConsolidatedItems } from './chat_consolidated_items';
import { getTimelineItemsfromConversation } from '../utils/get_timeline_items_from_conversation';
Expand Down Expand Up @@ -47,7 +46,6 @@ export interface ChatTimelineItem

export interface ChatTimelineProps {
messages: Message[];
knowledgeBase: UseKnowledgeBaseResult;
chatService: ObservabilityAIAssistantChatService;
hasConnector: boolean;
chatState: ChatState;
Expand Down

This file was deleted.

122 changes: 0 additions & 122 deletions x-pack/packages/kbn-ai-assistant/src/chat/knowledge_base_callout.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions x-pack/packages/kbn-ai-assistant/src/chat/welcome_message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, useCurrentEuiBreakpoint } from '@
import type { ActionConnector } from '@kbn/triggers-actions-ui-plugin/public';
import { GenerativeAIForObservabilityConnectorFeatureId } from '@kbn/actions-plugin/common';
import { isSupportedConnectorType } from '@kbn/observability-ai-assistant-plugin/public';
import type { UseKnowledgeBaseResult } from '../hooks/use_knowledge_base';
import type { UseGenAIConnectorsResult } from '../hooks/use_genai_connectors';
import { Disclaimer } from './disclaimer';
import { WelcomeMessageConnectors } from './welcome_message_connectors';
import { WelcomeMessageKnowledgeBase } from './welcome_message_knowledge_base';
import { StarterPrompts } from './starter_prompts';
import { useKibana } from '../hooks/use_kibana';

Expand All @@ -30,11 +28,9 @@ const centerMaxWidthClassName = css`

export function WelcomeMessage({
connectors,
knowledgeBase,
onSelectPrompt,
}: {
connectors: UseGenAIConnectorsResult;
knowledgeBase: UseKnowledgeBaseResult;
onSelectPrompt: (prompt: string) => void;
}) {
const breakpoint = useCurrentEuiBreakpoint();
Expand All @@ -59,10 +55,6 @@ export function WelcomeMessage({
if (isSupportedConnectorType(createdConnector.actionTypeId)) {
connectors.reloadConnectors();
}

if (!knowledgeBase.status.value || knowledgeBase.status.value?.ready === false) {
knowledgeBase.install();
}
};

const ConnectorFlyout = useMemo(
Expand All @@ -85,9 +77,6 @@ export function WelcomeMessage({
connectors={connectors}
onSetupConnectorClick={handleConnectorClick}
/>
{knowledgeBase.status.value?.enabled ? (
<WelcomeMessageKnowledgeBase connectors={connectors} knowledgeBase={knowledgeBase} />
) : null}
</EuiFlexItem>

<EuiFlexItem grow={false}>
Expand Down
Loading
Loading