-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added register a group model step (#118)
* Added Registering a group model Signed-off-by: Owais Kazi <[email protected]> * Updated create connector test Signed-off-by: Owais Kazi <[email protected]> * Added optional field and handled them for creating the builder Signed-off-by: Owais Kazi <[email protected]> * Added another test for name check Signed-off-by: Owais Kazi <[email protected]> * Addressed PR comments Signed-off-by: Owais Kazi <[email protected]> * Moved common fields to CommonValue Signed-off-by: Owais Kazi <[email protected]> --------- Signed-off-by: Owais Kazi <[email protected]>
- Loading branch information
1 parent
6ee3d53
commit bcd53e1
Showing
9 changed files
with
322 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
src/main/java/org/opensearch/flowframework/workflow/ModelGroupStep.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
| package org.opensearch.flowframework.workflow; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.opensearch.ExceptionsHelper; | ||
| import org.opensearch.core.action.ActionListener; | ||
| import org.opensearch.core.rest.RestStatus; | ||
| import org.opensearch.flowframework.exception.FlowFrameworkException; | ||
| import org.opensearch.ml.client.MachineLearningNodeClient; | ||
| import org.opensearch.ml.common.AccessMode; | ||
| import org.opensearch.ml.common.transport.model_group.MLRegisterModelGroupInput; | ||
| import org.opensearch.ml.common.transport.model_group.MLRegisterModelGroupInput.MLRegisterModelGroupInputBuilder; | ||
| import org.opensearch.ml.common.transport.model_group.MLRegisterModelGroupResponse; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| import static org.opensearch.flowframework.common.CommonValue.ADD_ALL_BACKEND_ROLES; | ||
| import static org.opensearch.flowframework.common.CommonValue.BACKEND_ROLES_FIELD; | ||
| import static org.opensearch.flowframework.common.CommonValue.DESCRIPTION_FIELD; | ||
| import static org.opensearch.flowframework.common.CommonValue.MODEL_ACCESS_MODE; | ||
| import static org.opensearch.flowframework.common.CommonValue.NAME_FIELD; | ||
|
|
||
| /** | ||
| * Step to register a model group | ||
| */ | ||
| public class ModelGroupStep implements WorkflowStep { | ||
|
|
||
| private static final Logger logger = LogManager.getLogger(RegisterModelStep.class); | ||
|
|
||
| private MachineLearningNodeClient mlClient; | ||
|
|
||
| static final String NAME = "model_group"; | ||
|
|
||
| /** | ||
| * Instantiate this class | ||
| * @param mlClient client to instantiate MLClient | ||
| */ | ||
| public ModelGroupStep(MachineLearningNodeClient mlClient) { | ||
| this.mlClient = mlClient; | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<WorkflowData> execute(List<WorkflowData> data) throws IOException { | ||
|
|
||
| CompletableFuture<WorkflowData> registerModelGroupFuture = new CompletableFuture<>(); | ||
|
|
||
| ActionListener<MLRegisterModelGroupResponse> actionListener = new ActionListener<>() { | ||
| @Override | ||
| public void onResponse(MLRegisterModelGroupResponse mlRegisterModelGroupResponse) { | ||
| logger.info("Model group registration successful"); | ||
| registerModelGroupFuture.complete( | ||
| new WorkflowData( | ||
| Map.ofEntries( | ||
| Map.entry("model_group_id", mlRegisterModelGroupResponse.getModelGroupId()), | ||
| Map.entry("model_group_status", mlRegisterModelGroupResponse.getStatus()) | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Exception e) { | ||
| logger.error("Failed to register model group"); | ||
| registerModelGroupFuture.completeExceptionally(new FlowFrameworkException(e.getMessage(), ExceptionsHelper.status(e))); | ||
| } | ||
| }; | ||
|
|
||
| String modelGroupName = null; | ||
| String description = null; | ||
| List<String> backendRoles = new ArrayList<>(); | ||
| AccessMode modelAccessMode = null; | ||
| Boolean isAddAllBackendRoles = null; | ||
|
|
||
| for (WorkflowData workflowData : data) { | ||
| Map<String, Object> content = workflowData.getContent(); | ||
|
|
||
| for (Entry<String, Object> entry : content.entrySet()) { | ||
| switch (entry.getKey()) { | ||
| case NAME_FIELD: | ||
| modelGroupName = (String) content.get(NAME_FIELD); | ||
| break; | ||
| case DESCRIPTION_FIELD: | ||
| description = (String) content.get(DESCRIPTION_FIELD); | ||
| break; | ||
| case BACKEND_ROLES_FIELD: | ||
| backendRoles = getBackendRoles(content); | ||
| break; | ||
| case MODEL_ACCESS_MODE: | ||
| modelAccessMode = (AccessMode) content.get(MODEL_ACCESS_MODE); | ||
| break; | ||
| case ADD_ALL_BACKEND_ROLES: | ||
| isAddAllBackendRoles = (Boolean) content.get(ADD_ALL_BACKEND_ROLES); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (modelGroupName == null) { | ||
| registerModelGroupFuture.completeExceptionally( | ||
| new FlowFrameworkException("Model group name is not provided", RestStatus.BAD_REQUEST) | ||
| ); | ||
| } else { | ||
| MLRegisterModelGroupInputBuilder builder = MLRegisterModelGroupInput.builder(); | ||
| builder.name(modelGroupName); | ||
| if (description != null) { | ||
| builder.description(description); | ||
| } | ||
| if (!backendRoles.isEmpty()) { | ||
| builder.backendRoles(backendRoles); | ||
| } | ||
| if (modelAccessMode != null) { | ||
| builder.modelAccessMode(modelAccessMode); | ||
| } | ||
| if (isAddAllBackendRoles != null) { | ||
| builder.isAddAllBackendRoles(isAddAllBackendRoles); | ||
| } | ||
| MLRegisterModelGroupInput mlInput = builder.build(); | ||
|
|
||
| mlClient.registerModelGroup(mlInput, actionListener); | ||
| } | ||
|
|
||
| return registerModelGroupFuture; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return NAME; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private List<String> getBackendRoles(Map<String, Object> content) { | ||
| return (List<String>) content.get(BACKEND_ROLES_FIELD); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.