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

Split repository into separate plugins #191

Merged
merged 1 commit into from
Aug 18, 2023

Conversation

msfroh
Copy link
Collaborator

@msfroh msfroh commented Aug 16, 2023

Description

We would like to be able to install a plugin that supports reranking with Amazon Personalize without automatically getting Amazon Kendra Intelligent Ranking too. Users should be able to choose which external reranker(s) they want to use and install plugins for each.

Issues Resolved

#190

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.

We would like to be able to install a plugin that supports reranking
with Amazon Personalize without automatically getting Amazon Kendra
Intelligent Ranking too. Users should be able to choose which external
reranker(s) they want to use and install plugins for each.

opensearch-project#190

Signed-off-by: Michael Froh <froh@amazon.com>
@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

Merging #191 (3745363) into main (ae4088e) will decrease coverage by 0.14%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main     #191      +/-   ##
============================================
- Coverage     83.39%   83.26%   -0.14%     
  Complexity      334      334              
============================================
  Files            42       43       +1     
  Lines          1259     1261       +2     
  Branches        154      154              
============================================
  Hits           1050     1050              
- Misses          132      134       +2     
  Partials         77       77              
Files Changed Coverage Δ
...elevance/AmazonKendraIntelligentRankingPlugin.java 0.00% <0.00%> (ø)
...rch/relevance/actionfilter/SearchActionFilter.java 85.45% <ø> (ø)
...arch/search/relevance/client/OpenSearchClient.java 80.00% <ø> (ø)
...ch/relevance/configuration/ConfigurationUtils.java 66.66% <ø> (ø)
...arch/search/relevance/configuration/Constants.java 80.00% <ø> (ø)
.../configuration/ResultTransformerConfiguration.java 100.00% <ø> (ø)
...e/configuration/SearchConfigurationExtBuilder.java 67.64% <ø> (ø)
...evance/configuration/TransformerConfiguration.java 100.00% <ø> (ø)
.../search/relevance/transformer/TransformerType.java 100.00% <ø> (ø)
...draintelligentranking/KendraIntelligentRanker.java 78.09% <ø> (ø)
... and 33 more

@msfroh msfroh marked this pull request as ready for review August 16, 2023 20:54
@msfroh msfroh self-assigned this Aug 17, 2023
@sejli
Copy link
Member

sejli commented Aug 17, 2023

This PR also addresses refactoring done in OpenSearch core, which should fix the daily builds. Thanks for updating the imports as well! 🎉

@msfroh
Copy link
Collaborator Author

msfroh commented Aug 18, 2023

Ignoring codecov, because it's confused about the coverage since it's ignoring all the moved files.

@msfroh msfroh merged commit eb77879 into opensearch-project:main Aug 18, 2023
@msfroh msfroh deleted the split_plugins branch August 18, 2023 00:30
@msfroh msfroh added backport 2.x Backport to 2.x branch backport 2.9 and removed backport 2.9 labels Aug 18, 2023
@opensearch-trigger-bot
Copy link

The backport to 2.9 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.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-191-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 eb77879e694ca609929b0c1098620a6ebea4afda
# Push it to GitHub
git push --set-upstream origin backport/backport-191-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 18, 2023
noCharger pushed a commit that referenced this pull request Aug 22, 2023
* Split repository into separate plugins (#191)

(cherry picked from commit eb77879)

* Fix backport to 2.x

We need to specify the opensearch version in two places now (until we
figure out how to set it in one place), and need to switch to Apache
HttpClient 4 on the 2.x branch.

Signed-off-by: Michael Froh <froh@amazon.com>

---------

Signed-off-by: Michael Froh <froh@amazon.com>
Co-authored-by: Michael Froh <froh@amazon.com>
msfroh added a commit that referenced this pull request Aug 22, 2023
…192)

* Split repository into separate plugins (#191)

(cherry picked from commit eb77879)

* Fix backport to 2.x

We need to specify the opensearch version in two places now (until we
figure out how to set it in one place), and need to switch to Apache
HttpClient 4 on the 2.x branch.

Signed-off-by: Michael Froh <froh@amazon.com>

---------

Signed-off-by: Michael Froh <froh@amazon.com>
Co-authored-by: Michael Froh <froh@amazon.com>
(cherry picked from commit 182937d)
Signed-off-by: Michael Froh <froh@amazon.com>
msfroh added a commit that referenced this pull request Aug 22, 2023
…192) (#193)

* Split repository into separate plugins (#191)

(cherry picked from commit eb77879)

* Fix backport to 2.x

We need to specify the opensearch version in two places now (until we
figure out how to set it in one place), and need to switch to Apache
HttpClient 4 on the 2.x branch.



---------



(cherry picked from commit 182937d)

Signed-off-by: Michael Froh <froh@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants