fix(deepresearch): resolve conflicts (#1291)

* fix(deepresearch): recovering overwritten code

* fix(deepresearch): recovering overwritten code

* fix(deepresearch): format

Author: hbsjz-swl

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

@@ -19,6 +19,7 @@
 import com.alibaba.cloud.ai.example.deepresearch.config.PythonCoderProperties;
 import com.alibaba.cloud.ai.example.deepresearch.tool.PlannerTool;
 import com.alibaba.cloud.ai.example.deepresearch.tool.PythonReplTool;
+import com.alibaba.cloud.ai.example.deepresearch.util.ResourceUtil;
 import com.alibaba.cloud.ai.toolcalling.jinacrawler.JinaCrawlerConstants;
 import com.alibaba.cloud.ai.toolcalling.tavily.TavilySearchConstants;
 import org.springframework.ai.chat.client.ChatClient;
@@ -32,8 +33,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -77,32 +76,31 @@ private ToolCallback[] getMcpToolCallbacks(String agentName) {
 
 	/**
 	 * Create Research Agent ChatClient Bean
-	 * @param chatClientBuilder ChatClientBuilder McpAsyncClient and the locally configure
-	 * ToolCallbackProviders.
+	 * @param researchChatClientBuilder ChatClientBuilder McpAsyncClient and the locally
+	 * configure ToolCallbackProviders.
 	 * @return ChatClient
 	 */
 	@Bean
-	public ChatClient researchAgent(ChatClient.Builder chatClientBuilder) throws IOException {
+	public ChatClient researchAgent(ChatClient.Builder researchChatClientBuilder) {
 		ToolCallback[] mcpCallbacks = getMcpToolCallbacks("researchAgent");
 
-		return chatClientBuilder.defaultSystem(researcherPrompt.getContentAsString(Charset.defaultCharset()))
+		return researchChatClientBuilder.defaultSystem(ResourceUtil.loadResourceAsString(researcherPrompt))
 			.defaultToolNames(this.getAvailableTools(TavilySearchConstants.TOOL_NAME, JinaCrawlerConstants.TOOL_NAME))
 			.defaultToolCallbacks(mcpCallbacks)
 			.build();
 	}
 
 	/**
 	 * Create Coder Agent ChatClient Bean
-	 * @param chatClientBuilder ChatClientBuilder McpAsyncClient and the locally configure
-	 * ToolCallbackProviders.
+	 * @param coderChatClientBuilder ChatClientBuilder McpAsyncClient and the locally
+	 * configure ToolCallbackProviders.
 	 * @return ChatClient
 	 */
 	@Bean
-	public ChatClient coderAgent(ChatClient.Builder chatClientBuilder, PythonCoderProperties coderProperties)
-			throws IOException {
+	public ChatClient coderAgent(ChatClient.Builder coderChatClientBuilder, PythonCoderProperties coderProperties) {
 		ToolCallback[] mcpCallbacks = getMcpToolCallbacks("coderAgent");
 
-		return chatClientBuilder.defaultSystem(coderPrompt.getContentAsString(Charset.defaultCharset()))
+		return coderChatClientBuilder.defaultSystem(ResourceUtil.loadResourceAsString(coderPrompt))
 			.defaultTools(new PythonReplTool(coderProperties))
 			.defaultToolCallbacks(mcpCallbacks)
 			.build();