feat(deepresearch): optimize

Author: GTyingzi

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/agents/McpAssignNodeConfiguration.java

@@ -32,7 +32,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.web.reactive.function.client.WebClient;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,18 +55,12 @@ public class McpAssignNodeConfiguration {
 	@Autowired
 	private McpAssignNodeProperties mcpAssignNodeProperties;
 
-	@Autowired
-	private McpClientCommonProperties commonProperties;
-
 	@Autowired
 	private ResourceLoader resourceLoader;
 
 	@Autowired
 	private ObjectMapper objectMapper;
 
-	@Autowired
-	private WebClient.Builder webClientBuilderTemplate;
-
 	/**
 	 * 读取JSON配置文件
 	 */

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/node/BackgroundInvestigationNode.java

@@ -91,55 +91,50 @@ public Map<String, Object> apply(OverAllState state) throws Exception {
 			// 使用统一的智能搜索选择方法
 			SmartAgentUtil.SearchSelectionResult searchSelection = smartAgentSelectionHelper
 				.intelligentSearchSelection(state, query);
-			List<Map<String, String>> results = new ArrayList<>();
+			List<Map<String, String>> results;
 
 			// 使用支持工具调用的搜索方法
-			results = searchInfoService.searchInfo(state.value("enable_search_filter", true),
-					searchSelection.getSearchEnum(), query, searchSelection.getSearchPlatform());
+			results = searchInfoService.searchInfo(StateUtil.isSearchFilter(state), searchSelection.getSearchEnum(),
+					query, searchSelection.getSearchPlatform());
 			resultMap.put("site_information", results);
 			resultsList.add(results);
 		}
 
-		if (!resultsList.isEmpty()) {
-			List<String> backgroundResults = new ArrayList<>();
-			assert resultsList.size() != queries.size();
+		List<String> backgroundResults = new ArrayList<>();
+		assert resultsList.size() != queries.size();
 
-			for (int i = 0; i < resultsList.size(); i++) {
-				List<Map<String, String>> searchResults = resultsList.get(i);
+		for (int i = 0; i < resultsList.size(); i++) {
+			List<Map<String, String>> searchResults = resultsList.get(i);
 
-				String query = queries.get(i);
+			String query = queries.get(i);
 
-				Message messages = new UserMessage(
-						"搜索问题:" + query + "\n" + "以下是搜索结果：\n\n" + searchResults.stream().map(r -> {
-							return String.format("标题: %s\n权重: %s\n内容: %s\n", r.get("title"), r.get("weight"),
-									r.get("content"));
-						}).collect(Collectors.joining("\n\n")));
+			Message messages = new UserMessage(
+					"搜索问题:" + query + "\n" + "以下是搜索结果：\n\n" + searchResults.stream().map(r -> {
+						return String.format("标题: %s\n权重: %s\n内容: %s\n", r.get("title"), r.get("weight"),
+								r.get("content"));
+					}).collect(Collectors.joining("\n\n")));
 
-				String sessionId = state.value("session_id", String.class).orElse("__default__");
-				List<SessionHistory> reports = sessionContextService.getRecentReports(sessionId);
-				Message lastReportMessage;
-				if (reports != null && !reports.isEmpty()) {
-					lastReportMessage = new AssistantMessage("这是用户前几次使用DeepResearch的报告：\r\n"
-							+ reports.stream().map(SessionHistory::toString).collect(Collectors.joining("\r\n\r\n")));
-				}
-				else {
-					lastReportMessage = new AssistantMessage("这是用户的第一次询问，因此没有上下文。");
-				}
+			String sessionId = state.value("session_id", String.class).orElse("__default__");
+			List<SessionHistory> reports = sessionContextService.getRecentReports(sessionId);
+			Message lastReportMessage;
+			if (reports != null && !reports.isEmpty()) {
+				lastReportMessage = new AssistantMessage("这是用户前几次使用DeepResearch的报告：\r\n"
+						+ reports.stream().map(SessionHistory::toString).collect(Collectors.joining("\r\n\r\n")));
+			}
+			else {
+				lastReportMessage = new AssistantMessage("这是用户的第一次询问，因此没有上下文。");
+			}
 
-				String content = backgroundAgent.prompt().messages(lastReportMessage, messages).call().content();
+			String content = backgroundAgent.prompt().messages(lastReportMessage, messages).call().content();
 
-				backgroundResults.add(content);
+			backgroundResults.add(content);
 
-				logger.info("背景调查报告生成已完成: {}", backgroundResults.size());
-			}
-			resultMap.put("background_investigation_results", backgroundResults);
-		}
-		else {
-			logger.warn("⚠️ 搜索失败");
+			logger.info("背景调查报告生成已完成: {}", backgroundResults.size());
 		}
+		resultMap.put("background_investigation_results", backgroundResults);
 
 		String nextStep = "planner";
-		if (!state.value("enable_deepresearch", true)) {
+		if (!StateUtil.isDeepresearch(state)) {
 			nextStep = "reporter";
 		}
 		resultMap.put("background_investigation_next_node", nextStep);

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/node/CoordinatorNode.java

@@ -65,7 +65,7 @@ public Map<String, Object> apply(OverAllState state) throws Exception {
 		messages.add(TemplateUtil.getMessage("coordinator"));
 
 		// 添加前几次同一会话的报告
-		String sessionId = state.value("session_id", String.class).orElse("__default__");
+		String sessionId = StateUtil.getSessionId(state);
 		List<SessionHistory> reports = sessionContextService.getRecentReports(sessionId);
 		Message lastReportMessage;
 		if (reports != null && !reports.isEmpty()) {

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/node/ProfessionalKbDecisionNode.java

@@ -17,6 +17,7 @@
 package com.alibaba.cloud.ai.example.deepresearch.node;
 
 import com.alibaba.cloud.ai.example.deepresearch.config.rag.RagProperties;
+import com.alibaba.cloud.ai.example.deepresearch.util.StateUtil;
 import com.alibaba.cloud.ai.graph.OverAllState;
 import com.alibaba.cloud.ai.graph.action.NodeAction;
 import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public ProfessionalKbDecisionNode(ChatClient chatClient, RagProperties ragProper
 	@Override
 	public Map<String, Object> apply(OverAllState state) throws Exception {
 		logger.info("Professional KB decision node is running.");
-		String query = state.value("query", "");
+		String query = StateUtil.getQuery(state);
 		Map<String, Object> updated = new HashMap<>();
 
 		// 如果没有启用专业知识库决策，直接返回不使用

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/node/RagNode.java

@@ -19,6 +19,7 @@
 import com.alibaba.cloud.ai.example.deepresearch.rag.core.HybridRagProcessor;
 import com.alibaba.cloud.ai.example.deepresearch.rag.strategy.FusionStrategy;
 import com.alibaba.cloud.ai.example.deepresearch.rag.strategy.RetrievalStrategy;
+import com.alibaba.cloud.ai.example.deepresearch.util.StateUtil;
 import com.alibaba.cloud.ai.graph.OverAllState;
 import com.alibaba.cloud.ai.graph.action.NodeAction;
 import com.alibaba.cloud.ai.graph.streaming.StreamingChatGenerator;
@@ -79,8 +80,7 @@ public RagNode(HybridRagProcessor hybridRagProcessor, ChatClient ragAgent) {
 	@Override
 	public Map<String, Object> apply(OverAllState state) throws Exception {
 		logger.info("rag_node is running.");
-		String queryText = state.value("query", String.class)
-			.orElseThrow(() -> new IllegalArgumentException("Query is missing from state"));
+		String queryText = StateUtil.getQuery(state);
 
 		Map<String, Object> options = new HashMap<>();
 		state.value("session_id", String.class).ifPresent(v -> options.put("session_id", v));

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/node/ReporterNode.java

@@ -71,10 +71,8 @@ public Map<String, Object> apply(OverAllState state) throws Exception {
 		logger.info("reporter node is running.");
 
 		// 从 OverAllState 中获取线程ID
-		String threadId = state.value("thread_id", String.class)
-			.orElseThrow(() -> new IllegalArgumentException("thread_id is missing from state"));
-		String sessionId = state.value("session_id", String.class)
-			.orElseThrow(() -> new IllegalArgumentException("session_id is missing from state"));
+		String threadId = StateUtil.getThreadId(state);
+		String sessionId = StateUtil.getSessionId(state);
 		logger.info("Thread ID from state: {}", threadId);
 		logger.info("Session ID from state: {}", sessionId);
 
@@ -93,8 +91,7 @@ public Map<String, Object> apply(OverAllState state) throws Exception {
 
 		// 添加深度研究信息
 		if (state.value("enable_deepresearch", true)) {
-			Plan currentPlan = state.value("current_plan", Plan.class)
-				.orElseThrow(() -> new IllegalArgumentException("current_plan is missing"));
+			Plan currentPlan = StateUtil.getPlan(state);
 
 			// 1.1 研究报告格式消息
 			messages.add(new UserMessage(

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/node/RewriteAndMultiQueryNode.java

@@ -72,7 +72,7 @@ public Map<String, Object> apply(OverAllState state) throws Exception {
 		Query rewriteQuery = queryTransformer.transform(query);
 
 		// 查询拓展
-		int optimizeQueryNum = state.value("optimize_query_num", 3);
+		int optimizeQueryNum = StateUtil.getOptimizeQueryNum(state);
 		optimizeQueryNum = Math.max(MinOptimizeQueryNum, Math.min(MaxOptimizeQueryNum, optimizeQueryNum));
 		QueryExpander queryExpander = MultiQueryExpander.builder()
 			.chatClientBuilder(rewriteAndMultiQueryAgentBuilder)

spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/util/StateUtil.java

@@ -18,16 +18,10 @@
 
 import com.alibaba.cloud.ai.example.deepresearch.model.dto.Plan;
 import com.alibaba.cloud.ai.graph.OverAllState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * @author yingzi
@@ -36,10 +30,6 @@
 
 public class StateUtil {
 
-	private static final Logger logger = LoggerFactory.getLogger(StateUtil.class);
-
-	private static final ExecutorService executor = Executors.newFixedThreadPool(10);
-
 	public static final String EXECUTION_STATUS_ASSIGNED_PREFIX = "assigned_";
 
 	public static final String EXECUTION_STATUS_PROCESSING_PREFIX = "processing_";
@@ -66,10 +56,6 @@ public static void handleStepError(Plan.Step step, String nodeName, Throwable er
 		logger.error("{} failed: {}", nodeName, error.getMessage(), error);
 	}
 
-	public static List<String> getMessagesByType(OverAllState state, String name) {
-		return state.value(name, List.class).map(obj -> new ArrayList<>((List<String>) obj)).orElseGet(ArrayList::new);
-	}
-
 	public static List<String> getParallelMessages(OverAllState state, List<String> researcherTeam, int count) {
 		List<String> resList = new ArrayList<>();
 
@@ -112,8 +98,16 @@ public static Integer getMaxStepNum(OverAllState state) {
 		return state.value("max_step_num", 3);
 	}
 
+	public static Integer getOptimizeQueryNum(OverAllState state) {
+		return state.value("optimize_query_num", 3);
+	}
+
 	public static String getThreadId(OverAllState state) {
-		return state.value("thread_id", "__default__");
+		return state.value("thread_id", "");
+	}
+
+	public static String getSessionId(OverAllState state) {
+		return state.value("session_id", "__default__");
 	}
 
 	public static boolean getAutoAcceptedPlan(OverAllState state) {
@@ -124,19 +118,12 @@ public static String getRagContent(OverAllState state) {
 		return state.value("rag_content", "");
 	}
 
-	/**
-	 * 获取MCP设置
-	 */
-	public static Map<String, Object> getMcpSettings(OverAllState state) {
-		return state.value("mcp_settings", Map.class).orElse(Collections.emptyMap());
+	public static boolean isSearchFilter(OverAllState state) {
+		return state.value("search_filter", true);
 	}
 
-	/**
-	 * 检查是否有运行时MCP配置
-	 */
-	public static boolean hasRuntimeMcpConfig(OverAllState state) {
-		Map<String, Object> mcpSettings = getMcpSettings(state);
-		return !mcpSettings.isEmpty();
+	public static boolean isDeepresearch(OverAllState state) {
+		return state.value("enable_deepresearch", true);
 	}
 
 }