Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Autowire WebClient.Builder into OllamaApi

Browse Source
This commit is contained in:
Craig Walls
2024-08-30 12:28:34 -06:00
committed by Mark Pollack
parent bf8dabfb11
commit 3cab5bd009
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApi.java
View File

@@ -100,7 +100,7 @@ public class OllamaApi {
* @param baseUrl The base url of the Ollama server.
*/
public OllamaApi(String baseUrl) {
this(baseUrl, RestClient.builder());
this(baseUrl, RestClient.builder(), WebClient.builder());
}
/**
@@ -109,7 +109,7 @@ public class OllamaApi {
* @param baseUrl The base url of the Ollama server.
* @param restClientBuilder The {@link RestClient.Builder} to use.
*/
public OllamaApi(String baseUrl, RestClient.Builder restClientBuilder) {
public OllamaApi(String baseUrl, RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder) {
this.responseErrorHandler = new OllamaResponseErrorHandler();
@@ -120,7 +120,7 @@ public class OllamaApi {
this.restClient = restClientBuilder.baseUrl(baseUrl).defaultHeaders(defaultHeaders).build();
this.webClient = WebClient.builder().baseUrl(baseUrl).defaultHeaders(defaultHeaders).build();
this.webClient = webClientBuilder.baseUrl(baseUrl).defaultHeaders(defaultHeaders).build();
}
// --------------------------------------------------------------------------

6
spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/ollama/OllamaAutoConfiguration.java
View File

@@ -37,6 +37,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestClient;
import org.springframework.web.reactive.function.client.WebClient;
/**
* {@link AutoConfiguration Auto-configuration} for Ollama Chat Client.
@@ -61,8 +62,9 @@ public class OllamaAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public OllamaApi ollamaApi(OllamaConnectionDetails connectionDetails, RestClient.Builder restClientBuilder) {
return new OllamaApi(connectionDetails.getBaseUrl(), restClientBuilder);
public OllamaApi ollamaApi(OllamaConnectionDetails connectionDetails, RestClient.Builder restClientBuilder,
WebClient.Builder webClientBuilder) {
return new OllamaApi(connectionDetails.getBaseUrl(), restClientBuilder, webClientBuilder);
}
@Bean