feat(deepresearch): conflicts

GTyingzi · GTyingzi · commit b3f4dd248da5 · 2025-06-09T22:46:43.000+08:00
diff --git a/spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/agents/AgentsConfiguration.java b/spring-ai-alibaba-deepresearch/src/main/java/com/alibaba/cloud/ai/example/deepresearch/agents/AgentsConfiguration.java
@@ -47,7 +47,7 @@ public class AgentsConfiguration {
 	public ChatClient researchAgent(ChatClient.Builder chatClientBuilder) {
 		return chatClientBuilder.defaultSystem(researcherPrompt.getContentAsString(Charset.defaultCharset()))
 			.defaultToolNames("tavilySearch")
-			// .defaultToolNames("tavilySearch", "firecrawlFunction")
+			// .defaultToolNames("tavilySearch", "firecrawlFunction") todo 待调整
 			.build();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public class AgentsConfiguration {`
`47`	`47`	`public ChatClient researchAgent(ChatClient.Builder chatClientBuilder) {`
`48`	`48`	`return chatClientBuilder.defaultSystem(researcherPrompt.getContentAsString(Charset.defaultCharset()))`
`49`	`49`	`.defaultToolNames("tavilySearch")`
`50`		`- // .defaultToolNames("tavilySearch", "firecrawlFunction")`
	`50`	`+ // .defaultToolNames("tavilySearch", "firecrawlFunction") todo 待调整`
`51`	`51`	`.build();`
`52`	`52`	`}`
`53`	`53`