Skip to content

Handle HttpClientErrorException on getCollection method #1392

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

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Handle HttpClientErrorException on getCollection method #1392

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
33 changes: 27 additions & 6 deletions ...-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/chroma/ChromaApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
import org.springframework.http.client.support.BasicAuthenticationInterceptor;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestClient;

import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -49,6 +51,9 @@ public class ChromaApi {
// Regular expression pattern that looks for a message inside the ValueError(...).
private static Pattern VALUE_ERROR_PATTERN = Pattern.compile("ValueError\\('([^']*)'\\)");

// Regular expression pattern that looks for a message.
private static Pattern MESSAGE_ERROR_PATTERN = Pattern.compile("\"message\":\"(.*?)\"");

private RestClient restClient;

private final ObjectMapper objectMapper;
Expand Down Expand Up @@ -316,8 +321,8 @@ public Collection getCollection(String collectionName) {
.toEntity(Collection.class)
.getBody();
}
catch (HttpServerErrorException e) {
String msg = this.getValueErrorMessage(e.getMessage());
catch (HttpServerErrorException | HttpClientErrorException e) {
String msg = this.getErrorMessage(e);
if (String.format("Collection %s does not exist.", collectionName).equals(msg)) {
return null;
}
Expand Down Expand Up @@ -413,12 +418,28 @@ private void httpHeaders(HttpHeaders headers) {
}
}

private String getValueErrorMessage(String logString) {
if (!StringUtils.hasText(logString)) {
private String getErrorMessage(HttpStatusCodeException e) {
var errorMessage = e.getMessage();

// If the error message is empty or null, return an empty string
if (!StringUtils.hasText(errorMessage)) {
return "";
}
Matcher m = VALUE_ERROR_PATTERN.matcher(logString);
return (m.find()) ? m.group(1) : "";

// If the exception is an HttpServerErrorException, use the VALUE_ERROR_PATTERN
Matcher valueErrorMatcher = VALUE_ERROR_PATTERN.matcher(errorMessage);
if (e instanceof HttpServerErrorException && valueErrorMatcher.find()) {
return valueErrorMatcher.group(1);
}

// Otherwise, use the MESSAGE_ERROR_PATTERN for other cases
Matcher messageErrorMatcher = MESSAGE_ERROR_PATTERN.matcher(errorMessage);
if (messageErrorMatcher.find()) {
return messageErrorMatcher.group(1);
}

// If no pattern matches, return an empty string
return "";
}

}