Skip to content

Commit

Permalink
open_ai to openai
Browse files Browse the repository at this point in the history
  • Loading branch information
stephmilovic committed Sep 29, 2023
1 parent 91365d6 commit c9e2e98
Show file tree
Hide file tree
Showing 50 changed files with 73 additions and 76 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -1208,9 +1208,9 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users @elastic/security-threat-hunting-explore

## Explore owner connectors
/x-pack/plugins/stack_connectors/public/connector_types/open_ai @elastic/security-threat-hunting-explore
/x-pack/plugins/stack_connectors/server/connector_types/open_ai @elastic/security-threat-hunting-explore
/x-pack/plugins/stack_connectors/common/open_ai @elastic/security-threat-hunting-explore
/x-pack/plugins/stack_connectors/public/connector_types/openai @elastic/security-threat-hunting-explore
/x-pack/plugins/stack_connectors/server/connector_types/openai @elastic/security-threat-hunting-explore
/x-pack/plugins/stack_connectors/common/openai @elastic/security-threat-hunting-explore

## Defend Workflows owner connectors
/x-pack/plugins/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from '@elastic/eui';
import { css } from '@emotion/react';
import { DocLinksStart } from '@kbn/core-doc-links-browser';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { Conversation } from '../../..';
import { AssistantTitle } from '../assistant_title';
import { ConversationSelector } from '../conversations/conversation_selector';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import useEvent from 'react-use/lib/useEvent';
import { css } from '@emotion/react';

import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { Conversation } from '../../../..';
import { useAssistantContext } from '../../../assistant_context';
import * as i18n from './translations';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import React, { useCallback, useMemo, useState } from 'react';
import { css } from '@emotion/react';

import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { Conversation, Prompt } from '../../../..';
import { UseAssistantContext } from '../../../assistant_context';
import * as i18n from './translations';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
import { createPortal } from 'react-dom';
import { css } from '@emotion/react';

import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { ActionConnectorProps } from '@kbn/triggers-actions-ui-plugin/public/types';
import { ChatSend } from './chat_send';
import { BlockBotCallToAction } from './block_bot/cta';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
// eslint-disable-next-line @kbn/eslint/module_migration
import styled from 'styled-components';
import { css } from '@emotion/react';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { Conversation, Prompt, QuickPrompt } from '../../..';
import * as i18n from './translations';
import { useAssistantContext } from '../../assistant_context';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useCallback } from 'react';
import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';

import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { Conversation } from '../../..';
import { AssistantSettings, CONVERSATIONS_TAB } from './assistant_settings';
import * as i18n from './translations';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';

export type ConversationRole = 'system' | 'user' | 'assistant';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import type { ActionConnector } from '@kbn/triggers-actions-ui-plugin/public';
import { ActionConnectorProps } from '@kbn/triggers-actions-ui-plugin/public/types';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { ActionTypeModel } from '@kbn/triggers-actions-ui-plugin/public';

interface GenAiConfig {
Expand All @@ -20,7 +20,7 @@ interface GenAiConfig {
* Returns the GenAiConfig for a given ActionConnector. Note that if the connector is preconfigured,
* the config will be undefined as the connector is neither available nor editable.
*
* TODO: Extract and use separate types from GenAiConfig from '@kbn/stack-connectors-plugin/common/open_ai/types'
* TODO: Extract and use separate types from GenAiConfig from '@kbn/stack-connectors-plugin/common/openai/types'
*
* @param connector
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/open_ai/constants';
import { OpenAiProviderType } from '@kbn/stack-connectors-plugin/common/openai/constants';
import { Conversation } from '../..';

export const alertConvo: Conversation = {
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/actions/server/lib/action_executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ export class ActionExecutor {

event.event = event.event || {};

// start open_ai extension
// add event.kibana.action.execution.open_ai to event log when OpenAI Connector is executed
// start openai extension
// add event.kibana.action.execution.openai to event log when OpenAI Connector is executed
if (result.status === 'ok' && actionTypeId === '.gen-ai') {
const data = result.data as unknown as {
usage: { prompt_tokens?: number; completion_tokens?: number; total_tokens?: number };
Expand All @@ -311,7 +311,7 @@ export class ActionExecutor {
},
};
}
// end open_ai extension
// end openai extension

const currentUser = security?.authc.getCurrentUser(request);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

import { i18n } from '@kbn/i18n';

export const OPEN_AI_TITLE = i18n.translate(
export const OPENAI_TITLE = i18n.translate(
'xpack.stackConnectors.components.genAi.connectorTypeTitle',
{
defaultMessage: 'OpenAI',
}
);
export const OPEN_AI_CONNECTOR_ID = '.gen-ai';
export const OPENAI_CONNECTOR_ID = '.gen-ai';
export enum SUB_ACTION {
RUN = 'run',
INVOKE_AI = 'invokeAI',
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/stack_connectors/public/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import OpenAILogo from '../connector_types/open_ai/logo';
import OpenAILogo from '../connector_types/openai/logo';

export { OPEN_AI_CONNECTOR_ID, OpenAiProviderType } from '../../common/open_ai/constants';
export { OPENAI_CONNECTOR_ID, OpenAiProviderType } from '../../common/openai/constants';
export { OpenAILogo };
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { getCasesWebhookConnectorType } from './cases_webhook';
import { getEmailConnectorType } from './email';
import { getIndexConnectorType } from './es_index';
import { getJiraConnectorType } from './jira';
import { getOpenAIConnectorType } from './open_ai';
import { getOpenAIConnectorType } from './openai';
import { getBedrockConnectorType } from './bedrock';
import { getOpsgenieConnectorType } from './opsgenie';
import { getPagerDutyConnectorType } from './pagerduty';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { httpServiceMock } from '@kbn/core-http-browser-mocks';
import { getDashboard } from './api';
import { SUB_ACTION } from '../../../common/open_ai/constants';
import { SUB_ACTION } from '../../../common/openai/constants';
const response = {
available: true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { HttpSetup } from '@kbn/core-http-browser';
import { ActionTypeExecutorResult, BASE_ACTION_API_PATH } from '@kbn/actions-plugin/common';
import { SUB_ACTION } from '../../../common/open_ai/constants';
import { SUB_ACTION } from '../../../common/openai/constants';
import { ConnectorExecutorResult, rewriteResponseToCamelCase } from '../lib/rewrite_response_body';

export async function getDashboard({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import ConnectorFields from './connector';
import { ConnectorFormTestProvider } from '../lib/test_utils';
import { act, fireEvent, render, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/open_ai/constants';
import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/openai/constants';
import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
import { useGetDashboard } from './use_get_dashboard';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
import { useKibana } from '@kbn/triggers-actions-ui-plugin/public';
import { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
import { OpenAiProviderType } from '../../../common/open_ai/constants';
import { OpenAiProviderType } from '../../../common/openai/constants';
import { useGetDashboard } from './use_get_dashboard';
import * as i18n from './translations';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';
import { ConfigFieldSchema, SecretsFieldSchema } from '@kbn/triggers-actions-ui-plugin/public';
import { FormattedMessage } from '@kbn/i18n-react';
import { EuiLink } from '@elastic/eui';
import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/open_ai/constants';
import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/openai/constants';
import * as i18n from './translations';

export const DEFAULT_URL = 'https://api.openai.com/v1/chat/completions' as const;
Expand Down Expand Up @@ -46,7 +46,7 @@ export const openAiConfig: ConfigFieldSchema[] = [
href="https://platform.openai.com/docs/api-reference"
target="_blank"
>
{`${i18n.OPEN_AI} ${i18n.DOCUMENTATION}`}
{`${i18n.OPENAI} ${i18n.DOCUMENTATION}`}
</EuiLink>
),
}}
Expand Down Expand Up @@ -108,7 +108,7 @@ export const openAiSecrets: SecretsFieldSchema[] = [
href="https://platform.openai.com/account/api-keys"
target="_blank"
>
{`${i18n.OPEN_AI} ${i18n.DOCUMENTATION}`}
{`${i18n.OPENAI} ${i18n.DOCUMENTATION}`}
</EuiLink>
),
}}
Expand Down Expand Up @@ -145,8 +145,8 @@ export const azureAiSecrets: SecretsFieldSchema[] = [
export const providerOptions = [
{
value: OpenAiProviderType.OpenAi,
text: i18n.OPEN_AI,
label: i18n.OPEN_AI,
text: i18n.OPENAI,
label: i18n.OPENAI,
},
{
value: OpenAiProviderType.AzureAi,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
* 2.0.
*/

export { getConnectorType as getOpenAIConnectorType } from './open_ai';
export { getConnectorType as getOpenAIConnectorType } from './openai';
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { TypeRegistry } from '@kbn/triggers-actions-ui-plugin/public/application
import { registerConnectorTypes } from '..';
import type { ActionTypeModel } from '@kbn/triggers-actions-ui-plugin/public/types';
import { registrationServicesMock } from '../../mocks';
import { SUB_ACTION } from '../../../common/open_ai/constants';
import { SUB_ACTION } from '../../../common/openai/constants';

const ACTION_TYPE_ID = '.gen-ai';
let actionTypeModel: ActionTypeModel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import { lazy } from 'react';
import { i18n } from '@kbn/i18n';
import type { GenericValidationResult } from '@kbn/triggers-actions-ui-plugin/public/types';
import { SUB_ACTION } from '../../../common/open_ai/constants';
import { OPEN_AI_CONNECTOR_ID, OPEN_AI_TITLE } from '../../../common/open_ai/constants';
import { SUB_ACTION } from '../../../common/openai/constants';
import { OPENAI_CONNECTOR_ID, OPENAI_TITLE } from '../../../common/openai/constants';
import { ActionParams, OpenAIConnector } from './types';

interface ValidationErrors {
Expand All @@ -18,12 +18,12 @@ interface ValidationErrors {
}
export function getConnectorType(): OpenAIConnector {
return {
id: OPEN_AI_CONNECTOR_ID,
id: OPENAI_CONNECTOR_ID,
iconClass: lazy(() => import('./logo')),
selectMessage: i18n.translate('xpack.stackConnectors.components.genAi.selectMessageText', {
defaultMessage: 'Send a request to OpenAI systems.',
}),
actionTypeTitle: OPEN_AI_TITLE,
actionTypeTitle: OPENAI_TITLE,
validateParams: async (
actionParams: ActionParams
): Promise<GenericValidationResult<ValidationErrors>> => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';
import { fireEvent, render } from '@testing-library/react';
import ParamsFields from './params';
import { MockCodeEditor } from '@kbn/triggers-actions-ui-plugin/public/application/code_editor.mock';
import { OpenAiProviderType, SUB_ACTION } from '../../../common/open_ai/constants';
import { OpenAiProviderType, SUB_ACTION } from '../../../common/openai/constants';
import { DEFAULT_BODY, DEFAULT_BODY_AZURE, DEFAULT_URL } from './constants';

const kibanaReactPath = '../../../../../../src/plugins/kibana_react/public';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
ActionConnectorMode,
JsonEditorWithMessageVariables,
} from '@kbn/triggers-actions-ui-plugin/public';
import { OpenAiProviderType, SUB_ACTION } from '../../../common/open_ai/constants';
import { OpenAiProviderType, SUB_ACTION } from '../../../common/openai/constants';
import { DEFAULT_BODY, DEFAULT_BODY_AZURE } from './constants';
import { OpenAIActionConnector, ActionParams } from './types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const API_PROVIDER_LABEL = i18n.translate(
}
);

export const OPEN_AI = i18n.translate('xpack.stackConnectors.components.genAi.openAi', {
export const OPENAI = i18n.translate('xpack.stackConnectors.components.genAi.openAi', {
defaultMessage: 'OpenAI',
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import { ActionTypeModel as ConnectorTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
import { UserConfiguredActionConnector } from '@kbn/triggers-actions-ui-plugin/public/types';
import { OpenAiProviderType, SUB_ACTION } from '../../../common/open_ai/constants';
import { RunActionParams } from '../../../common/open_ai/types';
import { OpenAiProviderType, SUB_ACTION } from '../../../common/openai/constants';
import { RunActionParams } from '../../../common/openai/types';

export interface ActionParams {
subAction: SUB_ACTION.RUN | SUB_ACTION.TEST;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { getTinesConnectorType } from './tines';
import { getActionType as getTorqConnectorType } from './torq';
import { getConnectorType as getEmailConnectorType } from './email';
import { getConnectorType as getIndexConnectorType } from './es_index';
import { getConnectorType as getOpenAIConnectorType } from './open_ai';
import { getConnectorType as getOpenAIConnectorType } from './openai';
import { getConnectorType as getBedrockConnectorType } from './bedrock';
import { getConnectorType as getPagerDutyConnectorType } from './pagerduty';
import { getConnectorType as getSwimlaneConnectorType } from './swimlane';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export const getDashboard = (dashboardId: string): SavedObject<DashboardAttribut
includeIsRegex: false,
excludeIsRegex: false,
orderAgg: {
label: 'Sum of kibana.action.execution.open_ai.usage.total_tokens',
label: 'Sum of kibana.action.execution.openai.usage.total_tokens',
dataType: 'number',
operationType: 'sum',
sourceField: 'kibana.action.execution.gen_ai.usage.total_tokens',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { actionsConfigMock } from '@kbn/actions-plugin/server/actions_config.moc
import { ActionsConfigurationUtilities } from '@kbn/actions-plugin/server/actions_config';
import axios from 'axios';
import { configValidator, getConnectorType } from '.';
import { Config, Secrets } from '../../../common/open_ai/types';
import { Config, Secrets } from '../../../common/openai/types';
import { SubActionConnectorType } from '@kbn/actions-plugin/server/sub_action_framework/types';
import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/open_ai/constants';
import { DEFAULT_OPENAI_MODEL, OpenAiProviderType } from '../../../common/openai/constants';

jest.mock('axios');
jest.mock('@kbn/actions-plugin/server/lib/axios_utils', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ import { urlAllowListValidator } from '@kbn/actions-plugin/server';
import { ValidatorServices } from '@kbn/actions-plugin/server/types';
import { assertURL } from '@kbn/actions-plugin/server/sub_action_framework/helpers/validators';
import {
OPEN_AI_CONNECTOR_ID,
OPEN_AI_TITLE,
OPENAI_CONNECTOR_ID,
OPENAI_TITLE,
OpenAiProviderType,
} from '../../../common/open_ai/constants';
import { ConfigSchema, SecretsSchema } from '../../../common/open_ai/schema';
import { Config, Secrets } from '../../../common/open_ai/types';
import { OpenAIConnector } from './open_ai';
} from '../../../common/openai/constants';
import { ConfigSchema, SecretsSchema } from '../../../common/openai/schema';
import { Config, Secrets } from '../../../common/openai/types';
import { OpenAIConnector } from './openai';
import { renderParameterTemplates } from './render';

export const getConnectorType = (): SubActionConnectorType<Config, Secrets> => ({
id: OPEN_AI_CONNECTOR_ID,
name: OPEN_AI_TITLE,
id: OPENAI_CONNECTOR_ID,
name: OPENAI_TITLE,
Service: OpenAIConnector,
schema: {
config: ConfigSchema,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
AZURE_OPENAI_CHAT_URL,
AZURE_OPENAI_COMPLETIONS_URL,
AZURE_OPENAI_COMPLETIONS_EXTENSIONS_URL,
} from '../../../../common/open_ai/constants';
} from '../../../../common/openai/constants';

describe('Azure Open AI Utils', () => {
const chatUrl =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
AZURE_OPENAI_CHAT_URL,
AZURE_OPENAI_COMPLETIONS_URL,
AZURE_OPENAI_COMPLETIONS_EXTENSIONS_URL,
} from '../../../../common/open_ai/constants';
} from '../../../../common/openai/constants';

const APIS_ALLOWING_STREAMING = new Set<string>([
AZURE_OPENAI_CHAT_URL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
DEFAULT_OPENAI_MODEL,
OPENAI_CHAT_URL,
OPENAI_LEGACY_COMPLETION_URL,
} from '../../../../common/open_ai/constants';
} from '../../../../common/openai/constants';

describe('Open AI Utils', () => {
describe('sanitizeRequest', () => {
Expand Down
Loading

0 comments on commit c9e2e98

Please sign in to comment.