-
Notifications
You must be signed in to change notification settings - Fork 66
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
Handle case with nested list of objects #477
Conversation
@krishy91 is this PR still a draft PR or ready for review? |
Hi! I'm still working on it! I will update here once its ready! |
Hi @krishy91 before we can review the changes please do the following:
Please let ping on this PR once the above things are done. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #477 +/- ##
============================================
+ Coverage 84.33% 84.42% +0.09%
- Complexity 533 609 +76
============================================
Files 40 48 +8
Lines 1564 1843 +279
Branches 244 282 +38
============================================
+ Hits 1319 1556 +237
- Misses 133 162 +29
- Partials 112 125 +13 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>
…ect#483) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <[email protected]>
…l_sparse query (opensearch-project#438) (opensearch-project#479) * [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <[email protected]> * hash, equals. + UT Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> * add test Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <[email protected]> * add changelog Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]>
…ery (opensearch-project#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]>
…eries (opensearch-project#498) * Fixed nested field case Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]>
…nsearch-project#504) Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]>
* Added support for jdk-21 Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Hi @navneet1v ! The Pull Request passed the workflows. |
We would really like to use this feature, is there anything we can do to help in getting this merged? |
Solves: #469 - PR is already in use and we would like to see it included in 2.12. or earlier. |
Hi, we would really like to have this fix in the next possible 2.x release. Need two more reviews @navneet1v |
Will be checking this PR today. |
Thanks @navneet1v! Let me know if I can do anything to speed up the merge process |
@navneet1v gently reminder to look into this PR. We would like to move away from using this branch. |
Looked into the PR, on high level looks good. Please add Integration tests for this change. |
Also code coverage is dropped for new lines which are added please ensure that those lines are covered. |
src/main/java/org/opensearch/neuralsearch/processor/InferenceProcessor.java
Outdated
Show resolved
Hide resolved
Signed-off-by: krishy91 <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Thanks @navneet1v! Added integration test for the case containing list of nested objects |
Added addtional test with objects having nesting depth of 2. The InferenceProcessor has 98% coverage for lines now. How can I rerun the report? |
@navneet1v did you get a chance to look at the PR again after I resolved the issues you mentioned in your review? |
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <[email protected]> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <[email protected]> * spotless formatting Signed-off-by: Gopala-Krishna.Char <[email protected]> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <[email protected]> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <[email protected]> * hash, equals. + UT Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> * add test Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <[email protected]> * add changelog Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Add unit tests + small fixes Signed-off-by: krishy91 <[email protected]> * fix indentation Signed-off-by: krishy91 <[email protected]> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <[email protected]> * add integration test for list of nested objects Signed-off-by: krishy91 <[email protected]> --------- Signed-off-by: Gopala-Krishna.Char <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: krishy91 <[email protected]> Co-authored-by: Gopala-Krishna.Char <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> Co-authored-by: Navneet Verma <[email protected]> (cherry picked from commit ea49d3c)
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <[email protected]> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <[email protected]> * spotless formatting Signed-off-by: Gopala-Krishna.Char <[email protected]> * Onboard jenkins prod docker images on github actions (#483) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Update dependency org.json:json to v20231013 (#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <[email protected]> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479) * [bug fix] Fix async actions are left in neural_sparse query (#438) * add serialization and deserialization Signed-off-by: zhichao-aws <[email protected]> * hash, equals. + UT Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> * add test Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <[email protected]> * add changelog Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Fixed exception for case when Hybrid query being wrapped into bool query (#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Fixed Hybrid query for cases when it's wrapped into other compound queries (#498) * Fixed nested field case Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Added the github action to copy the attached issues label to PR. (#504) Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Added support for jdk-21 (#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Add unit tests + small fixes Signed-off-by: krishy91 <[email protected]> * fix indentation Signed-off-by: krishy91 <[email protected]> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <[email protected]> * add integration test for list of nested objects Signed-off-by: krishy91 <[email protected]> --------- Signed-off-by: Gopala-Krishna.Char <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: krishy91 <[email protected]> Co-authored-by: Gopala-Krishna.Char <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> Co-authored-by: Navneet Verma <[email protected]> (cherry picked from commit ea49d3c) Co-authored-by: Gopala-Krishna Char <[email protected]>
* Handle case with nested list of objects Signed-off-by: Gopala-Krishna.Char <[email protected]> * fix validateEmbeddingsFieldValues Method Signed-off-by: Gopala-Krishna.Char <[email protected]> * spotless formatting Signed-off-by: Gopala-Krishna.Char <[email protected]> * Onboard jenkins prod docker images on github actions (opensearch-project#483) Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Update dependency org.json:json to v20231013 (opensearch-project#481) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Signed-off-by: Gopala-Krishna.Char <[email protected]> * [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) (opensearch-project#479) * [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) * add serialization and deserialization Signed-off-by: zhichao-aws <[email protected]> * hash, equals. + UT Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> * add test Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> (cherry picked from commit 51e6c00) * rm max_token_score Signed-off-by: zhichao-aws <[email protected]> * add changelog Signed-off-by: zhichao-aws <[email protected]> * tidy Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Fixed exception for case when Hybrid query being wrapped into bool query (opensearch-project#490) * Adding null check for case when hybrid query wrapped into bool query Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Fixed Hybrid query for cases when it's wrapped into other compound queries (opensearch-project#498) * Fixed nested field case Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Added the github action to copy the attached issues label to PR. (opensearch-project#504) Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Added support for jdk-21 (opensearch-project#500) * Added support for jdk-21 Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Gopala-Krishna.Char <[email protected]> * Add unit tests + small fixes Signed-off-by: krishy91 <[email protected]> * fix indentation Signed-off-by: krishy91 <[email protected]> * remove unused code + add 2nd level nesting test Signed-off-by: krishy91 <[email protected]> * add integration test for list of nested objects Signed-off-by: krishy91 <[email protected]> --------- Signed-off-by: Gopala-Krishna.Char <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Navneet Verma <[email protected]> Signed-off-by: krishy91 <[email protected]> Co-authored-by: Gopala-Krishna.Char <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> Co-authored-by: zhichao-aws <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> Co-authored-by: Navneet Verma <[email protected]> Signed-off-by: yuye-aws <[email protected]>
Description
These changes add support for processing a list of objects in a nested field. Currently, if the configuration looks like below and if the nested field contains a list of nested objects then the request fails:
Example Request with Nested List
Issues Resolved
#469
Check List
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.