[ES|QL] Computed suggestions for expression by bartoval · Pull Request #246421 · elastic/kibana

bartoval · 2025-12-15T16:53:30Z

Summary

#244952

moved a little bit of unnecessary logic out of the commands

also fixed a couple of bugs

All(*) not at top position
In Completion we suggest inside literals

elasticmachine · 2025-12-15T16:53:34Z

Pinging @elastic/kibana-esql (Team:ESQL)

bartoval · 2025-12-15T16:58:13Z

src/platform/packages/shared/kbn-esql-ast/src/commands/registry/completion/autocomplete.test.ts

  });

  it('suggests WITH after the user writes a param as prompt', async () => {
-    await completionExpectSuggestions(`FROM a | COMPLETION ? /`, ['WITH { $0 }']);


That's just a test issue because the parser consider ?/ together

bartoval · 2025-12-15T16:58:48Z

...ackages/shared/kbn-esql-ast/src/commands/definitions/utils/autocomplete/expressions/utils.ts

+ * Finds the rightmost non-variadic operator in an expression tree.
+ * Useful for locating the most specific node near the cursor.
+ */
+export function getRightmostNonVariadicOperator(root: ESQLSingleAstItem): ESQLSingleAstItem {


just moved here

bartoval · 2025-12-15T17:06:28Z

house cleaning PR

bartoval · 2025-12-15T17:22:47Z

src/platform/packages/shared/kbn-esql-ast/src/commands/registry/completion/autocomplete.ts

-  if (targetField && !targetField.incomplete) {
-    return CompletionPosition.AFTER_TARGET_ID;
+  // (function, literal, or existing column) - handle as primaryExpression
+  if (isFunctionExpression(expressionRoot) || isLiteral(prompt) || isExistingColumn) {


I've refactored Completion logic a bit more than the others . It's more similar to grammar logic and Rerank.

Mainly because I no longer wanted to use external checks like isExpressionComplete. That logic is already inside suggestForExpression, (calling it is not expensive for the cases that were previously handled by the functions we replaced)

stratoula · 2025-12-16T06:37:28Z

@bartoval sorry for this but do you mind merging after #246407? It will be easier to handle the conflicts in this PR 🙏

bartoval · 2025-12-16T06:47:51Z

@bartoval sorry for this but do you mind merging after #246407? It will be easier to handle the conflicts in this PR 🙏

Yes I know. I've already done 4 rebase XD. I'm trained. When you've finished all the PR. I'll come back to this

stratoula · 2025-12-16T06:49:32Z

Thanks Val and sorry for this. We will merge it immediately after!

sddonne

Nice refactor! commands looks more simpler now :), found a bug, but it's not being added by this PR.

sddonne · 2025-12-16T08:44:16Z

...ed/kbn-esql-ast/src/commands/definitions/utils/autocomplete/expressions/suggestion_engine.ts

 }

+/** Computes derived state from the expression context */
+function computeDerivedState(ctx: ExpressionContext) {


Suggested change

function computeDerivedState(ctx: ExpressionContext) {

function computeDerivedState(ctx: ExpressionContext): ExpressionComputedMetadata {

sddonne · 2025-12-16T09:12:46Z

src/platform/packages/shared/kbn-esql-ast/src/commands/registry/rerank/utils.ts

Not related with this PR, but found that rerank is not suggesting the inference_id's (problem is in main too).

getCommandContext is not adding the inference endpoints for RERANK.
Something like this would be needed:

case 'rerank': return { inferenceEndpoints: (await callbacks?.getInferenceEndpoints?.('rerank'))?.inferenceEndpoints || [], };

When the cursor is inside the empty quotes not suggestions are provided
FROM ebt-kibana-browser | RERANK "Your search query" ON context.branch WITH { "inference_id": "^CURSOR" }
This is because withinQuotes is generating an early return here.

Tell me if you want to take those in this PR, otherwise I can wait for this to be merged and create another PR if you want to avoid conflicts.

Thanks.
Yes, I have to apply the same refactor that I did for Completion here to handle the case. I'll try to make changes here. It should be a mirrior of Completion

Here I would expect the WITH operator to be suggested

But this is happening in main so we can improve in a follow up. In general I am trying to not mix the PRs

elasticmachine · 2025-12-16T12:48:49Z

💚 Build Succeeded

Buildkite Build
Commit: d7afbae

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`unifiedSearch`	556	555	-1

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`kbnUiSharedDeps-srcJs`	4.3MB	4.3MB	-727.0B

History

💚 Build #373603 succeeded ca460b5
💔 Build #373600 failed 5941552
💔 Build #373442 failed a89ffba
💔 Build #373368 failed 75921ed

cc @bartoval

stratoula

Very nice cleanup! Let's merge when CI is green because I have a last step on the unification of the packages and it is better this to get merged first

stratoula · 2025-12-17T05:55:57Z

src/platform/packages/shared/kbn-esql-ast/src/commands/registry/rerank/utils.ts

Here I would expect the WITH operator to be suggested

But this is happening in main so we can improve in a follow up. In general I am trying to not mix the PRs

bartoval self-assigned this Dec 15, 2025

bartoval requested a review from a team as a code owner December 15, 2025 16:53

bartoval added release_note:enhancement backport:skip This PR does not require backporting Feature:ES|QL ES|QL related features in Kibana Team:ESQL ES|QL related features in Kibana t// v9.3.0 labels Dec 15, 2025

bartoval commented Dec 15, 2025

View reviewed changes

bartoval force-pushed the computed_suggestion_for_expression branch from c486fa1 to 48fa409 Compare December 15, 2025 17:11

computed suggestion for expression

75921ed

bartoval force-pushed the computed_suggestion_for_expression branch from 48fa409 to 75921ed Compare December 15, 2025 17:12

bartoval commented Dec 15, 2025

View reviewed changes

bartoval changed the title ~~[ES|QL] Computed suggestion for expression~~ Dec 15, 2025

bartoval added 2 commits December 15, 2025 20:06

Merge branch 'main' into computed_suggestion_for_expression

a89ffba

Merge branch 'main' into computed_suggestion_for_expression

ca460b5

bartoval force-pushed the computed_suggestion_for_expression branch from 5941552 to ca460b5 Compare December 16, 2025 05:41

bartoval added v9.4.0 refactoring and removed v9.3.0 labels Dec 16, 2025

sddonne reviewed Dec 16, 2025

View reviewed changes

add rerank inference

d7afbae

bartoval force-pushed the computed_suggestion_for_expression branch from 01db5e2 to d7afbae Compare December 16, 2025 11:00

Merge branch 'main' into computed_suggestion_for_expression

e552623

Merge branch 'main' into computed_suggestion_for_expression

4bdc2d6

bartoval added v9.3.0 v9.4.0 and removed v9.4.0 labels Dec 17, 2025

stratoula approved these changes Dec 17, 2025

View reviewed changes

bartoval merged commit e902181 into elastic:main Dec 17, 2025
19 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ES|QL] Computed suggestions for expression#246421

[ES|QL] Computed suggestions for expression#246421
bartoval merged 6 commits intoelastic:mainfrom
bartoval:computed_suggestion_for_expression

bartoval commented Dec 15, 2025 •

edited

Loading

elasticmachine commented Dec 15, 2025

bartoval Dec 15, 2025

bartoval Dec 15, 2025

bartoval commented Dec 15, 2025

bartoval Dec 15, 2025 •

edited

Loading

stratoula commented Dec 16, 2025

bartoval commented Dec 16, 2025

stratoula commented Dec 16, 2025

sddonne left a comment

sddonne Dec 16, 2025

sddonne Dec 16, 2025

bartoval Dec 16, 2025

bartoval Dec 16, 2025

stratoula Dec 17, 2025

elasticmachine commented Dec 16, 2025

stratoula left a comment •

edited

Loading

stratoula Dec 17, 2025

Uh oh!

Labels

4 participants

	function computeDerivedState(ctx: ExpressionContext) {
	function computeDerivedState(ctx: ExpressionContext): ExpressionComputedMetadata {

Conversation

bartoval commented Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

elasticmachine commented Dec 15, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bartoval commented Dec 15, 2025

bartoval Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

stratoula commented Dec 16, 2025

bartoval commented Dec 16, 2025

stratoula commented Dec 16, 2025

sddonne left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticmachine commented Dec 16, 2025

💚 Build Succeeded

Metrics [docs]

Module Count

Page load bundle

History

stratoula left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

Labels

4 participants

bartoval commented Dec 15, 2025 •

edited

Loading

bartoval Dec 15, 2025 •

edited

Loading

stratoula left a comment •

edited

Loading