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

[Backport 2.x] feat: added an AI assistant trigger button to query editor #278

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion opensearch_dashboards.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"opensearchDashboardsReact",
"opensearchDashboardsUtils",
"visualizations",
"savedObjects"
"savedObjects",
"uiActions"
],
"optionalPlugins": [
"dataSource",
Expand Down
15 changes: 15 additions & 0 deletions public/assets/assistant_trigger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 56 additions & 0 deletions public/components/ui_action_context_menu.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import React, { useState, useRef } from 'react';
import useAsync from 'react-use/lib/useAsync';
import { EuiButtonIcon, EuiContextMenu, EuiPopover } from '@elastic/eui';

import { buildContextMenuForActions } from '../../../../src/plugins/ui_actions/public';
import { AI_ASSISTANT_QUERY_EDITOR_TRIGGER } from '../ui_triggers';
import { getUiActions } from '../services';
import assistantTriggerIcon from '../assets/assistant_trigger.svg';

export const ActionContextMenu = () => {
const uiActions = getUiActions();
const actionsRef = useRef(uiActions.getTriggerActions(AI_ASSISTANT_QUERY_EDITOR_TRIGGER));
const [open, setOpen] = useState(false);

const panels = useAsync(
() =>
buildContextMenuForActions({
actions: actionsRef.current.map((action) => ({
action,
context: {},
// eslint-disable-next-line @typescript-eslint/no-explicit-any
trigger: AI_ASSISTANT_QUERY_EDITOR_TRIGGER as any,
})),
closeMenu: () => setOpen(false),
}),
[]
);

if (actionsRef.current.length === 0) {
return null;
}

return (
<EuiPopover
button={
<EuiButtonIcon
aria-label="AI assistant trigger button"
size="s"
iconType={assistantTriggerIcon}
onClick={() => setOpen(!open)}
/>
}
isOpen={open}
panelPaddingSize="none"
anchorPosition="downRight"
closePopover={() => setOpen(false)}
>
<EuiContextMenu size="s" initialPanelId={'mainMenu'} panels={panels.value} />
</EuiPopover>
);
};
4 changes: 4 additions & 0 deletions public/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,7 @@ button.llm-chat-error-refresh-button.llm-chat-error-refresh-button {
display: none;
}
}

.osdQueryEditorExtensionComponent__assistant-query-actions {
margin-left: auto;
}
45 changes: 42 additions & 3 deletions public/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { i18n } from '@osd/i18n';
import { EuiLoadingSpinner } from '@elastic/eui';
import React, { lazy, Suspense } from 'react';
import { Subscription } from 'rxjs';
import { of, Subscription } from 'rxjs';
import {
AppMountParameters,
AppNavLinkStatus,
Expand Down Expand Up @@ -39,12 +39,16 @@ import {
setNotifications,
setIncontextInsightRegistry,
setConfigSchema,
setUiActions,
} from './services';
import { ConfigSchema } from '../common/types/config';
import { DataSourceService } from './services/data_source_service';
import { ASSISTANT_API, DEFAULT_USER_NAME } from '../common/constants/llm';
import { IncontextInsightProps } from './components/incontext_insight';
import { AssistantService } from './services/assistant_service';
import { ActionContextMenu } from './components/ui_action_context_menu';
import { AI_ASSISTANT_QUERY_EDITOR_TRIGGER, bootstrap } from './ui_triggers';
import { TEXT2VIZ_APP_ID } from './text2viz';

export const [getCoreStart, setCoreStart] = createGetterSetter<CoreStart>('CoreStart');

Expand Down Expand Up @@ -102,6 +106,9 @@ export class AssistantPlugin
return account;
};

// setup ui trigger
bootstrap(setupDeps.uiActions);

const dataSourceSetupResult = this.dataSourceService.setup({
uiSettings: core.uiSettings,
dataSourceManagement: setupDeps.dataSourceManagement,
Expand Down Expand Up @@ -132,7 +139,7 @@ export class AssistantPlugin
});

core.application.register({
id: 'text2viz',
id: TEXT2VIZ_APP_ID,
title: i18n.translate('dashboardAssistant.feature.text2viz', {
defaultMessage: 'Natural language previewer',
}),
Expand Down Expand Up @@ -188,6 +195,19 @@ export class AssistantPlugin
setupChat();
}

setupDeps.data.__enhance({
editor: {
queryEditorExtension: {
id: 'assistant-query-actions',
order: 2000,
isEnabled$: () => of(true),
getComponent: () => {
return <ActionContextMenu />;
},
},
},
});

return {
dataSource: dataSourceSetupResult,
registerMessageRenderer: (contentType, render) => {
Expand All @@ -203,6 +223,9 @@ export class AssistantPlugin
chatEnabled: () => this.config.chat.enabled,
nextEnabled: () => this.config.next.enabled,
assistantActions,
assistantTriggers: {
AI_ASSISTANT_QUERY_EDITOR_TRIGGER,
},
registerIncontextInsight: this.incontextInsightRegistry.register.bind(
this.incontextInsightRegistry
),
Expand All @@ -215,12 +238,28 @@ export class AssistantPlugin
};
}

public start(core: CoreStart): AssistantStart {
public start(
core: CoreStart,
{ data, uiActions }: AssistantPluginStartDependencies
): AssistantStart {
const assistantServiceStart = this.assistantService.start(core.http);
setCoreStart(core);
setChrome(core.chrome);
setNotifications(core.notifications);
setConfigSchema(this.config);
setUiActions(uiActions);

if (this.config.next.enabled) {
uiActions.addTriggerAction(AI_ASSISTANT_QUERY_EDITOR_TRIGGER, {
id: 'assistant_generate_visualization_action',
order: 1,
getDisplayName: () => 'Generate visualization',
getIconType: () => 'visLine' as const,
execute: async () => {
core.application.navigateToApp(TEXT2VIZ_APP_ID);
},
});
}

return {
dataSource: this.dataSourceService.start(),
Expand Down
3 changes: 3 additions & 0 deletions public/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

import { createGetterSetter } from '../../../../src/plugins/opensearch_dashboards_utils/public';
import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
import { ChromeStart, NotificationsStart } from '../../../../src/core/public';
import { IncontextInsightRegistry } from './incontext_insight';
import { ConfigSchema } from '../../common/types/config';
Expand All @@ -24,4 +25,6 @@ export const [getNotifications, setNotifications] = createGetterSetter<Notificat

export const [getConfigSchema, setConfigSchema] = createGetterSetter<ConfigSchema>('ConfigSchema');

export const [getUiActions, setUiActions] = createGetterSetter<UiActionsStart>('uiActions');

export { DataSourceService, DataSourceServiceContract } from './data_source_service';
2 changes: 2 additions & 0 deletions public/text2viz.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { Text2Viz } from './components/visualization/text2viz';
import { OpenSearchDashboardsContextProvider } from '../../../src/plugins/opensearch_dashboards_react/public';
import { StartServices } from './types';

export const TEXT2VIZ_APP_ID = 'text2viz';

export const renderText2VizApp = (params: AppMountParameters, services: StartServices) => {
ReactDOM.render(
<OpenSearchDashboardsContextProvider services={services}>
Expand Down
4 changes: 4 additions & 0 deletions public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../src/plugins/data/public';
import { AppMountParameters, CoreStart } from '../../../src/core/public';
import { AssistantClient } from './services/assistant_client';
import { UiActionsSetup, UiActionsStart } from '../../../src/plugins/ui_actions/public';

export interface RenderProps {
props: MessageContentProps;
Expand All @@ -40,13 +41,15 @@ export interface AssistantPluginStartDependencies {
visualizations: VisualizationsStart;
embeddable: EmbeddableStart;
dashboard: DashboardStart;
uiActions: UiActionsStart;
}

export interface AssistantPluginSetupDependencies {
data: DataPublicPluginSetup;
visualizations: VisualizationsSetup;
embeddable: EmbeddableSetup;
dataSourceManagement?: DataSourceManagementPluginSetup;
uiActions: UiActionsSetup;
}

export interface AssistantSetup {
Expand All @@ -62,6 +65,7 @@ export interface AssistantSetup {
*/
nextEnabled: () => boolean;
assistantActions: Omit<AssistantActions, 'executeAction'>;
assistantTriggers: { AI_ASSISTANT_QUERY_EDITOR_TRIGGER: string };
registerIncontextInsight: IncontextInsightRegistry['register'];
renderIncontextInsight: (component: React.ReactNode) => React.ReactNode;
}
Expand Down
22 changes: 22 additions & 0 deletions public/ui_triggers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import { Trigger, UiActionsSetup } from '../../../src/plugins/ui_actions/public';

export const AI_ASSISTANT_QUERY_EDITOR_TRIGGER = 'AI_ASSISTANT_QUERY_EDITOR_TRIGGER';

declare module '../../../src/plugins/ui_actions/public' {
export interface TriggerContextMapping {
[AI_ASSISTANT_QUERY_EDITOR_TRIGGER]: {};
}
}

const aiAssistantTrigger: Trigger<'AI_ASSISTANT_QUERY_EDITOR_TRIGGER'> = {
id: AI_ASSISTANT_QUERY_EDITOR_TRIGGER,
};

export const bootstrap = (uiActions: UiActionsSetup) => {
uiActions.registerTrigger(aiAssistantTrigger);
};
Loading