add local inference enabling/disabling setting #2232

rbhavna · 2024-03-19T18:30:20Z

Description

add a setting to enable/disable local model inference

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: Bhavana Ramaram <[email protected]>

plugin/src/main/java/org/opensearch/ml/rest/RestMLPredictionAction.java

plugin/src/main/java/org/opensearch/ml/settings/MLFeatureEnabledSetting.java

dhrubo-os · 2024-03-19T22:13:14Z

The field namelocal_model_inference_enabled doesn't seem quite right to me because it suggests that only prediction is being managed. In reality, we are also controlling model registration and deployment.

Therefore, names like local_model_management_enabled, local_model_lifecycle_enabled, or local_model_services_enabled seem more appropriate for the operations we want to handle.

However, I realize these suggestions might not align perfectly with the existing remote_model_inference_enabled field.

plugin/src/main/java/org/opensearch/ml/action/deploy/TransportDeployModelAction.java

Signed-off-by: Bhavana Ramaram <[email protected]>

dhrubo-os · 2024-03-20T00:21:56Z

plugin/src/main/java/org/opensearch/ml/action/deploy/TransportDeployModelAction.java

@@ -144,7 +144,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<MLDepl
                Boolean isHidden = mlModel.getIsHidden();
                if (functionName == FunctionName.REMOTE && !mlFeatureEnabledSetting.isRemoteInferenceEnabled()) {
                    throw new IllegalStateException(REMOTE_INFERENCE_DISABLED_ERR_MSG);
-                } else if (FunctionName.isDLModel(functionName) && !mlFeatureEnabledSetting.isLocalModelInferenceEnabled()) {
+                } else if (FunctionName.isDLModel(functionName) && !mlFeatureEnabledSetting.isLocalModelEnabled()) {
                    throw new IllegalStateException(LOCAL_MODEL_DISABLED_ERR_MSG);


just wondering if we should throw IllegalStateException or Forbidden exception?

We can maybe use the same one as remote inference and agent framework to stay consistent?

plugin/src/main/java/org/opensearch/ml/utils/MLExceptionUtils.java

Signed-off-by: Bhavana Ramaram <[email protected]>

add local model enabling setting Signed-off-by: Bhavana Ramaram <[email protected]> (cherry picked from commit b27673b)

add local model enabling setting Signed-off-by: Bhavana Ramaram <[email protected]> (cherry picked from commit b27673b) Co-authored-by: Bhavana Ramaram <[email protected]>

add local inference enabling setting

317fab6

Signed-off-by: Bhavana Ramaram <[email protected]>

rbhavna requested review from b4sjoo, dhrubo-os, jngz-es, model-collapse, ylwu-amzn, zane-neo, Zhangxunmt, austintlee, HenryL27 and sam-herman as code owners March 19, 2024 18:30

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 18:30 — with GitHub Actions Error

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 18:30 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 18:30 — with GitHub Actions Error

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 18:30 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 18:30 — with GitHub Actions Error

ylwu-amzn reviewed Mar 19, 2024

View reviewed changes

plugin/src/main/java/org/opensearch/ml/rest/RestMLPredictionAction.java Outdated Show resolved Hide resolved

dhrubo-os reviewed Mar 19, 2024

View reviewed changes

plugin/src/main/java/org/opensearch/ml/settings/MLFeatureEnabledSetting.java Outdated Show resolved Hide resolved

dhrubo-os reviewed Mar 19, 2024

View reviewed changes

plugin/src/main/java/org/opensearch/ml/action/deploy/TransportDeployModelAction.java Outdated Show resolved Hide resolved

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 23:51 — with GitHub Actions Error

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 23:51 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 23:51 — with GitHub Actions Error

adding check to transport layer

e1a81e4

Signed-off-by: Bhavana Ramaram <[email protected]>

rbhavna force-pushed the local_model_setting branch from 363429b to e1a81e4 Compare March 19, 2024 23:53

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 23:53 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 23:53 — with GitHub Actions Error

rbhavna had a problem deploying to ml-commons-cicd-env March 19, 2024 23:53 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:14 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:14 — with GitHub Actions Error

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:14 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:14 — with GitHub Actions Error

dhrubo-os reviewed Mar 20, 2024

View reviewed changes

ylwu-amzn reviewed Mar 20, 2024

View reviewed changes

plugin/src/main/java/org/opensearch/ml/utils/MLExceptionUtils.java Outdated Show resolved Hide resolved

change the setting name to more appropriate

8924e22

Signed-off-by: Bhavana Ramaram <[email protected]>

rbhavna force-pushed the local_model_setting branch from 343e946 to 8924e22 Compare March 20, 2024 00:29

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:29 — with GitHub Actions Failure

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:29 — with GitHub Actions Error

rbhavna had a problem deploying to ml-commons-cicd-env March 20, 2024 00:29 — with GitHub Actions Failure

ylwu-amzn approved these changes Mar 20, 2024

View reviewed changes

dhrubo-os approved these changes Mar 20, 2024

View reviewed changes

rbhavna merged commit b27673b into opensearch-project:main Mar 20, 2024
4 of 10 checks passed

rbhavna added backport 2.x backport 2.13 labels Mar 20, 2024

opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 20, 2024

add local model enabling/disabling setting (#2232)

2ef0ac5

add local model enabling setting Signed-off-by: Bhavana Ramaram <[email protected]> (cherry picked from commit b27673b)

opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 20, 2024

add local model enabling/disabling setting (#2232)

083e84a

add local model enabling setting Signed-off-by: Bhavana Ramaram <[email protected]> (cherry picked from commit b27673b)

This was referenced Mar 20, 2024

[Backport 2.13] add local inference enabling/disabling setting #2244

Merged

[Backport 2.x] add local inference enabling/disabling setting #2245

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add local inference enabling/disabling setting #2232

add local inference enabling/disabling setting #2232

rbhavna commented Mar 19, 2024

dhrubo-os commented Mar 19, 2024 •

edited

Loading

dhrubo-os Mar 20, 2024

rbhavna Mar 20, 2024

add local inference enabling/disabling setting #2232

add local inference enabling/disabling setting #2232

Conversation

rbhavna commented Mar 19, 2024

Description

Issues Resolved

Check List

dhrubo-os commented Mar 19, 2024 • edited Loading

dhrubo-os Mar 20, 2024

Choose a reason for hiding this comment

rbhavna Mar 20, 2024

Choose a reason for hiding this comment

dhrubo-os commented Mar 19, 2024 •

edited

Loading