-
Notifications
You must be signed in to change notification settings - Fork 138
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
Bug Fix: Fix for rag processor throwing NPE when optional parameters are not provided #3057
Conversation
Signed-off-by: Pavan Yekbote <[email protected]>
.../org/opensearch/searchpipelines/questionanswering/generative/ext/GenerativeQAParameters.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Pavan Yekbote <[email protected]>
Signed-off-by: Pavan Yekbote <[email protected]>
0bc65c2
to
6509ed9
Compare
Signed-off-by: Pavan Yekbote <[email protected]>
@HenryL27 @austintlee could you guys please review the PR? Thanks. |
The backport to
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-3057-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-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 |
…are not provided (#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]> (cherry picked from commit b7a0d78)
The backport to
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-3057-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-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 |
The backport to
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.13 2.13
# Navigate to the new working tree
cd .worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-3057-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-to-2.13
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.13 Then, create a pull request where the |
The backport to
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.14 2.14
# Navigate to the new working tree
cd .worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-3057-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-to-2.14
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.14 Then, create a pull request where the |
The backport to
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.15 2.15
# Navigate to the new working tree
cd .worktrees/backport-2.15
# Create a new branch
git switch --create backport/backport-3057-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-to-2.15
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.15 Then, create a pull request where the |
The backport to
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.16 2.16
# Navigate to the new working tree
cd .worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-3057-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-to-2.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.16 Then, create a pull request where the |
The backport to
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.17 2.17
# Navigate to the new working tree
cd .worktrees/backport-2.17
# Create a new branch
git switch --create backport/backport-3057-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b7a0d78c59ddbc8eb4672c60307ed2e4271a31dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3057-to-2.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.17 Then, create a pull request where the |
…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]>
Sorry I got to this late. The change looks good, but we need to make it so that only one of 'llmQuestion' and 'llmMessages' is required. I missed that. |
…are not provided (#3057) (#3065) * 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]> (cherry picked from commit b7a0d78) Co-authored-by: Pavan Yekbote <[email protected]>
Thanks @austintlee , I see you create a new issue for that #3067 |
…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]>
Description
Explicitly checks if parameters are null before serializing field name and value
Related Issues
Resolves #2983 [https://github.com//issues/2983]
Check List
--signoff
.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.