mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
83a31bfcc0
## Summary Resolves System Prompt not sending issues: https://github.com/elastic/kibana/issues/161809 Also resolves: - [X] Not being able to delete really long Conversation, System Prompt, and Quick Prompt names - [X] Fix user/all System Prompts being overridden on refresh - [X] Conversation without default System Prompt not healed if it is initial conversation when Assistant opens (Timeline) - [X] New conversation created from Conversations Settings not getting a connector by default - [X] Current conversation not selected by default when settings gear is clicked (and other assistant instances exist) - [X] Sent to Timeline action sends anonymized values instead of actual plaintext - [X] Clicking Submit does not clear the text area - [X] Remove System Prompt Tooltip - [X] Fixes confusion when System or Quick Prompt is empty by adding a placeholder value - [X] Shows (empty prompt) in System Prompt selector when the Prompt content is empty - [X] Fixes connector error callout flashing on initial load - [X] Shows `(empty prompt)` text within Prompt Editor when prompt content is empty to prevent confusion ### Checklist Delete any items that are not applicable to this PR. - [X] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
89 lines
2.8 KiB
TypeScript
89 lines
2.8 KiB
TypeScript
/*
|
|
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
|
* or more contributor license agreements. Licensed under the Elastic License
|
|
* 2.0; you may not use this file except in compliance with the Elastic License
|
|
* 2.0.
|
|
*/
|
|
|
|
import React from 'react';
|
|
import { Prompt } from '../types';
|
|
import { Conversation } from '../../assistant_context/types';
|
|
|
|
export interface CodeBlockDetails {
|
|
type: QueryType;
|
|
content: string;
|
|
start: number;
|
|
end: number;
|
|
getControlContainer?: () => Element | undefined;
|
|
button?: React.ReactNode;
|
|
}
|
|
|
|
export type QueryType = 'eql' | 'kql' | 'dsl' | 'json' | 'no-type';
|
|
|
|
/**
|
|
* `analyzeMarkdown` is a helper that enriches content returned from a query
|
|
* with action buttons
|
|
*
|
|
* Returns a list of code block details for each code block in the markdown,
|
|
* including the type of code block and the content of the code block.
|
|
*
|
|
* @param markdown
|
|
*/
|
|
export const analyzeMarkdown = (markdown: string): CodeBlockDetails[] => {
|
|
const codeBlockRegex = /```(\w+)?\s([\s\S]*?)```/g;
|
|
const matches = [...markdown.matchAll(codeBlockRegex)];
|
|
// If your codeblocks aren't getting tagged with the right language, add keywords to the array.
|
|
const types = {
|
|
eql: ['Event Query Language', 'EQL sequence query', 'EQL'],
|
|
kql: ['Kibana Query Language', 'KQL Query', 'KQL'],
|
|
dsl: [
|
|
'Elasticsearch QueryDSL',
|
|
'Elasticsearch Query DSL',
|
|
'Elasticsearch DSL',
|
|
'Query DSL',
|
|
'DSL',
|
|
],
|
|
};
|
|
|
|
const result: CodeBlockDetails[] = matches.map((match) => {
|
|
let type = match[1] || 'no-type';
|
|
if (type === 'no-type' || type === 'json') {
|
|
const start = match.index || 0;
|
|
const precedingText = markdown.slice(0, start);
|
|
for (const [typeKey, keywords] of Object.entries(types)) {
|
|
if (keywords.some((kw) => precedingText.toLowerCase().includes(kw.toLowerCase()))) {
|
|
type = typeKey;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
const content = match[2].trim();
|
|
const start = match.index || 0;
|
|
const end = start + match[0].length;
|
|
return { type: type as QueryType, content, start, end };
|
|
});
|
|
|
|
return result;
|
|
};
|
|
|
|
/**
|
|
* Returns the default system prompt for a given conversation
|
|
*
|
|
* @param allSystemPrompts All available System Prompts
|
|
* @param conversation Conversation to get the default system prompt for
|
|
*/
|
|
export const getDefaultSystemPrompt = ({
|
|
allSystemPrompts,
|
|
conversation,
|
|
}: {
|
|
allSystemPrompts: Prompt[];
|
|
conversation: Conversation | undefined;
|
|
}): Prompt | undefined => {
|
|
const conversationSystemPrompt = allSystemPrompts.find(
|
|
(prompt) => prompt.id === conversation?.apiConfig?.defaultSystemPromptId
|
|
);
|
|
const defaultNewSystemPrompt = allSystemPrompts.find((prompt) => prompt.isNewConversationDefault);
|
|
|
|
return conversationSystemPrompt ?? defaultNewSystemPrompt ?? allSystemPrompts?.[0];
|
|
};
|