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.

Sign up for GitHub

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

Passing tenantId to MLClient for Connector, Model and ModelGroup #1020

Merged
merged 1 commit into from
Jan 25, 2025
Merged

Passing tenantId to MLClient for Connector, Model and ModelGroup #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/org/opensearch/flowframework/workflow/CreateConnectorStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public void onFailure(Exception ex) {
.parameters(parameters)
.credential(credentials)
.actions(actions)
.tenantId(tenantId)
.build();

mlClient.createConnector(mlInput, actionListener);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/flowframework/workflow/DeleteConnectorStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public PlainActionFuture<WorkflowData> execute(
);
String connectorId = (String) inputs.get(CONNECTOR_ID);

mlClient.deleteConnector(connectorId, new ActionListener<>() {
mlClient.deleteConnector(connectorId, tenantId, new ActionListener<>() {
@Override
public void onResponse(DeleteResponse deleteResponse) {
deleteConnectorFuture.onResponse(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/opensearch/flowframework/workflow/DeleteModelStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public PlainActionFuture<WorkflowData> execute(

String modelId = inputs.get(MODEL_ID).toString();

mlClient.deleteModel(modelId, new ActionListener<>() {
mlClient.deleteModel(modelId, tenantId, new ActionListener<>() {
@Override
public void onResponse(DeleteResponse deleteResponse) {
deleteModelFuture.onResponse(
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/opensearch/flowframework/workflow/RegisterModelGroupStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ public void onFailure(Exception ex) {

MLRegisterModelGroupInputBuilder builder = MLRegisterModelGroupInput.builder();
builder.name(modelGroupName);
builder.tenantId(tenantId);
if (description != null) {
builder.description(description);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ public PlainActionFuture<WorkflowData> execute(
MLRegisterModelInputBuilder builder = MLRegisterModelInput.builder()
.functionName(FunctionName.REMOTE)
.modelName(modelName)
.connectorId(connectorId);
.connectorId(connectorId)
.tenantId(tenantId);

if (modelGroupId != null) {
builder.modelGroupId(modelGroupId);
Expand Down
13 changes: 7 additions & 6 deletions src/test/java/org/opensearch/flowframework/workflow/DeleteConnectorStepTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import static org.opensearch.flowframework.common.WorkflowResources.CONNECTOR_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;

Expand All @@ -54,12 +55,12 @@ public void testDeleteConnector() throws IOException, ExecutionException, Interr

doAnswer(invocation -> {
String connectorIdArg = invocation.getArgument(0);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(1);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(2);
ShardId shardId = new ShardId(new Index("indexName", "uuid"), 1);
DeleteResponse output = new DeleteResponse(shardId, connectorIdArg, 1, 1, 1, true);
actionListener.onResponse(output);
return null;
}).when(machineLearningNodeClient).deleteConnector(anyString(), anyActionListener());
}).when(machineLearningNodeClient).deleteConnector(anyString(), nullable(String.class), anyActionListener());

PlainActionFuture<WorkflowData> future = deleteConnectorStep.execute(
inputData.getNodeId(),
Expand All @@ -69,7 +70,7 @@ public void testDeleteConnector() throws IOException, ExecutionException, Interr
Collections.emptyMap(),
null
);
verify(machineLearningNodeClient).deleteConnector(anyString(), anyActionListener());
verify(machineLearningNodeClient).deleteConnector(anyString(), nullable(String.class), anyActionListener());

assertTrue(future.isDone());
assertEquals(connectorId, future.get().getContent().get(CONNECTOR_ID));
Expand Down Expand Up @@ -97,10 +98,10 @@ public void testDeleteConnectorFailure() throws IOException {
DeleteConnectorStep deleteConnectorStep = new DeleteConnectorStep(machineLearningNodeClient);

doAnswer(invocation -> {
ActionListener<DeleteResponse> actionListener = invocation.getArgument(1);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(2);
actionListener.onFailure(new FlowFrameworkException("Failed to delete connector", RestStatus.INTERNAL_SERVER_ERROR));
return null;
}).when(machineLearningNodeClient).deleteConnector(anyString(), anyActionListener());
}).when(machineLearningNodeClient).deleteConnector(anyString(), nullable(String.class), anyActionListener());

PlainActionFuture<WorkflowData> future = deleteConnectorStep.execute(
inputData.getNodeId(),
Expand All @@ -111,7 +112,7 @@ public void testDeleteConnectorFailure() throws IOException {
null
);

verify(machineLearningNodeClient).deleteConnector(anyString(), anyActionListener());
verify(machineLearningNodeClient).deleteConnector(anyString(), nullable(String.class), anyActionListener());

assertTrue(future.isDone());
ExecutionException ex = assertThrows(ExecutionException.class, () -> future.get().getContent());
Expand Down
19 changes: 10 additions & 9 deletions src/test/java/org/opensearch/flowframework/workflow/DeleteModelStepTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import static org.opensearch.flowframework.common.WorkflowResources.MODEL_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;

Expand All @@ -54,12 +55,12 @@ public void testDeleteModel() throws IOException, ExecutionException, Interrupte

doAnswer(invocation -> {
String modelIdArg = invocation.getArgument(0);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(1);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(2);
ShardId shardId = new ShardId(new Index("indexName", "uuid"), 1);
DeleteResponse output = new DeleteResponse(shardId, modelIdArg, 1, 1, 1, true);
actionListener.onResponse(output);
return null;
}).when(machineLearningNodeClient).deleteModel(any(String.class), any());
}).when(machineLearningNodeClient).deleteModel(any(String.class), nullable(String.class), any());

PlainActionFuture<WorkflowData> future = deleteModelStep.execute(
inputData.getNodeId(),
Expand All @@ -69,7 +70,7 @@ public void testDeleteModel() throws IOException, ExecutionException, Interrupte
Collections.emptyMap(),
null
);
verify(machineLearningNodeClient).deleteModel(any(String.class), any());
verify(machineLearningNodeClient).deleteModel(any(String.class), nullable(String.class), any());

assertTrue(future.isDone());
assertEquals(modelId, future.get().getContent().get(MODEL_ID));
Expand All @@ -81,10 +82,10 @@ public void testDeleteModelNotFound() throws IOException, ExecutionException, In
DeleteModelStep deleteModelStep = new DeleteModelStep(machineLearningNodeClient);

doAnswer(invocation -> {
ActionListener<DeleteResponse> actionListener = invocation.getArgument(1);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(2);
actionListener.onFailure(new OpenSearchStatusException("No model found with that id", RestStatus.NOT_FOUND));
return null;
}).when(machineLearningNodeClient).deleteModel(any(String.class), any());
}).when(machineLearningNodeClient).deleteModel(any(String.class), nullable(String.class), any());

PlainActionFuture<WorkflowData> future = deleteModelStep.execute(
inputData.getNodeId(),
Expand All @@ -94,7 +95,7 @@ public void testDeleteModelNotFound() throws IOException, ExecutionException, In
Collections.emptyMap(),
null
);
verify(machineLearningNodeClient).deleteModel(any(String.class), any());
verify(machineLearningNodeClient).deleteModel(any(String.class), nullable(String.class), any());

assertTrue(future.isDone());
assertEquals(modelId, future.get().getContent().get(MODEL_ID));
Expand Down Expand Up @@ -122,10 +123,10 @@ public void testDeleteModelFailure() throws IOException {
DeleteModelStep deleteModelStep = new DeleteModelStep(machineLearningNodeClient);

doAnswer(invocation -> {
ActionListener<DeleteResponse> actionListener = invocation.getArgument(1);
ActionListener<DeleteResponse> actionListener = invocation.getArgument(2);
actionListener.onFailure(new FlowFrameworkException("Failed to delete model", RestStatus.INTERNAL_SERVER_ERROR));
return null;
}).when(machineLearningNodeClient).deleteModel(any(String.class), any());
}).when(machineLearningNodeClient).deleteModel(any(String.class), nullable(String.class), any());

PlainActionFuture<WorkflowData> future = deleteModelStep.execute(
inputData.getNodeId(),
Expand All @@ -136,7 +137,7 @@ public void testDeleteModelFailure() throws IOException {
null
);

verify(machineLearningNodeClient).deleteModel(any(String.class), any());
verify(machineLearningNodeClient).deleteModel(any(String.class), nullable(String.class), any());

assertTrue(future.isDone());
ExecutionException ex = assertThrows(ExecutionException.class, () -> future.get().getContent());
Expand Down
Loading