Skip to content

Commit d536eba

Browse files
committed
feat(graph): rename AgentEnum to FlowAgentEnum and update references
1 parent 82fe9a2 commit d536eba

File tree

11 files changed

+31
-33
lines changed

11 files changed

+31
-33
lines changed

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/agent/LlmRoutingAgent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.alibaba.cloud.ai.graph.StateGraph;
2121
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowAgentBuilder;
2222
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
23-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
23+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2424
import com.alibaba.cloud.ai.graph.exception.GraphRunnerException;
2525
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
2626
import org.springframework.ai.chat.model.ChatModel;
@@ -48,7 +48,7 @@ public Optional<OverAllState> invoke(Map<String, Object> input) throws GraphStat
4848
@Override
4949
protected StateGraph buildSpecificGraph(FlowGraphBuilder.FlowGraphConfig config) throws GraphStateException {
5050
config.setChatModel(this.chatModel);
51-
return FlowGraphBuilder.buildGraph(AgentEnum.ROUTING.getType(), config);
51+
return FlowGraphBuilder.buildGraph(FlowAgentEnum.ROUTING.getType(), config);
5252
}
5353

5454
public static LlmRoutingAgentBuilder builder() {

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/agent/ParallelAgent.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.alibaba.cloud.ai.graph.agent.BaseAgent;
2222
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowAgentBuilder;
2323
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
24-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
24+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2525
import com.alibaba.cloud.ai.graph.exception.GraphRunnerException;
2626
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
2727
import org.slf4j.Logger;
@@ -79,7 +79,7 @@ protected StateGraph buildSpecificGraph(FlowGraphBuilder.FlowGraphConfig config)
7979
config.customProperty("mergeStrategy", this.mergeStrategy);
8080
config.customProperty("maxConcurrency", this.maxConcurrency);
8181

82-
return FlowGraphBuilder.buildGraph(AgentEnum.PARALLEL.getType(), config);
82+
return FlowGraphBuilder.buildGraph(FlowAgentEnum.PARALLEL.getType(), config);
8383
}
8484

8585
/**
@@ -163,9 +163,13 @@ protected ParallelAgentBuilder self() {
163163
*/
164164
@Override
165165
protected void validate() {
166-
super.validate();
166+
// Validate name first (from parent)
167+
if (name == null || name.trim().isEmpty()) {
168+
throw new IllegalArgumentException("Name must be provided");
169+
}
167170

168-
// Validate minimum sub-agent count
171+
// Validate minimum sub-agent count for ParallelAgent (skip parent subAgents
172+
// check)
169173
if (subAgents == null || subAgents.size() < 2) {
170174
throw new IllegalArgumentException(
171175
"ParallelAgent requires at least 2 sub-agents for parallel execution, but got: "

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/agent/SequentialAgent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.alibaba.cloud.ai.graph.StateGraph;
2121
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowAgentBuilder;
2222
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
23-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
23+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2424
import com.alibaba.cloud.ai.graph.exception.GraphRunnerException;
2525
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
2626

@@ -43,7 +43,7 @@ public Optional<OverAllState> invoke(Map<String, Object> input) throws GraphStat
4343

4444
@Override
4545
protected StateGraph buildSpecificGraph(FlowGraphBuilder.FlowGraphConfig config) throws GraphStateException {
46-
return FlowGraphBuilder.buildGraph(AgentEnum.SEQUENTIAL.getType(), config);
46+
return FlowGraphBuilder.buildGraph(FlowAgentEnum.SEQUENTIAL.getType(), config);
4747
}
4848

4949
public static SequentialAgentBuilder builder() {

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/builder/FlowGraphBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.alibaba.cloud.ai.graph.KeyStrategyFactory;
1919
import com.alibaba.cloud.ai.graph.StateGraph;
2020
import com.alibaba.cloud.ai.graph.agent.BaseAgent;
21-
import com.alibaba.cloud.ai.graph.agent.flow.registry.FlowGraphBuildingStrategyRegistry;
21+
import com.alibaba.cloud.ai.graph.agent.flow.strategy.FlowGraphBuildingStrategyRegistry;
2222
import com.alibaba.cloud.ai.graph.agent.flow.strategy.FlowGraphBuildingStrategy;
2323
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
2424
import org.springframework.ai.chat.model.ChatModel;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package com.alibaba.cloud.ai.graph.agent.flow.enums;
1717

18-
public enum AgentEnum {
18+
public enum FlowAgentEnum {
1919

2020
CONDITIONAL("CONDITIONAL"), SEQUENTIAL("SEQUENTIAL"), ROUTING("ROUTING"), PARALLEL("PARALLEL");
2121

2222
private final String type;
2323

24-
AgentEnum(final String type) {
24+
FlowAgentEnum(final String type) {
2525
this.type = type;
2626
}
2727

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/strategy/ConditionalGraphBuildingStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.alibaba.cloud.ai.graph.agent.BaseAgent;
2323
import com.alibaba.cloud.ai.graph.agent.flow.agent.FlowAgent;
2424
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
25-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
25+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2626
import com.alibaba.cloud.ai.graph.agent.flow.node.ConditionEvaluator;
2727
import com.alibaba.cloud.ai.graph.agent.flow.node.ConditionEvaluatorAction;
2828
import com.alibaba.cloud.ai.graph.agent.flow.node.TransparentNode;
@@ -84,7 +84,7 @@ public StateGraph buildGraph(FlowGraphBuilder.FlowGraphConfig config) throws Gra
8484

8585
@Override
8686
public String getStrategyType() {
87-
return AgentEnum.CONDITIONAL.getType();
87+
return FlowAgentEnum.CONDITIONAL.getType();
8888
}
8989

9090
@Override
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.alibaba.cloud.ai.graph.agent.flow.registry;
16+
package com.alibaba.cloud.ai.graph.agent.flow.strategy;
1717

1818
import java.util.concurrent.ConcurrentHashMap;
1919
import java.util.Map;
2020
import java.util.Set;
2121

22-
import com.alibaba.cloud.ai.graph.agent.flow.strategy.ConditionalGraphBuildingStrategy;
23-
import com.alibaba.cloud.ai.graph.agent.flow.strategy.FlowGraphBuildingStrategy;
24-
import com.alibaba.cloud.ai.graph.agent.flow.strategy.ParallelGraphBuildingStrategy;
25-
import com.alibaba.cloud.ai.graph.agent.flow.strategy.RoutingGraphBuildingStrategy;
26-
import com.alibaba.cloud.ai.graph.agent.flow.strategy.SequentialGraphBuildingStrategy;
27-
2822
/**
2923
* Registry for FlowGraphStrategy implementations. This allows for dynamic registration
3024
* and lookup of graph building strategies, enabling extensibility without modifying core

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/strategy/ParallelGraphBuildingStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.alibaba.cloud.ai.graph.agent.BaseAgent;
2020
import com.alibaba.cloud.ai.graph.agent.flow.agent.FlowAgent;
2121
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
22-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
22+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2323
import com.alibaba.cloud.ai.graph.agent.flow.node.EnhancedParallelResultAggregator;
2424
import com.alibaba.cloud.ai.graph.agent.flow.node.ParallelResultAggregator;
2525
import com.alibaba.cloud.ai.graph.agent.flow.node.TransparentNode;
@@ -86,7 +86,7 @@ public StateGraph buildGraph(FlowGraphBuilder.FlowGraphConfig config) throws Gra
8686

8787
@Override
8888
public String getStrategyType() {
89-
return AgentEnum.PARALLEL.getType();
89+
return FlowAgentEnum.PARALLEL.getType();
9090
}
9191

9292
@Override

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/strategy/RoutingGraphBuildingStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.alibaba.cloud.ai.graph.agent.BaseAgent;
2323
import com.alibaba.cloud.ai.graph.agent.flow.agent.FlowAgent;
2424
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
25-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
25+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2626
import com.alibaba.cloud.ai.graph.agent.flow.node.RoutingEdgeAction;
2727
import com.alibaba.cloud.ai.graph.agent.flow.node.TransparentNode;
2828
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
@@ -81,7 +81,7 @@ public StateGraph buildGraph(FlowGraphBuilder.FlowGraphConfig config) throws Gra
8181

8282
@Override
8383
public String getStrategyType() {
84-
return AgentEnum.ROUTING.getType();
84+
return FlowAgentEnum.ROUTING.getType();
8585
}
8686

8787
@Override

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/flow/strategy/SequentialGraphBuildingStrategy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.alibaba.cloud.ai.graph.agent.BaseAgent;
2020
import com.alibaba.cloud.ai.graph.agent.flow.agent.FlowAgent;
2121
import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
22-
import com.alibaba.cloud.ai.graph.agent.flow.enums.AgentEnum;
22+
import com.alibaba.cloud.ai.graph.agent.flow.enums.FlowAgentEnum;
2323
import com.alibaba.cloud.ai.graph.agent.flow.node.TransparentNode;
2424
import com.alibaba.cloud.ai.graph.exception.GraphStateException;
2525

@@ -66,7 +66,7 @@ public StateGraph buildGraph(FlowGraphBuilder.FlowGraphConfig config) throws Gra
6666

6767
@Override
6868
public String getStrategyType() {
69-
return AgentEnum.SEQUENTIAL.getType();
69+
return FlowAgentEnum.SEQUENTIAL.getType();
7070
}
7171

7272
@Override

0 commit comments

Comments
 (0)