Skip to content

Fix mutating global RestClient and WebClient builders #3020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix mutating global RestClient and WebClient builders #3020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,14 @@ private AnthropicApi(String baseUrl, String completionsPath, String anthropicApi

this.completionsPath = completionsPath;

this.restClient = restClientBuilder.baseUrl(baseUrl)
this.restClient = restClientBuilder.clone()
.baseUrl(baseUrl)
.defaultHeaders(jsonContentHeaders)
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = webClientBuilder.baseUrl(baseUrl)
this.webClient = webClientBuilder.clone()
.baseUrl(baseUrl)
.defaultHeaders(jsonContentHeaders)
.defaultStatusHandler(HttpStatusCode::isError,
resp -> resp.bodyToMono(String.class)
Expand Down
2 changes: 1 addition & 1 deletion models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/api/MiniMaxApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public MiniMaxApi(String baseUrl, String miniMaxToken, RestClient.Builder restCl
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = WebClient.builder()
this.webClient = WebClient.builder() // FIXME: use a bean instead
.baseUrl(baseUrl)
.defaultHeaders(authHeaders)
.build();
Expand Down
6 changes: 5 additions & 1 deletion ...spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,11 @@ public MistralAiApi(String baseUrl, String mistralAiApiKey, RestClient.Builder r
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = WebClient.builder().baseUrl(baseUrl).defaultHeaders(jsonContentHeaders).build();
this.webClient = WebClient.builder().baseUrl(baseUrl).defaultHeaders(jsonContentHeaders).build(); // FIXME:
// use
// a
// bean
// instead
}

/**
Expand Down
2 changes: 2 additions & 0 deletions models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,13 @@ private OllamaApi(String baseUrl, RestClient.Builder restClientBuilder, WebClien
};

this.restClient = restClientBuilder.baseUrl(baseUrl)
.clone()
.defaultHeaders(defaultHeaders)
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = webClientBuilder
.clone()
.baseUrl(baseUrl)
.defaultHeaders(defaultHeaders)
.build();
Expand Down
5 changes: 4 additions & 1 deletion models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,15 @@ public OpenAiApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String> he
h.setContentType(MediaType.APPLICATION_JSON);
h.addAll(headers);
};
this.restClient = restClientBuilder.baseUrl(baseUrl)
this.restClient = restClientBuilder
.clone()
.baseUrl(baseUrl)
.defaultHeaders(finalHeaders)
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = webClientBuilder
.clone()
.baseUrl(baseUrl)
.defaultHeaders(finalHeaders)
.build(); // @formatter:on
Expand Down
5 changes: 3 additions & 2 deletions models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiAudioApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,13 @@ public OpenAiAudioApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, Strin
// h.setContentType(MediaType.APPLICATION_JSON);
};

this.restClient = restClientBuilder.baseUrl(baseUrl)
this.restClient = restClientBuilder.clone()
.baseUrl(baseUrl)
.defaultHeaders(authHeaders)
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = webClientBuilder.baseUrl(baseUrl).defaultHeaders(authHeaders).build();
this.webClient = webClientBuilder.clone().baseUrl(baseUrl).defaultHeaders(authHeaders).build();
}

public static Builder builder() {
Expand Down
2 changes: 1 addition & 1 deletion models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public ZhiPuAiApi(String baseUrl, String zhiPuAiToken, RestClient.Builder restCl
.defaultStatusHandler(responseErrorHandler)
.build();

this.webClient = WebClient.builder()
this.webClient = WebClient.builder() // FIXME: use a builder instead
.baseUrl(baseUrl)
.defaultHeaders(authHeaders)
.build();
Expand Down
Loading