diff --git a/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/aliases.ts b/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/aliases.ts index 78fe8b7f9549f..d797815012640 100644 --- a/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/aliases.ts +++ b/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/aliases.ts @@ -12,7 +12,7 @@ const aliases: Record = { STATS: ['STATS_BY', 'BY', 'STATS...BY', 'STATS ... BY'], OPERATORS: ['LIKE', 'RLIKE', 'IN'], - JOIN: ['LOOKUP JOIN'], + LOOKUP_JOIN: ['LOOKUPJOIN'], }; const getAliasMap = () => { diff --git a/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/esql_doc_base.ts b/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/esql_doc_base.ts index ce7cabcdc120e..4ce8517878da9 100644 --- a/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/esql_doc_base.ts +++ b/x-pack/platform/plugins/shared/inference/server/tasks/nl_to_esql/doc_base/esql_doc_base.ts @@ -43,8 +43,7 @@ export class EsqlDocumentBase { }: GetDocsOptions = {} ) { const keywords = rawKeywords.map((raw) => { - // LOOKUP JOIN has space so we want to retain as is - let keyword = raw.toLowerCase().includes('join') ? raw : format(raw); + let keyword = format(raw); if (resolveAliases) { keyword = tryResolveAlias(keyword); } diff --git a/x-pack/solutions/observability/plugins/observability_ai_assistant_app/scripts/evaluation/scenarios/esql/index.spec.ts b/x-pack/solutions/observability/plugins/observability_ai_assistant_app/scripts/evaluation/scenarios/esql/index.spec.ts index 33fe67ff865f9..2739e2f7369f2 100644 --- a/x-pack/solutions/observability/plugins/observability_ai_assistant_app/scripts/evaluation/scenarios/esql/index.spec.ts +++ b/x-pack/solutions/observability/plugins/observability_ai_assistant_app/scripts/evaluation/scenarios/esql/index.spec.ts @@ -28,7 +28,7 @@ async function evaluateEsqlQuery({ const evaluation = await chatClient.evaluate(conversation, [ ...(expected ? [ - `Returns a ES|QL query that is functionally equivalent to: + `Returns a ES|QL query that is functionally equivalent to: ${expected}. It's OK if column names are slightly different, as long as the expected end result is the same.`, ] : []),