Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.17] Bug Fix: Fix for rag processor throwing NPE when optional parameters are not provided #3066

Merged
merged 2 commits into from
Oct 8, 2024

Conversation

pyek-bot
Copy link
Contributor

@pyek-bot pyek-bot commented Oct 5, 2024

Description

Merge conflicts to merge into 2.17 for PR: #3066

Related Issues

Resolves #2983

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…are not provided (opensearch-project#3057)

* fix (rag npe): optional and empty fields are handled appropriately

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: test cases

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: format violations

Signed-off-by: Pavan Yekbote <[email protected]>

* tests: adding empty params test case

Signed-off-by: Pavan Yekbote <[email protected]>

* fix: remove wildcard import

Signed-off-by: Pavan Yekbote <[email protected]>

---------

Signed-off-by: Pavan Yekbote <[email protected]>
ylwu-amzn
ylwu-amzn previously approved these changes Oct 7, 2024
@dhrubo-os
Copy link
Collaborator

apply spotless.

Signed-off-by: Pavan Yekbote <[email protected]>
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env October 7, 2024 20:56 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env October 7, 2024 20:56 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env October 7, 2024 20:56 — with GitHub Actions Inactive
@b4sjoo b4sjoo merged commit 8b5b38e into opensearch-project:2.17 Oct 8, 2024
16 of 19 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.11 2.11
# Navigate to the new working tree
cd .worktrees/backport-2.11
# Create a new branch
git switch --create backport/backport-3066-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8b5b38e4b28e182a0cdfbf1c55c6ef00e6663a57
# Push it to GitHub
git push --set-upstream origin backport/backport-3066-to-2.11
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport/backport-3066-to-2.11.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-3066-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8b5b38e4b28e182a0cdfbf1c55c6ef00e6663a57
# Push it to GitHub
git push --set-upstream origin backport/backport-3066-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-3066-to-2.12.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 8, 2024
…onal parameters are not provided (#3066)

(cherry picked from commit 8b5b38e)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 8, 2024
…onal parameters are not provided (#3066)

(cherry picked from commit 8b5b38e)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 8, 2024
…onal parameters are not provided (#3066)

(cherry picked from commit 8b5b38e)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 8, 2024
…onal parameters are not provided (#3066)

(cherry picked from commit 8b5b38e)
Zhangxunmt pushed a commit that referenced this pull request Oct 10, 2024
…onal parameters are not provided (#3066) (#3079)

(cherry picked from commit 8b5b38e)

Co-authored-by: Pavan Yekbote <[email protected]>
Zhangxunmt pushed a commit that referenced this pull request Oct 10, 2024
…onal parameters are not provided (#3066) (#3076)

(cherry picked from commit 8b5b38e)

Co-authored-by: Pavan Yekbote <[email protected]>
pyek-bot added a commit to pyek-bot/ml-commons that referenced this pull request Oct 10, 2024
…onal parameters are not provided (opensearch-project#3066) (opensearch-project#3076)

(cherry picked from commit 8b5b38e)

Co-authored-by: Pavan Yekbote <[email protected]>
b4sjoo pushed a commit that referenced this pull request Oct 10, 2024
…onal parameters are not provided (#3066) (#3078)

(cherry picked from commit 8b5b38e)

Co-authored-by: Pavan Yekbote <[email protected]>
b4sjoo pushed a commit that referenced this pull request Oct 10, 2024
…onal parameters are not provided (#3066) (#3077)

(cherry picked from commit 8b5b38e)

Co-authored-by: Pavan Yekbote <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants