From 551e1232b870654d036aff4d52f43443ee3ecf20 Mon Sep 17 00:00:00 2001 From: Dario Gieselaar Date: Mon, 13 May 2024 13:44:43 +0200 Subject: [PATCH] [Obs AI Assistant] Fix import issues from /public folders (#182940) Make sure the evaluation script doesn't import from `public` folders that include code that cannot run in Node.js. Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../scripts/evaluation/evaluation.ts | 2 +- .../scripts/evaluation/kibana_client.ts | 8 +++++--- .../scripts/evaluation/scenarios/alerts/index.spec.ts | 2 +- .../scripts/evaluation/scenarios/apm/index.spec.ts | 2 +- .../evaluation/scenarios/elasticsearch/index.spec.ts | 2 +- .../scripts/evaluation/scenarios/kb/index.spec.ts | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/evaluation.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/evaluation.ts index 738285ffefc6e2..98fe6903ba620a 100644 --- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/evaluation.ts +++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/evaluation.ts @@ -19,7 +19,7 @@ import * as table from 'table'; import { TableUserConfig } from 'table'; import { format, parse } from 'url'; import { ToolingLog } from '@kbn/tooling-log'; -import { MessageRole } from '@kbn/observability-ai-assistant-plugin/public'; +import { MessageRole } from '@kbn/observability-ai-assistant-plugin/common'; import { EvaluateWith, options } from './cli'; import { getServiceUrls } from './get_service_urls'; import { KibanaClient } from './kibana_client'; diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/kibana_client.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/kibana_client.ts index 364ef1c44a48f0..0de3d3cebabe31 100644 --- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/kibana_client.ts +++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/kibana_client.ts @@ -21,12 +21,10 @@ import { import type { ObservabilityAIAssistantScreenContext } from '@kbn/observability-ai-assistant-plugin/common/types'; import { throwSerializedChatCompletionErrors } from '@kbn/observability-ai-assistant-plugin/common/utils/throw_serialized_chat_completion_errors'; import { - APIReturnType, isSupportedConnectorType, Message, MessageRole, - ObservabilityAIAssistantAPIClientRequestParamsOf, -} from '@kbn/observability-ai-assistant-plugin/public'; +} from '@kbn/observability-ai-assistant-plugin/common'; import { streamIntoObservable } from '@kbn/observability-ai-assistant-plugin/server'; import { ToolingLog } from '@kbn/tooling-log'; import axios, { AxiosInstance, AxiosResponse, isAxiosError } from 'axios'; @@ -47,6 +45,10 @@ import { } from 'rxjs'; import { format, parse, UrlObject } from 'url'; import { inspect } from 'util'; +import type { + ObservabilityAIAssistantAPIClientRequestParamsOf, + APIReturnType, +} from '@kbn/observability-ai-assistant-plugin/public'; import { EvaluationResult } from './types'; // eslint-disable-next-line spaced-comment diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/alerts/index.spec.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/alerts/index.spec.ts index b746ea8d4645f2..d0d6dbe17f1240 100644 --- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/alerts/index.spec.ts +++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/alerts/index.spec.ts @@ -11,7 +11,7 @@ import expect from '@kbn/expect'; import { RuleResponse } from '@kbn/alerting-plugin/common/routes/rule/response/types/v1'; import moment from 'moment'; import { apm, timerange } from '@kbn/apm-synthtrace-client'; -import { MessageRole } from '@kbn/observability-ai-assistant-plugin/public'; +import { MessageRole } from '@kbn/observability-ai-assistant-plugin/common'; import { chatClient, kibanaClient, synthtraceEsClients, logger } from '../../services'; import { apmTransactionRateAIAssistant, diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/apm/index.spec.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/apm/index.spec.ts index 8668b3b9845287..9dfc11f290d790 100644 --- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/apm/index.spec.ts +++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/apm/index.spec.ts @@ -11,7 +11,7 @@ import expect from '@kbn/expect'; import moment from 'moment'; import { apm, timerange, serviceMap } from '@kbn/apm-synthtrace-client'; import { RuleResponse } from '@kbn/alerting-plugin/common/routes/rule/response/types/v1'; -import { MessageRole } from '@kbn/observability-ai-assistant-plugin/public'; +import { MessageRole } from '@kbn/observability-ai-assistant-plugin/common'; import { chatClient, kibanaClient, synthtraceEsClients } from '../../services'; import { apmErrorCountAIAssistant } from '../../alert_templates/templates'; diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/elasticsearch/index.spec.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/elasticsearch/index.spec.ts index b79d55d81daf26..898489290cc104 100644 --- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/elasticsearch/index.spec.ts +++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/elasticsearch/index.spec.ts @@ -8,7 +8,7 @@ /// import expect from '@kbn/expect'; -import { MessageRole } from '@kbn/observability-ai-assistant-plugin/public'; +import { MessageRole } from '@kbn/observability-ai-assistant-plugin/common'; import { chatClient, esClient } from '../../services'; describe('elasticsearch functions', () => { diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/kb/index.spec.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/kb/index.spec.ts index d32dcae5ac8b5a..9e27ff94f3111a 100644 --- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/kb/index.spec.ts +++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/scripts/evaluation/scenarios/kb/index.spec.ts @@ -8,7 +8,7 @@ /// import expect from '@kbn/expect'; -import { MessageRole } from '@kbn/observability-ai-assistant-plugin/public'; +import { MessageRole } from '@kbn/observability-ai-assistant-plugin/common'; import { chatClient, esClient } from '../../services'; describe('kb functions', () => {