From 2f26e42e67fc1abe504f088fa2bb354e8541801e Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Wed, 5 Feb 2025 21:03:50 +0100 Subject: [PATCH] align with last auto-conf changes --- .../ai/mcp/samples/brave/Application.java | 10 ++++------ model-context-protocol/brave-starter/pom.xml | 10 +++++----- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/model-context-protocol/brave-chatbot/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java b/model-context-protocol/brave-chatbot/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java index 01fcb50..37e8b36 100644 --- a/model-context-protocol/brave-chatbot/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java +++ b/model-context-protocol/brave-chatbot/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java @@ -1,12 +1,12 @@ package org.springframework.ai.mcp.samples.brave; +import java.util.List; import java.util.Scanner; -import org.springframework.ai.autoconfigure.mcp.client.stdio.McpClientDefinitions; import org.springframework.ai.chat.client.ChatClient; import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor; import org.springframework.ai.chat.memory.InMemoryChatMemory; -import org.springframework.ai.mcp.McpToolUtils; +import org.springframework.ai.tool.ToolCallback; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -20,15 +20,13 @@ public class Application { } @Bean - public CommandLineRunner chatbot(ChatClient.Builder chatClientBuilder, McpClientDefinitions mcpClientDefinitions) { + public CommandLineRunner chatbot(ChatClient.Builder chatClientBuilder, List tools) { return args -> { - var mcpClients = mcpClientDefinitions.toMcpSyncClients(); - var chatClient = chatClientBuilder .defaultSystem("You are useful assistant, expert in AI and Java.") - .defaultTools(McpToolUtils.getToolCallbacks(mcpClients)) + .defaultTools(tools) .defaultAdvisors(new MessageChatMemoryAdvisor(new InMemoryChatMemory())) .build(); diff --git a/model-context-protocol/brave-starter/pom.xml b/model-context-protocol/brave-starter/pom.xml index 41b75fa..8ca69f6 100644 --- a/model-context-protocol/brave-starter/pom.xml +++ b/model-context-protocol/brave-starter/pom.xml @@ -41,14 +41,14 @@ spring-ai-mcp-spring-boot-starter - org.springframework.ai - spring-ai-anthropic-spring-boot-starter + spring-ai-openai-spring-boot-starter + org.springframework.ai diff --git a/model-context-protocol/brave-starter/src/main/resources/application.properties b/model-context-protocol/brave-starter/src/main/resources/application.properties index 54799f9..ecb878b 100644 --- a/model-context-protocol/brave-starter/src/main/resources/application.properties +++ b/model-context-protocol/brave-starter/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=mcp spring.main.web-application-type=none -# spring.ai.openai.api-key=${OPENAI_API_KEY} +spring.ai.openai.api-key=${OPENAI_API_KEY} spring.ai.anthropic.api-key=${ANTHROPIC_API_KEY} spring.ai.mcp.client.stdio.enabled=true diff --git a/model-context-protocol/mcp-weather-server-quickstart/src/main/resources/application.properties b/model-context-protocol/mcp-weather-server-quickstart/src/main/resources/application.properties index 775406c..9a78228 100644 --- a/model-context-protocol/mcp-weather-server-quickstart/src/main/resources/application.properties +++ b/model-context-protocol/mcp-weather-server-quickstart/src/main/resources/application.properties @@ -7,7 +7,7 @@ logging.pattern.console= spring.ai.mcp.server.enabled=true -spring.ai.mcp.server.name=my-wather-server +spring.ai.mcp.server.name=my-weather-server spring.ai.mcp.server.version=0.0.1 logging.file.name=./model-context-protocol/mcp-weather-server-quickstart/target/mcp.weather-quickstart.log