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 text docs ML input #830

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Conversation

ylwu-amzn
Copy link
Collaborator

Description

Add text docs ML input.

Before this PR

POST /_plugins/_ml/models/<model_id>/_predict
{
    "text_docs": ["today is sunny"],
    "return_number": true,
    "target_response": ["sentence_embedding"]
}

After

POST /_plugins/_ml/models/<model_id>/_predict
{
    "text_docs": ["today is sunny"],
    "result_filter": {
        "return_number": true,
        "target_response": ["sentence_embedding"]
    }
}

Issues Resolved

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 March 27, 2023 20:30
@codecov-commenter
Copy link

Codecov Report

Merging #830 (2cde7d6) into 2.x (b5ac338) will not change coverage.
The diff coverage is n/a.

📣 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     #830   +/-   ##
=========================================
  Coverage     84.81%   84.81%           
  Complexity     1628     1628           
=========================================
  Files           135      135           
  Lines          6080     6080           
  Branches        596      596           
=========================================
  Hits           5157     5157           
  Misses          666      666           
  Partials        257      257           
Flag Coverage Δ
ml-commons 84.81% <ø> (ø)

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

Impacted Files Coverage Δ
...a/org/opensearch/ml/engine/algorithms/DLModel.java 85.43% <ø> (ø)

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 179cd8a into opensearch-project:2.x Mar 27, 2023
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 27, 2023
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit that referenced this pull request Mar 27, 2023
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 28, 2023
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 28, 2023
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit to ylwu-amzn/ml-commons that referenced this pull request Mar 28, 2023
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
ylwu-amzn added a commit that referenced this pull request Mar 28, 2023
* rename model meta/chunk API (#827)

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

* Change the ziputil dependency to fix a potential security concern (#824)

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

* add text docs ML input (#830)

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

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>
rbhavna pushed a commit to rbhavna/ml-commons that referenced this pull request May 19, 2023
…roject#837)

* rename model meta/chunk API (opensearch-project#827)

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

* Change the ziputil dependency to fix a potential security concern (opensearch-project#824)

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

* add text docs ML input (opensearch-project#830)

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

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>
zane-neo pushed a commit that referenced this pull request May 23, 2023
* Backport changes to model-access-control feature branch (#837)

* rename model meta/chunk API (#827)

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

* Change the ziputil dependency to fix a potential security concern (#824)

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

* add text docs ML input (#830)

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

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>

* add model group (#840)

* add model group

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

* rename create model group as register model group

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

* fix class name in build.gradle

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

* remove unused code; stash thread context

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

* exclude class for low coverage

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

---------

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

* access validation for register/update model-group, register/get/delete/deploy/predict model

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* changes to security utils and register/search model group

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* update last_updated_time in model group when new version added

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix undeploy model action

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix format violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* rebased to 2.x and prediction/search API fix

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix rebase conflicts

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* new delete model group API

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix formal violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>
b4sjoo added a commit to b4sjoo/ml-commons that referenced this pull request May 30, 2023
* Backport changes to model-access-control feature branch (opensearch-project#837)

* rename model meta/chunk API (opensearch-project#827)

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

* Change the ziputil dependency to fix a potential security concern (opensearch-project#824)

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

* add text docs ML input (opensearch-project#830)

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

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>

* add model group (opensearch-project#840)

* add model group

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

* rename create model group as register model group

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

* fix class name in build.gradle

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

* remove unused code; stash thread context

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

* exclude class for low coverage

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

---------

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

* access validation for register/update model-group, register/get/delete/deploy/predict model

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* changes to security utils and register/search model group

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* update last_updated_time in model group when new version added

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix undeploy model action

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix format violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* rebased to 2.x and prediction/search API fix

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix rebase conflicts

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* new delete model group API

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix formal violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>
b4sjoo added a commit to b4sjoo/ml-commons that referenced this pull request May 30, 2023
* Backport changes to model-access-control feature branch (opensearch-project#837)

* rename model meta/chunk API (opensearch-project#827)

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

* Change the ziputil dependency to fix a potential security concern (opensearch-project#824)

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

* add text docs ML input (opensearch-project#830)

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

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>

* add model group (opensearch-project#840)

* add model group

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

* rename create model group as register model group

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

* fix class name in build.gradle

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

* remove unused code; stash thread context

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

* exclude class for low coverage

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

---------

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

* access validation for register/update model-group, register/get/delete/deploy/predict model

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* changes to security utils and register/search model group

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* update last_updated_time in model group when new version added

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix undeploy model action

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix format violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* rebased to 2.x and prediction/search API fix

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix rebase conflicts

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* new delete model group API

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

* fix formal violations

Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>

---------

Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Sicheng Song <sicheng.song@outlook.com>
Signed-off-by: Sicheng Song <sicheng.song@outlook.com>
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.

4 participants