[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments #217680
Merged
darnautov merged 5 commits intoelastic:mainfrom Apr 30, 2025
Merged
[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments #217680darnautov merged 5 commits intoelastic:mainfrom
darnautov merged 5 commits intoelastic:mainfrom
Conversation
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
|
merge conflict between base and head |
darnautov
commented
Apr 25, 2025
.../platform/plugins/shared/observability_ai_assistant/common/convert_messages_for_inference.ts
Outdated
Show resolved
Hide resolved
Contributor
|
Pinging @elastic/appex-ai-infra (Team:AI Infra) |
Contributor
|
Pinging @elastic/obs-ai-assistant (Team:Obs AI Assistant) |
Contributor
|
Pinging @elastic/ml-ui (:ml) |
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]
History
cc @darnautov |
Contributor
|
Starting backport for target branches: 8.18, 8.19, 9.0 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Apr 30, 2025
…ments (elastic#217680) (cherry picked from commit ccf23d0)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Apr 30, 2025
…ments (elastic#217680) (cherry picked from commit ccf23d0)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Apr 30, 2025
…ments (elastic#217680) (cherry picked from commit ccf23d0)
Contributor
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Apr 30, 2025
…on arguments (#217680) (#219726) # Backport This will backport the following commits from `main` to `8.19`: - [[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)](#217680) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Dima Arnautov","email":"dmitrii.arnautov@elastic.co"},"sourceCommit":{"committedDate":"2025-04-30T12:39:07Z","message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix",":ml","Team:Obs AI Assistant","backport:version","Team:AI Infra","v9.1.0","v8.19.0","v8.18.1","v9.0.1"],"title":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments ","number":217680,"url":"https://github.com/elastic/kibana/pull/217680","mergeCommit":{"message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217680","number":217680,"mergeCommit":{"message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Dima Arnautov <dmitrii.arnautov@elastic.co>
1 task
pborgonovi
pushed a commit
that referenced
this pull request
Apr 30, 2025
Contributor
|
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
2 similar comments
Contributor
|
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
Contributor
|
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
kibanamachine
added a commit
that referenced
this pull request
May 6, 2025
…n arguments (#217680) (#219727) # Backport This will backport the following commits from `main` to `9.0`: - [[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)](#217680) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Dima Arnautov","email":"dmitrii.arnautov@elastic.co"},"sourceCommit":{"committedDate":"2025-04-30T12:39:07Z","message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix",":ml","Team:Obs AI Assistant","backport:version","Team:AI Infra","v9.1.0","v8.19.0","v8.18.1","v9.0.1"],"title":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments ","number":217680,"url":"https://github.com/elastic/kibana/pull/217680","mergeCommit":{"message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217680","number":217680,"mergeCommit":{"message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Dima Arnautov <dmitrii.arnautov@elastic.co> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
kibanamachine
added a commit
that referenced
this pull request
May 6, 2025
…on arguments (#217680) (#219725) # Backport This will backport the following commits from `main` to `8.18`: - [[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)](#217680) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Dima Arnautov","email":"dmitrii.arnautov@elastic.co"},"sourceCommit":{"committedDate":"2025-04-30T12:39:07Z","message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix",":ml","Team:Obs AI Assistant","backport:version","Team:AI Infra","v9.1.0","v8.19.0","v8.18.1","v9.0.1"],"title":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments ","number":217680,"url":"https://github.com/elastic/kibana/pull/217680","mergeCommit":{"message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa"}},"sourceBranch":"main","suggestedTargetBranches":["8.19","8.18","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217680","number":217680,"mergeCommit":{"message":"[O11y AI Assistant] Correct quotes in ES|QL queries for function arguments (#217680)","sha":"ccf23d065434a255a838ef2c0b746f4db356a6fa"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Dima Arnautov <dmitrii.arnautov@elastic.co> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
akowalska622
pushed a commit
to akowalska622/kibana
that referenced
this pull request
May 29, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #216445
Related issue #198942
An attempt to fix incorrect quotes for field arguments inserted by LLMs. The solution isn’t perfect, but it’s the best we could come up with for now. Since ES|QL functions can have varying numbers of arguments, with different orders and types, we use a regex to scan the query string, look up the function definition, and replace quotes only when the argument is identified as a field.
Checklist