@@ -26,7 +26,6 @@ import org.springframework.ai.autoconfigure.ollama.OllamaAutoConfiguration
2626import org.springframework.ai.chat.messages.UserMessage
2727import org.springframework.ai.chat.prompt.Prompt
2828import org.springframework.ai.model.function.FunctionCallback
29- import org.springframework.ai.model.function.FunctionCallbackWrapper
3029import org.springframework.ai.model.function.FunctionCallingOptions
3130import org.springframework.ai.ollama.OllamaChatModel
3231import org.springframework.ai.ollama.api.OllamaModel
@@ -36,7 +35,7 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner
3635import org.springframework.context.annotation.Bean
3736import org.springframework.context.annotation.Configuration
3837
39- class FunctionCallbackWrapperKotlinIT : BaseOllamaIT () {
38+ class FunctionCallbackKotlinIT : BaseOllamaIT () {
4039
4140 companion object {
4241
@@ -49,7 +48,7 @@ class FunctionCallbackWrapperKotlinIT : BaseOllamaIT() {
4948 }
5049 }
5150
52- private val logger = LoggerFactory .getLogger(FunctionCallbackWrapperKotlinIT ::class .java)
51+ private val logger = LoggerFactory .getLogger(FunctionCallbackKotlinIT ::class .java)
5352
5453 private val contextRunner = ApplicationContextRunner ()
5554 .withPropertyValues(
@@ -106,13 +105,13 @@ class FunctionCallbackWrapperKotlinIT : BaseOllamaIT() {
106105
107106 @Bean
108107 open fun weatherFunctionInfo (): FunctionCallback {
109-
110- return FunctionCallbackWrapper .builder( MockKotlinWeatherService ())
111- .withName( " WeatherInfo " )
112- .withInputType( KotlinRequest :: class .java )
113- .withDescription(
114- " Find the weather conditions, forecasts, and temperatures for a location, like a city or state. " )
115- .build();
108+ return FunctionCallback .builder()
109+ .description(
110+ " Find the weather conditions, forecasts, and temperatures for a location, like a city or state. "
111+ )
112+ .function( " WeatherInfo " , MockKotlinWeatherService ())
113+ .inputType( KotlinRequest :: class .java )
114+ .build()
116115 }
117116
118117 }
0 commit comments