Forward-merge branch-24.10 into branch-25.02 #1980
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Usage: ``` pytest tests/scripts/ ``` Authors: - Anuradha Karuppiah (https://github.com/AnuradhaKaruppiah) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: nv-morpheus#1954
* Improve milvus startup time bypassing milvus' own `wait_for_started` method which was causing an intermittent delay up to 40s * Consolidate tests `test_kafka_source_commit` and `test_kafka_source_batch_pipe` these two tests were 80% similar * Remove the `num_records=100` parameter from `test_kafka_source_batch_pipe` * Reduce parameters for test `test_http_server.py::test_simple_request` lowering the total number of test combinations from 865 down to 145. * Update rag pipeline tests to share a common milvus collection, lowering test time from 45s down to 25s Closes nv-morpheus#1948 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - David Gardner (https://github.com/dagardner-nv) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: nv-morpheus#1953
- [x] Add a page for using the Morpheus conda packages - [x] Add documentation for LLM and DFP stages APIs - [] Update example READMEs (if needed) Authors: - Anuradha Karuppiah (https://github.com/AnuradhaKaruppiah) Approvers: - David Gardner (https://github.com/dagardner-nv) URL: nv-morpheus#1964
* Requires PR nv-morpheus#1924 to be merged first. Closes [nv-morpheus#1660](nv-morpheus#1660) ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - David Gardner (https://github.com/dagardner-nv) - Yuchen Zhang (https://github.com/yczhang-nv) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: nv-morpheus#1932
…generate_batch_async()` (nv-morpheus#1967) This PR reverts the removal of the `**kwargs` argument from the `NVFoundationLLMClient.generate_batch()` and `generate_batch_async()` methods, which introduced a regression. Closes nv-morpheus#1961 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - Ashley Song (https://github.com/ashsong-nv) Approvers: - David Gardner (https://github.com/dagardner-nv) URL: nv-morpheus#1967
) This PR is replacing the `VAULT_HOST` variable with `AWS_ROLE_ARN`. This is required to use the new token service to get AWS credentials. ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - Jordan Jacobelli (https://github.com/jjacobelli) - David Gardner (https://github.com/dagardner-nv) Approvers: - David Gardner (https://github.com/dagardner-nv) URL: nv-morpheus#1962
- Remove all references to the Starter DFP in docs - Remove classes which only exist for the Starter DFP. - Remove tests and associated test data for the Starter DFP - Remove Starter DFP from CLI Closes nv-morpheus#1715 Closes nv-morpheus#1713 Closes nv-morpheus#1641 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - Eli Fajardo (https://github.com/efajardo-nv) Approvers: - David Gardner (https://github.com/dagardner-nv) URL: nv-morpheus#1903
cwharris
approved these changes
Oct 23, 2024
dagardner-nv
merged commit b0ca5b0
into
nv-morpheus:branch-25.02
15 of 16 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
By Submitting this PR I confirm: