[Backport Feature/agent_framework] Manual Backport (#204)

* manual backport Signed-off-by: Joshua Palis <[email protected]> * Reverting changes to feature/agent_framework dev CI Signed-off-by: Joshua Palis <[email protected]> * Spotless Signed-off-by: Joshua Palis <[email protected]> * running full check suite Signed-off-by: Joshua Palis <[email protected]> * Reverting ALL modifications to CI.yml Signed-off-by: Joshua Palis <[email protected]> * Reverting resolution strategy for eclipse dependency Signed-off-by: Joshua Palis <[email protected]> --------- Signed-off-by: Joshua Palis <[email protected]>
opensearch-project · Nov 28, 2023 · 9c85bdd · 9c85bdd
1 parent a4fd3dc
commit 9c85bdd
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 28 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-- [Contributing to OpenSearch AI Flow Framework](#contributing-to-opensearch-ai-flow-framework)
+- [Contributing to OpenSearch AI Flow Framework](#contributing-to-flow-framework)
   - [First Things First](#first-things-first)
   - [Ways to Contribute](#ways-to-contribute)
     - [Bug Reports](#bug-reports)
@@ -8,13 +8,13 @@
   - [Code Coverage](#code-coverage)
   - [Review Process](#review-process)
 
-# Contributing to OpenSearch AI Flow Framework
+# Contributing to OpenSearch Flow Framework
 
 OpenSearch AI Flow Framework is a community project that is built and maintained by people just like **you**. We're glad you're interested in helping out. There are several different ways you can do it, but before we talk about that, let's talk about how to get started.
 
 ## First Things First
 
-1. **When in doubt, open an issue** - For almost any type of contribution, the first step is opening an issue. Even if you think you already know what the solution is, writing down a description of the problem you're trying to solve will help everyone get context when they review your pull request. If it's truly a trivial change (e.g. spelling error), you can skip this step -- but as the subject says, when in doubt, [open an issue](https://github.com/opensearch-project/opensearch-ai-flow-framework/issues).
+1. **When in doubt, open an issue** - For almost any type of contribution, the first step is opening an issue. Even if you think you already know what the solution is, writing down a description of the problem you're trying to solve will help everyone get context when they review your pull request. If it's truly a trivial change (e.g. spelling error), you can skip this step -- but as the subject says, when in doubt, [open an issue](https://github.com/opensearch-project/flow-framework/issues).
 
 2. **Only submit your own work**  (or work you have sufficient rights to submit) - Please make sure that any code or documentation you submit is your work or you have the rights to submit. We respect the intellectual property rights of others, and as part of contributing, we'll ask you to sign your contribution with a "Developer Certificate of Origin" (DCO) that states you have the rights to submit this work and you understand we'll use your contribution. There's more information about this topic in the [DCO section](#developer-certificate-of-origin).
 
@@ -24,17 +24,17 @@ OpenSearch AI Flow Framework is a community project that is built and maintained
 
 Ugh! Bugs!
 
-A bug is when software behaves in a way that you didn't expect and the developer didn't intend. To help us understand what's going on, we first want to make sure you're working from the latest version. Please make sure you're testing against the [latest version](https://github.com/opensearch-project/opensearch-ai-flow-framework).
+A bug is when software behaves in a way that you didn't expect and the developer didn't intend. To help us understand what's going on, we first want to make sure you're working from the latest version. Please make sure you're testing against the [latest version](https://github.com/opensearch-project/flow-framework).
 
-Once you've confirmed that the bug still exists in the latest version, you'll want to check to make sure it's not something we already know about on the [open issues GitHub page](https://github.com/opensearch-project/opensearch-ai-flow-framework/issues).
+Once you've confirmed that the bug still exists in the latest version, you'll want to check to make sure it's not something we already know about on the [open issues GitHub page](https://github.com/opensearch-project/flow-framework/issues).
 
 ### Feature Requests
 
 If you've thought of a way that this project could be better, we want to hear about it. We track feature requests using GitHub, so please feel free to open an issue which describes the feature you would like to see, why you need it, and how it should work.
 
 ### Contributing Code
 
-As with other types of contributions, the first step is to [**open an issue on GitHub**](https://github.com/opensearch-project/opensearch-ai-flow-framework/issues/new/choose). Opening an issue before you make changes makes sure that someone else isn't already working on that particular problem. It also lets us all work together to find the right approach before you spend a bunch of time on a PR. So again, when in doubt, open an issue.
+As with other types of contributions, the first step is to [**open an issue on GitHub**](https://github.com/opensearch-project/flow-framework/issues/new/choose). Opening an issue before you make changes makes sure that someone else isn't already working on that particular problem. It also lets us all work together to find the right approach before you spend a bunch of time on a PR. So again, when in doubt, open an issue.
 
 Once you've opened an issue, check out our [Developer Guide](./DEVELOPER_GUIDE.md) for instructions on how to get started.
 
@@ -69,7 +69,7 @@ By making a contribution to this project, I certify that:
     consistent with this project or the open source license(s)
     involved.
  ```
-We require that every contribution to opensearch-ai-flow-framework is signed with a [Developer Certificate of Origin](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Additionally, please use your real name. We do not accept anonymous contributors nor those utilizing pseudonyms.
+We require that every contribution to flow-framework is signed with a [Developer Certificate of Origin](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). Additionally, please use your real name. We do not accept anonymous contributors nor those utilizing pseudonyms.
 
 Each commit must include a DCO which looks like this
 
@@ -86,7 +86,7 @@ If you'd like to preview your coverage before submitting your PR, to identify li
 
 ## Review Process
 
-We deeply appreciate everyone who takes the time to make a contribution. We will review all contributions as quickly as possible. As a reminder, [opening an issue](https://github.com/opensearch-project/opensearch-ai-flow-framework/issues/new/choose) discussing your change before you make it is the best way to smooth the PR process. This will prevent a rejection because someone else is already working on the problem, or because the solution is incompatible with the architectural direction.
+We deeply appreciate everyone who takes the time to make a contribution. We will review all contributions as quickly as possible. As a reminder, [opening an issue](https://github.com/opensearch-project/flow-framework/issues/new/choose) discussing your change before you make it is the best way to smooth the PR process. This will prevent a rejection because someone else is already working on the problem, or because the solution is incompatible with the architectural direction.
 
 It is necessary to request at least two contributors to review your pull request. It is required to have two approvals in order for your pull request to be accepted.
 

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -66,23 +66,23 @@ snapshots/
 └── org
     └── opensearch
         └── plugin
-            └── opensearch-ai-flow-framework
+            └── opensearch-flow-framework
                 ├── 3.0.0.0-SNAPSHOT
                 │   ├── maven-metadata.xml
                 │   ├── maven-metadata.xml.md5
                 │   ├── maven-metadata.xml.sha1
                 │   ├── maven-metadata.xml.sha256
                 │   ├── maven-metadata.xml.sha512
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.pom
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.pom.md5
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.pom.sha1
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.pom.sha256
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.pom.sha512
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.zip
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.zip.md5
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.zip.sha1
-                │   ├── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.zip.sha256
-                │   └── opensearch-ai-flow-framework-3.0.0.0-20231005.170838-1.zip.sha512
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.pom
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.pom.md5
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.pom.sha1
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.pom.sha256
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.pom.sha512
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.zip
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.zip.md5
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.zip.sha1
+                │   ├── opensearch-flow-framework-3.0.0.0-20231005.170838-1.zip.sha256
+                │   └── opensearch-flow-framework-3.0.0.0-20231005.170838-1.zip.sha512
                 ├── maven-metadata.xml
                 ├── maven-metadata.xml.md5
                 ├── maven-metadata.xml.sha1

diff --git a/build.gradle b/build.gradle
@@ -146,6 +146,7 @@ dependencies {
     configurations.all {
         resolutionStrategy {
             force("com.google.guava:guava:32.1.3-jre") // CVE for 31.1
+            force("com.fasterxml.jackson.core:jackson-core:2.16.0") // Dependency Jar Hell
         }
     }
 }
@@ -238,7 +239,7 @@ diffCoverageReport {
             file.withOutputStream { out ->
                 exec {
                     ignoreExitValue true
-                    commandLine 'git', 'diff', '--no-color', '--minimal', diffBase, '|| true'
+                    commandLine 'git', 'diff', '--no-color', '--minimal', diffBase
                     standardOutput = out
                 }
             }

diff --git a/src/main/java/org/opensearch/flowframework/workflow/GetMLTaskStep.java b/src/main/java/org/opensearch/flowframework/workflow/GetMLTaskStep.java
@@ -51,7 +51,7 @@ public CompletableFuture<WorkflowData> execute(List<WorkflowData> data) {
         ActionListener<MLTask> actionListener = ActionListener.wrap(response -> {
 
             // TODO : Add retry capability if response status is not COMPLETED :
-            // https://github.com/opensearch-project/opensearch-ai-flow-framework/issues/158
+            // https://github.com/opensearch-project/flow-framework/issues/158
 
             logger.info("ML Task retrieval successful");
             getMLTaskFuture.complete(

diff --git a/src/main/java/org/opensearch/flowframework/workflow/ProcessNode.java b/src/main/java/org/opensearch/flowframework/workflow/ProcessNode.java
@@ -180,7 +180,7 @@ public CompletableFuture<WorkflowData> execute() {
                 this.future.completeExceptionally(e);
             }
             // TODO: improve use of thread pool beyond generic
-            // https://github.com/opensearch-project/opensearch-ai-flow-framework/issues/61
+            // https://github.com/opensearch-project/flow-framework/issues/61
         }, threadPool.generic());
         return this.future;
     }

diff --git a/src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java b/src/main/java/org/opensearch/flowframework/workflow/RegisterRemoteModelStep.java
@@ -87,7 +87,7 @@ public void onFailure(Exception e) {
         String description = null;
         String connectorId = null;
 
-        // TODO : Handle inline connector configuration : https://github.com/opensearch-project/opensearch-ai-flow-framework/issues/149
+        // TODO : Handle inline connector configuration : https://github.com/opensearch-project/flow-framework/issues/149
 
         for (WorkflowData workflowData : data) {
 

diff --git a/src/main/java/org/opensearch/flowframework/workflow/WorkflowProcessSorter.java b/src/main/java/org/opensearch/flowframework/workflow/WorkflowProcessSorter.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -158,14 +157,20 @@ private TimeValue parseTimeout(WorkflowNode node) {
 
     private static List<WorkflowNode> topologicalSort(List<WorkflowNode> workflowNodes, List<WorkflowEdge> workflowEdges) {
         // Basic validation
-        Set<String> nodeIds = workflowNodes.stream().map(n -> n.id()).collect(Collectors.toSet());
+        Map<String, WorkflowNode> nodeMap = new HashMap<>();
+        for (WorkflowNode node : workflowNodes) {
+            if (nodeMap.containsKey(node.id())) {
+                throw new FlowFrameworkException("Duplicate node id " + node.id() + ".", RestStatus.BAD_REQUEST);
+            }
+            nodeMap.put(node.id(), node);
+        }
         for (WorkflowEdge edge : workflowEdges) {
             String source = edge.source();
-            if (!nodeIds.contains(source)) {
+            if (!nodeMap.containsKey(source)) {
                 throw new FlowFrameworkException("Edge source " + source + " does not correspond to a node.", RestStatus.BAD_REQUEST);
             }
             String dest = edge.destination();
-            if (!nodeIds.contains(dest)) {
+            if (!nodeMap.containsKey(dest)) {
                 throw new FlowFrameworkException("Edge destination " + dest + " does not correspond to a node.", RestStatus.BAD_REQUEST);
             }
             if (source.equals(dest)) {
@@ -176,7 +181,6 @@ private static List<WorkflowNode> topologicalSort(List<WorkflowNode> workflowNod
         // Build predecessor and successor maps
         Map<WorkflowNode, Set<WorkflowEdge>> predecessorEdges = new HashMap<>();
         Map<WorkflowNode, Set<WorkflowEdge>> successorEdges = new HashMap<>();
-        Map<String, WorkflowNode> nodeMap = workflowNodes.stream().collect(Collectors.toMap(WorkflowNode::id, Function.identity()));
         for (WorkflowEdge edge : workflowEdges) {
             WorkflowNode source = nodeMap.get(edge.source());
             WorkflowNode dest = nodeMap.get(edge.destination());

diff --git a/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java b/src/test/java/org/opensearch/flowframework/workflow/WorkflowProcessSorterTests.java
@@ -219,6 +219,10 @@ public void testExceptions() throws IOException {
         );
         assertEquals("Workflow step type [unimplemented_step] is not implemented.", ex.getMessage());
         assertEquals(RestStatus.NOT_IMPLEMENTED, ((FlowFrameworkException) ex).getRestStatus());
+
+        ex = assertThrows(FlowFrameworkException.class, () -> parse(workflow(List.of(node("A"), node("A")), Collections.emptyList())));
+        assertEquals("Duplicate node id A.", ex.getMessage());
+        assertEquals(RestStatus.BAD_REQUEST, ((FlowFrameworkException) ex).getRestStatus());
     }
 
     public void testSuccessfulGraphValidation() throws Exception {