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

Fix Anthropic issue using unsubscribed response body in exception message

Browse Source 
Signed-off-by: jitokim <pigberger70@gmail.com>
This commit is contained in:
jitokim
2024-11-10 02:43:16 +09:00
committed by Mark Pollack
parent a7a1804fac
commit fb2e7528d0
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java
View File

@@ -53,6 +53,7 @@ import org.springframework.web.reactive.function.client.WebClient;
* @author Christian Tzolov
* @author Mariusz Bernacki
* @author Thomas Vitale
* @author Jihoon Kim
* @since 1.0.0
*/
public class AnthropicApi {
@@ -143,8 +144,9 @@ public class AnthropicApi {
this.webClient = webClientBuilder.baseUrl(baseUrl)
.defaultHeaders(jsonContentHeaders)
.defaultStatusHandler(HttpStatusCode::isError,
resp -> Mono.just(new RuntimeException("Response exception, Status: [" + resp.statusCode()
+ "], Body:[" + resp.bodyToMono(java.lang.String.class) + "]")))
resp -> resp.bodyToMono(String.class)
.flatMap(it -> Mono.error(new RuntimeException(
"Response exception, Status: [" + resp.statusCode() + "], Body:[" + it + "]"))))
.build();
}

20
models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/api/AnthropicApiIT.java
View File

@@ -28,11 +28,12 @@ import org.springframework.ai.anthropic.api.AnthropicApi.ChatCompletionResponse;
import org.springframework.ai.anthropic.api.AnthropicApi.ContentBlock;
import org.springframework.ai.anthropic.api.AnthropicApi.Role;
import org.springframework.http.ResponseEntity;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Christian Tzolov
* @author Jihoon Kim
*/
@EnabledIfEnvironmentVariable(named = "ANTHROPIC_API_KEY", matches = ".+")
public class AnthropicApiIT {
@@ -70,4 +71,21 @@ public class AnthropicApiIT {
bla.stream().forEach(r -> System.out.println(r));
}
@Test
void chatCompletionStreamError() {
AnthropicMessage chatCompletionMessage = new AnthropicMessage(List.of(new ContentBlock("Tell me a Joke?")),
Role.USER);
AnthropicApi api = new AnthropicApi("FAKE_KEY_FOR_ERROR_RESPONSE");
Flux<ChatCompletionResponse> response = api.chatCompletionStream(new ChatCompletionRequest(
AnthropicApi.ChatModel.CLAUDE_3_OPUS.getValue(), List.of(chatCompletionMessage), null, 100, 0.8, true));
assertThat(response).isNotNull();
assertThatThrownBy(() -> response.collectList().block()).isInstanceOf(RuntimeException.class)
.hasMessageStartingWith("Response exception, Status: [")
.hasMessageContaining(
"{\"type\":\"error\",\"error\":{\"type\":\"authentication_error\",\"message\":\"invalid x-api-key\"}}");
}
}