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 planning work nodes to model #715

Merged
merged 2 commits into from
Jan 31, 2023

Conversation

ylwu-amzn
Copy link
Collaborator

Signed-off-by: Yaliang Wu ylwu@amazon.com

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.

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
@ylwu-amzn ylwu-amzn requested a review from a team January 31, 2023 06:22
Copy link
Collaborator

@dhrubo-os dhrubo-os left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need to add any test for this?

jngz-es
jngz-es previously approved these changes Jan 31, 2023
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
@ylwu-amzn
Copy link
Collaborator Author

Don't we need to add any test for this?

The current test already covered. Just add some assertions.

@codecov-commenter
Copy link

codecov-commenter commented Jan 31, 2023

Codecov Report

Merging #715 (da46d5c) into 2.x (1bf57c5) will increase coverage by 0.60%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##                2.x     #715      +/-   ##
============================================
+ Coverage     84.34%   84.95%   +0.60%     
- Complexity     1052     1076      +24     
============================================
  Files            99      100       +1     
  Lines          3833     3921      +88     
  Branches        352      371      +19     
============================================
+ Hits           3233     3331      +98     
+ Misses          450      433      -17     
- Partials        150      157       +7     
Flag Coverage Δ
ml-commons 84.95% <100.00%> (+0.60%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...earch/ml/action/load/TransportLoadModelAction.java 84.07% <100.00%> (+0.28%) ⬆️
.../cluster/MLCommonsClusterManagerEventListener.java 67.64% <0.00%> (-11.77%) ⬇️
...va/org/opensearch/ml/rest/RestMLProfileAction.java 94.62% <0.00%> (-3.46%) ⬇️
...arch/ml/action/profile/MLProfileModelResponse.java 100.00% <0.00%> (ø)
.../java/org/opensearch/ml/utils/RestActionUtils.java 81.63% <0.00%> (+0.38%) ⬆️
...java/org/opensearch/ml/profile/MLModelProfile.java 62.96% <0.00%> (+16.66%) ⬆️
...g/opensearch/ml/profile/MLPredictRequestStats.java 77.27% <0.00%> (+20.45%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ylwu-amzn ylwu-amzn merged commit 46a8d6a into opensearch-project:2.x Jan 31, 2023
@ylwu-amzn ylwu-amzn added enhancement New feature or request backport 2.5 labels Jan 31, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 1, 2023
* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
(cherry picked from commit 46a8d6a)
ylwu-amzn added a commit that referenced this pull request Feb 1, 2023
* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
(cherry picked from commit 46a8d6a)

Co-authored-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Feb 17, 2023
* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
model-collapse pushed a commit that referenced this pull request Feb 20, 2023
…in (#711)

* [wjunshen] #N/A feat: fix after the latest rebase

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: fix after rebase

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: fix after rebase

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: fix after rebase

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: fix after the latest rebase

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* Increment version to 2.6.0-SNAPSHOT (#671)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* fix profile API in example doc (#712)

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* change model url to public repo in text embedding model example doc (#713)

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* Enhance profile API to add model centric result controlled by view parameter (#714)

* Enhance profile API to add model centric result controled by view paramter

Signed-off-by: Zan Niu <zaniu@amazon.com>

* Enhance profile API to add model centric result controled by view parameter

Signed-off-by: Zan Niu <zaniu@amazon.com>

* Enhance profile API to add model centric result controled by view parameter

Signed-off-by: Zan Niu <zaniu@amazon.com>

---------

Signed-off-by: Zan Niu <zaniu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* add planning work nodes to model (#715)

* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* skip running syncup job if no model index (#717)

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* refactor: add DL model class (#722)

* refactor: add DL model class

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* fix model url in example doc

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* address comments

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* fix failed ut

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* tune model config: change pooling mode to optional (#724)

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: make the log readable

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: add error log

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: Refer to PR #717,just checking if index exists in cluster metadata

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: change RunTimeException to MLException

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: also consider COMPLETED_WITH_ERROR

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: remove ML_MODEL_RELOAD_MAX_RETRY_TIMES in CommonValue.java

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: remove Result class

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: change "reload" and "retry" to a full word

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: change log info sentence

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [wjunshen] #N/A feat: code format

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [Signed-off-by: wjunshen<wjunshen@amazon.com>] #N/A feat:
1. Let the collection just have all ids of ml node
2. print out full exception stack trace

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [Signed-off-by: wjunshen<wjunshen@amazon.com>] #N/A feat:
use LOAD_THREAD_POOL to replace generic

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [Signed-off-by: wjunshen<wjunshen@amazon.com>] #N/A feat:
print the whole exception stack

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [Signed-off-by: wjunshen<wjunshen@amazon.com>] #N/A feat:
change the IndexNotFoundException to MLException

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [Signed-off-by: wjunshen<wjunshen@amazon.com>] #N/A feat:
add logs when receiving indexRequestBuilder.execute exception

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

* [Signed-off-by: wjunshen<wjunshen@amazon.com>] #N/A feat:
change the test code after code review

Signed-off-by: wujunshen <frank_wjs@hotmail.com>

---------

Signed-off-by: wujunshen <frank_wjs@hotmail.com>
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Zan Niu <zaniu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: zane-neo <zaniu@amazon.com>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 3, 2023
* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 4, 2023
* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit that referenced this pull request Mar 4, 2023
* add planning work nodes to model

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add test

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.5 enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants