Merge remote-tracking branch 'upstream/main'

Author: answeropensource

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/CompiledGraph.java

@@ -15,6 +15,26 @@
  */
 package com.alibaba.cloud.ai.graph;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import com.alibaba.cloud.ai.graph.action.AsyncCommandAction;
 import com.alibaba.cloud.ai.graph.action.AsyncNodeActionWithConfig;
 import com.alibaba.cloud.ai.graph.action.Command;
@@ -29,24 +49,23 @@
 import com.alibaba.cloud.ai.graph.internal.edge.EdgeValue;
 import com.alibaba.cloud.ai.graph.internal.node.CommandNode;
 import com.alibaba.cloud.ai.graph.internal.node.ParallelNode;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduleConfig;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduledAgentTask;
 import com.alibaba.cloud.ai.graph.state.StateSnapshot;
 import com.alibaba.cloud.ai.graph.streaming.AsyncGeneratorUtils;
 import com.alibaba.cloud.ai.graph.utils.LifeListenerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
 
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import org.springframework.util.CollectionUtils;
 
-import static com.alibaba.cloud.ai.graph.StateGraph.*;
+import static com.alibaba.cloud.ai.graph.StateGraph.END;
+import static com.alibaba.cloud.ai.graph.StateGraph.ERROR;
+import static com.alibaba.cloud.ai.graph.StateGraph.Edges;
+import static com.alibaba.cloud.ai.graph.StateGraph.NODE_AFTER;
+import static com.alibaba.cloud.ai.graph.StateGraph.NODE_BEFORE;
+import static com.alibaba.cloud.ai.graph.StateGraph.Nodes;
+import static com.alibaba.cloud.ai.graph.StateGraph.START;
 import static java.lang.String.format;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static java.util.concurrent.CompletableFuture.failedFuture;
@@ -463,6 +482,15 @@ public Optional<OverAllState> invoke(Map<String, Object> inputs) throws GraphRun
 		return this.invoke(stateCreate(inputs), RunnableConfig.builder().build());
 	}
 
+	/**
+	 * Schedule the graph execution with enhanced configuration options.
+	 * @param scheduleConfig the schedule configuration
+	 * @return a ScheduledGraphExecution instance for managing the scheduled task
+	 */
+	public ScheduledAgentTask schedule(ScheduleConfig scheduleConfig) {
+		return new ScheduledAgentTask(this, scheduleConfig).start();
+	}
+
 	private OverAllState stateCreate(Map<String, Object> inputs) {
 		// Creates a new OverAllState instance using key strategies from the graph
 		// and provided input data.

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

@@ -22,6 +22,10 @@
 import com.alibaba.cloud.ai.graph.action.AsyncNodeAction;
 import com.alibaba.cloud.ai.graph.exception.GraphRunnerException;
 import com.alibaba.cloud.ai.graph.exception.GraphStateException;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduleConfig;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduledAgentTask;
+
+import org.springframework.scheduling.Trigger;
 
 /**
  * Abstract base class for all agents in the graph system. Contains common properties and
@@ -95,4 +99,24 @@ public abstract AsyncNodeAction asAsyncNodeAction(String inputKeyFromParent, Str
 	public abstract Optional<OverAllState> invoke(Map<String, Object> input)
 			throws GraphStateException, GraphRunnerException;
 
+	/**
+	 * Schedule the agent task with trigger.
+	 * @param trigger the schedule configuration
+	 * @param input the agent input
+	 * @return a ScheduledAgentTask instance for managing the scheduled task
+	 */
+	public ScheduledAgentTask schedule(Trigger trigger, Map<String, Object> input)
+			throws GraphStateException, GraphRunnerException {
+		ScheduleConfig scheduleConfig = ScheduleConfig.builder().trigger(trigger).inputs(input).build();
+		return schedule(scheduleConfig);
+	}
+
+	/**
+	 * Schedule the agent task with trigger.
+	 * @param scheduleConfig the schedule configuration
+	 * @return a ScheduledAgentTask instance for managing the scheduled task
+	 */
+	public abstract ScheduledAgentTask schedule(ScheduleConfig scheduleConfig)
+			throws GraphStateException, GraphRunnerException;
+
 }

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

@@ -33,10 +33,13 @@
 import com.alibaba.cloud.ai.graph.action.NodeAction;
 import com.alibaba.cloud.ai.graph.node.LlmNode;
 import com.alibaba.cloud.ai.graph.node.ToolNode;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduleConfig;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduledAgentTask;
 import com.alibaba.cloud.ai.graph.state.strategy.AppendStrategy;
 import org.apache.commons.collections4.CollectionUtils;
 
 import com.alibaba.cloud.ai.graph.state.strategy.ReplaceStrategy;
+
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
@@ -112,6 +115,12 @@ public Optional<OverAllState> invoke(Map<String, Object> input) throws GraphStat
 		return this.compiledGraph.invoke(input);
 	}
 
+	@Override
+	public ScheduledAgentTask schedule(ScheduleConfig scheduleConfig) throws GraphStateException {
+		CompiledGraph compiledGraph = getAndCompileGraph();
+		return compiledGraph.schedule(scheduleConfig);
+	}
+
 	public StateGraph getStateGraph() {
 		return graph;
 	}
@@ -465,6 +474,9 @@ public ReactAgent build() throws GraphStateException {
 			}
 
 			LlmNode.Builder llmNodeBuilder = LlmNode.builder().chatClient(chatClient).messagesKey(this.inputKey);
+			if (outputKey != null && !outputKey.isEmpty()) {
+				llmNodeBuilder.outputKey(outputKey);
+			}
 			if (CollectionUtils.isNotEmpty(tools)) {
 				llmNodeBuilder.toolCallbacks(tools);
 			}

spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/agent/a2a/A2aRemoteAgent.java

@@ -16,24 +16,26 @@
 
 package com.alibaba.cloud.ai.graph.agent.a2a;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
 import com.alibaba.cloud.ai.graph.CompileConfig;
-import com.alibaba.cloud.ai.graph.OverAllState;
-import com.alibaba.cloud.ai.graph.KeyStrategy;
 import com.alibaba.cloud.ai.graph.CompiledGraph;
+import com.alibaba.cloud.ai.graph.KeyStrategy;
 import com.alibaba.cloud.ai.graph.KeyStrategyFactory;
+import com.alibaba.cloud.ai.graph.OverAllState;
 import com.alibaba.cloud.ai.graph.StateGraph;
 import com.alibaba.cloud.ai.graph.action.AsyncNodeAction;
 import com.alibaba.cloud.ai.graph.action.NodeAction;
 import com.alibaba.cloud.ai.graph.agent.BaseAgent;
 import com.alibaba.cloud.ai.graph.exception.GraphRunnerException;
 import com.alibaba.cloud.ai.graph.exception.GraphStateException;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduleConfig;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduledAgentTask;
 import com.alibaba.cloud.ai.graph.state.strategy.AppendStrategy;
 import io.a2a.spec.AgentCard;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
 import static com.alibaba.cloud.ai.graph.action.AsyncNodeAction.node_async;
 
 public class A2aRemoteAgent extends BaseAgent {
@@ -87,6 +89,11 @@ public AsyncNodeAction asAsyncNodeAction(String inputKeyFromParent, String outpu
 		return node_async(new A2aNode(agentCard, inputKeyFromParent, outputKeyToParent, streaming));
 	}
 
+	@Override
+	public ScheduledAgentTask schedule(ScheduleConfig scheduleConfig) throws GraphStateException, GraphRunnerException {
+		throw new UnsupportedOperationException("A2aRemoteAgent has not support schedule.");
+	}
+
 	@Override
 	public Optional<OverAllState> invoke(Map<String, Object> input) throws GraphStateException, GraphRunnerException {
 		if (this.compiledGraph == null) {

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

@@ -26,6 +26,8 @@
 import com.alibaba.cloud.ai.graph.agent.ReactAgent;
 import com.alibaba.cloud.ai.graph.agent.flow.builder.FlowGraphBuilder;
 import com.alibaba.cloud.ai.graph.exception.GraphStateException;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduleConfig;
+import com.alibaba.cloud.ai.graph.scheduling.ScheduledAgentTask;
 
 import static com.alibaba.cloud.ai.graph.action.AsyncNodeAction.node_async;
 
@@ -86,6 +88,12 @@ public AsyncNodeAction asAsyncNodeAction(String inputKeyFromParent, String outpu
 				new ReactAgent.SubGraphNodeAdapter(inputKeyFromParent, outputKeyToParent, this.compiledGraph));
 	}
 
+	@Override
+	public ScheduledAgentTask schedule(ScheduleConfig scheduleConfig) throws GraphStateException {
+		CompiledGraph compiledGraph = getAndCompileGraph();
+		return compiledGraph.schedule(scheduleConfig);
+	}
+
 	public CompiledGraph getAndCompileGraph() throws GraphStateException {
 		if (this.compileConfig == null) {
 			this.compiledGraph = graph.compile();

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

@@ -56,6 +56,12 @@ public RoutingEdgeAction(ChatModel chatModel, BaseAgent current, List<BaseAgent>
 		}
 		sb.append("\n\n");
 		sb.append("Return the agent name to delegate the task to.");
+		sb.append("\n\n");
+		sb.append(
+				"It should be emphasized that the returned result only requires the agent name and no other content.");
+		sb.append("\n\n");
+		sb.append(
+				"For example, if you want to delegate the task to the agent named 'agent1', you should return 'agent1'.");
 
 		this.chatClient = ChatClient.builder(chatModel).defaultSystem(sb.toString()).build();
 		this.taskKey = current.outputKey();