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

Jump to bottom

[Backport 2.x] Include previous node substitutions in nested lists and maps #373

Merged
merged 1 commit into from
Jan 5, 2024
Merged

[Backport 2.x] Include previous node substitutions in nested lists and maps #373

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
34 changes: 27 additions & 7 deletions src/main/java/org/opensearch/flowframework/util/ParseUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@
import java.time.Instant;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken;
import static org.opensearch.flowframework.common.CommonValue.PARAMETERS_FIELD;
Expand Down Expand Up @@ -277,15 +279,20 @@ public static Map<String, Object> getInputsFromPreviousSteps(
value = matchedValue.get();
}
}
// Check for substitution
if (value != null) {
Matcher m = SUBSTITUTION_PATTERN.matcher(value.toString());
if (m.matches()) {
WorkflowData data = outputs.get(m.group(1));
if (data != null && data.getContent().containsKey(m.group(2))) {
value = data.getContent().get(m.group(2));
}
// Check for any substitution(s) in value, list, or map
if (value instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, Object> valueMap = (Map<String, Object>) value;
value = valueMap.entrySet()
.stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> conditionallySubstitute(e.getValue(), outputs)));
} else if (value instanceof List) {
value = ((List<?>) value).stream().map(v -> conditionallySubstitute(v, outputs)).collect(Collectors.toList());
} else {
value = conditionallySubstitute(value, outputs);
}
// Add value to inputs and mark that a required key was present
inputs.put(key, value);
requiredKeys.remove(key);
}
Expand All @@ -306,4 +313,17 @@ public static Map<String, Object> getInputsFromPreviousSteps(
// Finally return the map
return inputs;
}

private static Object conditionallySubstitute(Object value, Map<String, WorkflowData> outputs) {
if (value instanceof String) {
Matcher m = SUBSTITUTION_PATTERN.matcher((String) value);
if (m.matches()) {
WorkflowData data = outputs.get(m.group(1));
if (data != null && data.getContent().containsKey(m.group(2))) {
return data.getContent().get(m.group(2));
}
}
}
return value;
}
}
23 changes: 20 additions & 3 deletions src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.IOException;
import java.time.Instant;
import java.util.List;
import java.util.Map;
import java.util.Set;

Expand Down Expand Up @@ -72,7 +73,13 @@ public void testBuildAndParseStringToStringMap() throws IOException {

public void testGetInputsFromPreviousSteps() {
WorkflowData currentNodeInputs = new WorkflowData(
Map.ofEntries(Map.entry("content1", 1), Map.entry("param1", 2), Map.entry("content3", "${{step1.output1}}")),
Map.ofEntries(
Map.entry("content1", 1),
Map.entry("param1", 2),
Map.entry("content3", "${{step1.output1}}"),
Map.entry("nestedMap", Map.of("content4", "${{step3.output3}}")),
Map.entry("nestedList", List.of("${{step4.output4}}"))
),
Map.of("param1", "value1"),
"workflowId",
"nodeId"
Expand All @@ -86,11 +93,13 @@ public void testGetInputsFromPreviousSteps() {
"step1"
)
),
Map.entry("step2", new WorkflowData(Map.of("output2", "step2outputvalue2"), "workflowId", "step2"))
Map.entry("step2", new WorkflowData(Map.of("output2", "step2outputvalue2"), "workflowId", "step2")),
Map.entry("step3", new WorkflowData(Map.of("output3", "step3outputvalue3"), "workflowId", "step3")),
Map.entry("step4", new WorkflowData(Map.of("output4", "step4outputvalue4"), "workflowId", "step4"))
);
Map<String, String> previousNodeInputs = Map.of("step2", "output2");
Set<String> requiredKeys = Set.of("param1", "content1");
Set<String> optionalKeys = Set.of("output1", "output2", "content3", "no-output");
Set<String> optionalKeys = Set.of("output1", "output2", "content3", "nestedMap", "nestedList", "no-output");

Map<String, Object> inputs = ParseUtils.getInputsFromPreviousSteps(
requiredKeys,
Expand All @@ -104,7 +113,15 @@ public void testGetInputsFromPreviousSteps() {
assertEquals(1, inputs.get("content1"));
assertEquals("outputvalue1", inputs.get("output1"));
assertEquals("step2outputvalue2", inputs.get("output2"));

// Substitutions
assertEquals("outputvalue1", inputs.get("content3"));
@SuppressWarnings("unchecked")
Map<String, Object> nestedMap = (Map<String, Object>) inputs.get("nestedMap");
assertEquals("step3outputvalue3", nestedMap.get("content4"));
@SuppressWarnings("unchecked")
List<String> nestedList = (List<String>) inputs.get("nestedList");
assertEquals(List.of("step4outputvalue4"), nestedList);
assertNull(inputs.get("no-output"));

Set<String> missingRequiredKeys = Set.of("not-here");
Expand Down
Loading