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

Rebase main code to feature branch #1386

Merged
merged 9 commits into from
Sep 26, 2023

Conversation

zane-neo
Copy link
Collaborator

Description

This PR is to rebase main branch latest code to feature branch to make sure other PRs to feature branch pass all checks.

Issues Resolved

NA

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.

b4sjoo and others added 9 commits September 8, 2023 13:41
* Add Auto Release Workflow

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>

* Fix release note address

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>

---------

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
…t#1309)

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
* Add release note for 2.10.0

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>

* Add CVE fix

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>

---------

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
* fixing doc link

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

* fixing indentation

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

---------

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>
…ensearch-project#1324)

* Fix unassigned ml system shard replicas



* Adjust auto replica settings to keep it consistent with AOS default setting



* Update plugin/src/main/java/org/opensearch/ml/indices/MLIndicesHandler.java




* Modify exception handling



* Modify exception messages



* Add response check



* Add response check and exception handling



* Keep error message consistent



* Keep error message consistent



* Keep error message consistent



---------

Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
Signed-off-by: Kalyan <kalyan.ben10@live.com>
…pensearch-project#1274)

* Add neural search default pre/post process function support

Signed-off-by: zane-neo <zaniu@amazon.com>

* Fix UT failures

Signed-off-by: zane-neo <zaniu@amazon.com>

* Address PR comment to remove nonJson response case

Signed-off-by: zane-neo <zaniu@amazon.com>

* Fix low code coverage issue

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix format issue

Signed-off-by: zane-neo <zaniu@amazon.com>

* Try to fix classNotFound issue in IT

Signed-off-by: zane-neo <zaniu@amazon.com>

* revert Try to fix classNotFound issue in IT

Signed-off-by: zane-neo <zaniu@amazon.com>

* Change gson dependency to compileOnly

Signed-off-by: zane-neo <zaniu@amazon.com>

* Change default pre/post process function name

Signed-off-by: zane-neo <zaniu@amazon.com>

* Address code review comments

Signed-off-by: zane-neo <zaniu@amazon.com>

* Make preprocess function to default

Signed-off-by: zane-neo <zaniu@amazon.com>

* Remove GsonUtil since there already a single instance in StringUtils

Signed-off-by: zane-neo <zaniu@amazon.com>

* Fix UT failures

Signed-off-by: zane-neo <zaniu@amazon.com>

* Address comments

Signed-off-by: zane-neo <zaniu@amazon.com>

* use import instead of fully qualified name

Signed-off-by: zane-neo <zaniu@amazon.com>

---------

Signed-off-by: zane-neo <zaniu@amazon.com>
@zane-neo zane-neo temporarily deployed to ml-commons-cicd-env September 26, 2023 01:43 — with GitHub Actions Inactive
@zane-neo zane-neo temporarily deployed to ml-commons-cicd-env September 26, 2023 01:43 — with GitHub Actions Inactive
@zane-neo zane-neo temporarily deployed to ml-commons-cicd-env September 26, 2023 01:43 — with GitHub Actions Inactive
@zane-neo zane-neo temporarily deployed to ml-commons-cicd-env September 26, 2023 01:43 — with GitHub Actions Inactive
@zane-neo zane-neo temporarily deployed to ml-commons-cicd-env September 26, 2023 01:43 — with GitHub Actions Inactive
@zane-neo zane-neo temporarily deployed to ml-commons-cicd-env September 26, 2023 01:43 — with GitHub Actions Inactive
@codecov
Copy link

codecov bot commented Sep 26, 2023

Codecov Report

Merging #1386 (b48546a) into neural-sparse (a9687fc) will decrease coverage by 0.22%.
The diff coverage is 52.56%.

@@                 Coverage Diff                 @@
##             neural-sparse    #1386      +/-   ##
===================================================
- Coverage            78.94%   78.72%   -0.22%     
+ Complexity            2144     2142       -2     
===================================================
  Files                  168      168              
  Lines                 8740     8754      +14     
  Branches               877      877              
===================================================
- Hits                  6900     6892       -8     
- Misses                1441     1465      +24     
+ Partials               399      397       -2     
Flag Coverage Δ
ml-commons 78.72% <52.56%> (-0.22%) ⬇️

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

Files Coverage Δ
...ain/java/org/opensearch/ml/engine/ModelHelper.java 89.92% <ø> (-0.08%) ⬇️
...va/org/opensearch/ml/engine/utils/ScriptUtils.java 90.00% <100.00%> (+13.52%) ⬆️
...ine/algorithms/remote/RemoteConnectorExecutor.java 88.46% <66.66%> (+1.79%) ⬆️
...va/org/opensearch/ml/indices/MLIndicesHandler.java 59.34% <21.05%> (-10.40%) ⬇️
...ch/ml/engine/algorithms/remote/ConnectorUtils.java 65.88% <61.11%> (-5.74%) ⬇️

... and 2 files with indirect coverage changes

@zane-neo zane-neo merged commit 8780d1c into opensearch-project:neural-sparse Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants