-
Notifications
You must be signed in to change notification settings - Fork 129
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
model access control changes rebased to 2.x #902
model access control changes rebased to 2.x #902
Conversation
…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>
* 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>
…e/deploy/predict model Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Codecov Report
@@ Coverage Diff @@
## model-access-control-dev #902 +/- ##
===============================================================
- Coverage 84.18% 72.39% -11.80%
+ Complexity 1764 1638 -126
===============================================================
Files 139 147 +8
Lines 6780 7281 +501
Branches 676 711 +35
===============================================================
- Hits 5708 5271 -437
- Misses 774 1729 +955
+ Partials 298 281 -17
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
Signed-off-by: Bhavana Ramaram <rbhavna@amazon.com>
@@ -43,6 +44,48 @@ public class CommonValue { | |||
+ " \"custom_attribute_names\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}}\n" | |||
+ " }\n" | |||
+ " }\n"; | |||
public static final String ML_MODEL_GROUP_INDEX_MAPPING = "{\n" + | |||
" \"_meta\": {\n" + | |||
" \"schema_version\": "+ML_MODEL_GROUP_INDEX_SCHEMA_VERSION+"\n" + |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor : add whitespace before and after +
@@ -43,6 +44,48 @@ public class CommonValue { | |||
+ " \"custom_attribute_names\": {\"type\":\"text\", \"fields\":{\"keyword\":{\"type\":\"keyword\"}}}\n" | |||
+ " }\n" | |||
+ " }\n"; | |||
public static final String ML_MODEL_GROUP_INDEX_MAPPING = "{\n" + |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rbhavna I don't see tags
field in ML_MODEL_GROUP_INDEX_MAPPING
. As tags will be key value pairs, suggest take a look at flat object
* 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>
* 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>
Description
model access control changes rebased to 2.x
Issues Resolved
Check List
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.