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

Fix a bug in MistralAiApi HTTP error message handling

Browse Source
This commit is contained in:
Christian Tzolov
2024-02-29 12:35:03 +01:00
parent a8110bb3da
commit 5552a118aa
2 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java
View File

@@ -17,6 +17,7 @@
package org.springframework.ai.mistralai.api;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
@@ -38,6 +39,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StreamUtils;
import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestClient;
import org.springframework.web.reactive.function.client.WebClient;
@@ -106,13 +108,12 @@ public class MistralAiApi {
@Override
public void handleError(ClientHttpResponse response) throws IOException {
if (response.getStatusCode().isError()) {
String error = StreamUtils.copyToString(response.getBody(), StandardCharsets.UTF_8);
String message = String.format("%s - %s", response.getStatusCode().value(), error);
if (response.getStatusCode().is4xxClientError()) {
throw new MistralAiApiClientErrorException(String.format("%s - %s",
response.getStatusCode().value(),
MistralAiApi.this.objectMapper.readValue(response.getBody(), ResponseError.class)));
throw new MistralAiApiClientErrorException(message);
}
throw new MistralAiApiException(String.format("%s - %s", response.getStatusCode().value(),
MistralAiApi.this.objectMapper.readValue(response.getBody(), ResponseError.class)));
throw new MistralAiApiException(message);
}
}
};
@@ -150,33 +151,6 @@ public class MistralAiApi {
}
/**
* API error response.
*
* @param error Error details.
*/
@JsonInclude(Include.NON_NULL)
public record ResponseError(@JsonProperty("error") Error error) {
/**
* Error details.
*
* @param message Error message.
* @param type Error type.
* @param param Error parameter.
* @param code Error code.
*/
@JsonInclude(Include.NON_NULL)
public record Error(
// @formatter:off
@JsonProperty("message") String message,
@JsonProperty("type") String type,
@JsonProperty("param") String param,
@JsonProperty("code") String code) {
// @formatter:on
}
}
/**
* Usage statistics.
*

3
models/spring-ai-mistral-ai/src/test/java/org/springframework/ai/mistralai/api/MistralAiApiIT.java
View File

@@ -22,14 +22,13 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import reactor.core.publisher.Flux;
import org.springframework.ai.mistralai.api.MistralAiApi;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletion;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionChunk;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionMessage;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionMessage.Role;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionRequest;
import org.springframework.ai.mistralai.api.MistralAiApi.Embedding;
import org.springframework.ai.mistralai.api.MistralAiApi.EmbeddingList;
import org.springframework.ai.mistralai.api.MistralAiApi.ChatCompletionMessage.Role;
import org.springframework.http.ResponseEntity;
import static org.assertj.core.api.Assertions.assertThat;