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.x] [Feature] Support for Default Model Id #365

Merged

Conversation

vibrantvarun
Copy link
Member

@vibrantvarun vibrantvarun commented Sep 29, 2023

Description

Backport 337 to 2.x

Issues Resolved

70

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --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.

* Support for default Model Id

Signed-off-by: Varun Jain <[email protected]>

* Support for Default Model id

Signed-off-by: Varun Jain <[email protected]>

* Support for default model Id

Signed-off-by: Varun Jain <[email protected]>

* Removing wildcard Imports

Signed-off-by: Varun Jain <[email protected]>

* Typo fix

Signed-off-by: Varun Jain <[email protected]>

* Integ test cases

Signed-off-by: Varun Jain <[email protected]>

* Fixing Integ Test case

Signed-off-by: Varun Jain <[email protected]>

* Addressing Comments

Signed-off-by: Varun Jain <[email protected]>

* Added Visitor test cases and addressed comments

Signed-off-by: Varun Jain <[email protected]>

* Comments Addressed of Jack

Signed-off-by: Varun Jain <[email protected]>

* Addressed changes requested by Martin

Signed-off-by: Varun Jain <[email protected]>

* Addressed changes requested by Martin

Signed-off-by: Varun Jain <[email protected]>

* Fixing test cases

Signed-off-by: Varun Jain <[email protected]>

* Increasing test coverage

Signed-off-by: Varun Jain <[email protected]>

* Renaming and addressing comments of Martin

Signed-off-by: Varun Jain <[email protected]>

* Addressing Comments of Navneet

Signed-off-by: Varun Jain <[email protected]>

* Updating tests

Signed-off-by: Varun Jain <[email protected]>

---------

Signed-off-by: Varun Jain <[email protected]>
@navneet1v
Copy link
Collaborator

@vibrantvarun fix the gh actions

@martin-gaievski
Copy link
Member

@vibrantvarun please check if your PR for core has been backported to 2.x

@vibrantvarun
Copy link
Member Author

@martin-gaievski it is backported

@martin-gaievski
Copy link
Member

martin-gaievski commented Sep 29, 2023

discussed with @vibrantvarun, so his PR in core got merged a week after core incremented 2.x version to 2.11. For his change to work we need to increment version in neural-search, that is typically done by auto-generated PR from infra script.

@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

Merging #365 (ce50d03) into 2.x (9e12de8) will decrease coverage by 4.07%.
Report is 2 commits behind head on 2.x.
The diff coverage is 87.50%.

@@             Coverage Diff              @@
##                2.x     #365      +/-   ##
============================================
- Coverage     84.57%   80.51%   -4.07%     
- Complexity      427      447      +20     
============================================
  Files            35       39       +4     
  Lines          1290     1411     +121     
  Branches        189      210      +21     
============================================
+ Hits           1091     1136      +45     
- Misses          118      187      +69     
- Partials         81       88       +7     
Files Coverage Δ
...rch/neuralsearch/util/NeuralSearchClusterUtil.java 100.00% <100.00%> (ø)
...g/opensearch/neuralsearch/plugin/NeuralSearch.java 71.42% <50.00%> (-2.26%) ⬇️
...search/processor/NeuralQueryEnricherProcessor.java 92.85% <92.85%> (ø)
...nsearch/neuralsearch/query/NeuralQueryBuilder.java 88.88% <91.66%> (-0.13%) ⬇️
...search/query/visitor/NeuralSearchQueryVisitor.java 76.92% <76.92%> (ø)

... and 5 files with indirect coverage changes

@martin-gaievski martin-gaievski merged commit 8d749b8 into opensearch-project:2.x Oct 3, 2023
34 of 35 checks passed
@vibrantvarun vibrantvarun deleted the backport-337-to-2.x branch October 3, 2023 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2.11.0 Issues targeting release v2.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants