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

Add integration tests for the RAG pipeline covering OpenAI and Bedrock #2213

Merged
merged 7 commits into from
Mar 19, 2024

Conversation

austintlee
Copy link
Collaborator

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

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

@austintlee austintlee had a problem deploying to ml-commons-cicd-env March 18, 2024 22:02 — with GitHub Actions Failure
@austintlee austintlee had a problem deploying to ml-commons-cicd-env March 18, 2024 22:03 — with GitHub Actions Failure
@austintlee austintlee had a problem deploying to ml-commons-cicd-env March 18, 2024 22:30 — with GitHub Actions Failure
@austintlee austintlee had a problem deploying to ml-commons-cicd-env March 18, 2024 22:30 — with GitHub Actions Failure
@austintlee austintlee had a problem deploying to ml-commons-cicd-env March 18, 2024 22:30 — with GitHub Actions Failure
@austintlee austintlee temporarily deployed to ml-commons-cicd-env March 18, 2024 23:29 — with GitHub Actions Inactive
@austintlee austintlee temporarily deployed to ml-commons-cicd-env March 18, 2024 23:29 — with GitHub Actions Inactive
@austintlee
Copy link
Collaborator Author

@ylwu-amzn can you merge this?

@dhrubo-os dhrubo-os merged commit d645c83 into opensearch-project:main Mar 19, 2024
10 of 14 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2213-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.13 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.13 2.13
# Navigate to the new working tree
cd .worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-2213-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d645c8369fa87cbd17ca23791d02cab487a7dbd0
# Push it to GitHub
git push --set-upstream origin backport/backport-2213-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 base branch is 2.13 and the compare/head branch is backport/backport-2213-to-2.13.

@dhrubo-os
Copy link
Collaborator

backport PRs are failing. Could you please check? @austintlee

@austintlee austintlee temporarily deployed to ml-commons-cicd-env March 19, 2024 21:16 — with GitHub Actions Inactive
@austintlee austintlee temporarily deployed to ml-commons-cicd-env March 19, 2024 21:16 — with GitHub Actions Inactive
@austintlee austintlee temporarily deployed to ml-commons-cicd-env March 19, 2024 21:16 — with GitHub Actions Inactive
@austintlee austintlee had a problem deploying to ml-commons-cicd-env March 19, 2024 21:16 — with GitHub Actions Failure
@austintlee
Copy link
Collaborator Author

#2235 @dhrubo-os does this look ok? The diff doesn't look right to me.

@austintlee
Copy link
Collaborator Author

git worktree add .worktrees/backport-2.13 2.13 is resulting in fatal: invalid reference: 2.13.

@austintlee
Copy link
Collaborator Author

oh it seems 2.13 has not been created?!

@austintlee
Copy link
Collaborator Author

For 2.x, I get this message:

There isn’t anything to compare.
opensearch-project:2.x is up to date with all commits from austintlee:backport/backport-2213-to-2.x. Try [switching the base](https://github.com/opensearch-project/ml-commons/compare/austintlee:backport/backport-2213-to-2.x...2.x) for your comparison.

@dhrubo-os
Copy link
Collaborator

dhrubo-os commented Mar 19, 2024

From this workflow log: https://github.com/opensearch-project/ml-commons/actions/runs/8348785119/job/22851492548

Looks like backport is failing for :

  Auto-merging plugin/src/main/java/org/opensearch/ml/plugin/MachineLearningPlugin.java
  Auto-merging plugin/src/test/java/org/opensearch/ml/rest/MLCommonsRestTestCase.java
  Auto-merging plugin/src/test/java/org/opensearch/ml/rest/RestMLRemoteInferenceIT.java
  CONFLICT (content): Merge conflict in plugin/src/test/java/org/opensearch/ml/rest/RestMLRemoteInferenceIT.java
  error: could not apply d645c836... Add integration tests for the RAG pipeline covering OpenAI and Bedrock (#2213)
  hint: After resolving the conflicts, mark them with

Did you take all the updates from the branch?

@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2213-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.13 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.13 2.13
# Navigate to the new working tree
cd .worktrees/backport-2.13
# Create a new branch
git switch --create backport/backport-2213-to-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d645c8369fa87cbd17ca23791d02cab487a7dbd0
# Push it to GitHub
git push --set-upstream origin backport/backport-2213-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 base branch is 2.13 and the compare/head branch is backport/backport-2213-to-2.13.

austintlee added a commit to austintlee/ml-commons that referenced this pull request Mar 20, 2024
opensearch-project#2213)

* Add integration tests for the RAG pipeline covering OpenAI and Bedrock.

Signed-off-by: Austin Lee <[email protected]>

* Use us-west-2 for testing.

Signed-off-by: Austin Lee <[email protected]>

* Fix spotless

Signed-off-by: Austin Lee <[email protected]>

* Fix broken import.

Signed-off-by: Austin Lee <[email protected]>

* Fix loading of default feature flag settings, update tests to pick up
changes in memory API.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

---------

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit d645c83)
austintlee added a commit to austintlee/ml-commons that referenced this pull request Mar 20, 2024
opensearch-project#2213)

* Add integration tests for the RAG pipeline covering OpenAI and Bedrock.

Signed-off-by: Austin Lee <[email protected]>

* Use us-west-2 for testing.

Signed-off-by: Austin Lee <[email protected]>

* Fix spotless

Signed-off-by: Austin Lee <[email protected]>

* Fix broken import.

Signed-off-by: Austin Lee <[email protected]>

* Fix loading of default feature flag settings, update tests to pick up
changes in memory API.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

---------

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit d645c83)
ylwu-amzn pushed a commit that referenced this pull request Mar 20, 2024
… OpenAI and Bedroc… (#2247)

* Add integration tests for the RAG pipeline covering OpenAI and Bedrock (#2213)

* Add integration tests for the RAG pipeline covering OpenAI and Bedrock.

Signed-off-by: Austin Lee <[email protected]>

* Use us-west-2 for testing.

Signed-off-by: Austin Lee <[email protected]>

* Fix spotless

Signed-off-by: Austin Lee <[email protected]>

* Fix broken import.

Signed-off-by: Austin Lee <[email protected]>

* Fix loading of default feature flag settings, update tests to pick up
changes in memory API.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

---------

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit d645c83)

* Fix port to 2.13.

Signed-off-by: Austin Lee <[email protected]>

* Fix spotless.

Signed-off-by: Austin Lee <[email protected]>

---------

Signed-off-by: Austin Lee <[email protected]>
ylwu-amzn pushed a commit that referenced this pull request Mar 20, 2024
…OpenAI and Bedroc… (#2246)

* Add integration tests for the RAG pipeline covering OpenAI and Bedrock (#2213)

* Add integration tests for the RAG pipeline covering OpenAI and Bedrock.

Signed-off-by: Austin Lee <[email protected]>

* Use us-west-2 for testing.

Signed-off-by: Austin Lee <[email protected]>

* Fix spotless

Signed-off-by: Austin Lee <[email protected]>

* Fix broken import.

Signed-off-by: Austin Lee <[email protected]>

* Fix loading of default feature flag settings, update tests to pick up
changes in memory API.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

* Remove unused code.

Signed-off-by: Austin Lee <[email protected]>

---------

Signed-off-by: Austin Lee <[email protected]>
(cherry picked from commit d645c83)

* Fix port to 2.x.

Signed-off-by: Austin Lee <[email protected]>

---------

Signed-off-by: Austin Lee <[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