feat: enhance error handling in ChromaApi with detailed logging for not found exceptions

Signed-off-by: liugddx <[email protected]>

Author: liugddx

vector-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/chroma/vectorstore/ChromaApi.java

@@ -68,6 +68,9 @@ public static Builder builder() {
 	// Regular expression pattern that looks for a message.
 	private static final Pattern MESSAGE_ERROR_PATTERN = Pattern.compile("\"message\":\"(.*?)\"");
 
+	// Regular expression pattern that looks for NotFoundError in JSON error response.
+	private static final Pattern NOT_FOUND_ERROR_PATTERN = Pattern.compile("NotFoundError\\('([^']*)'\\)");
+
 	private static final String X_CHROMA_TOKEN_NAME = "x-chroma-token";
 
 	private final ObjectMapper objectMapper;
@@ -144,7 +147,13 @@ public Tenant getTenant(String tenantName) {
 		}
 		catch (HttpClientErrorException e) {
 			if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
-				logger.debug("Tenant [{}] does not exist, returning null", tenantName);
+				String errorMessage = this.getErrorMessage(e);
+				if (StringUtils.hasText(errorMessage)) {
+					logger.debug("Tenant [{}] does not exist: {}, returning null", tenantName, errorMessage);
+				}
+				else {
+					logger.debug("Tenant [{}] does not exist, returning null", tenantName);
+				}
 				return null;
 			}
 			throw new RuntimeException(this.getErrorMessage(e), e);
@@ -176,7 +185,15 @@ public Database getDatabase(String tenantName, String databaseName) {
 		}
 		catch (HttpClientErrorException e) {
 			if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
-				logger.debug("Database [{}] in tenant [{}] does not exist, returning null", databaseName, tenantName);
+				String errorMessage = this.getErrorMessage(e);
+				if (StringUtils.hasText(errorMessage)) {
+					logger.debug("Database [{}] in tenant [{}] does not exist: {}, returning null", databaseName,
+							tenantName, errorMessage);
+				}
+				else {
+					logger.debug("Database [{}] in tenant [{}] does not exist, returning null", databaseName,
+							tenantName);
+				}
 				return null;
 			}
 			throw new RuntimeException(this.getErrorMessage(e), e);
@@ -240,8 +257,16 @@ public Collection getCollection(String tenantName, String databaseName, String c
 		}
 		catch (HttpClientErrorException e) {
 			if (e.getStatusCode() == HttpStatus.NOT_FOUND) {
-				logger.debug("Collection [{}] in database [{}] and tenant [{}] does not exist, returning null",
-						collectionName, databaseName, tenantName);
+				String errorMessage = this.getErrorMessage(e);
+				if (StringUtils.hasText(errorMessage)) {
+					logger.debug(
+							"Collection [{}] in database [{}] and tenant [{}] does not exist: {}, returning null",
+							collectionName, databaseName, tenantName, errorMessage);
+				}
+				else {
+					logger.debug("Collection [{}] in database [{}] and tenant [{}] does not exist, returning null",
+							collectionName, databaseName, tenantName);
+				}
 				return null;
 			}
 			throw new RuntimeException(this.getErrorMessage(e), e);
@@ -343,6 +368,27 @@ private void httpHeaders(HttpHeaders headers) {
 	}
 
 	private String getErrorMessage(HttpStatusCodeException e) {
+		// First, try to parse the response body as JSON error response
+		String responseBody = e.getResponseBodyAsString();
+		if (StringUtils.hasText(responseBody)) {
+			try {
+				ErrorResponse errorResponse = this.objectMapper.readValue(responseBody, ErrorResponse.class);
+				if (errorResponse.error() != null) {
+					// Extract error message from NotFoundError('message') format
+					Matcher notFoundErrorMatcher = NOT_FOUND_ERROR_PATTERN.matcher(errorResponse.error());
+					if (notFoundErrorMatcher.find()) {
+						return notFoundErrorMatcher.group(1);
+					}
+					// Return the error as-is if it doesn't match NotFoundError pattern
+					return errorResponse.error();
+				}
+			}
+			catch (JsonProcessingException ex) {
+				// If JSON parsing fails, fall back to pattern matching on the response body
+				logger.debug("Failed to parse error response as JSON, falling back to pattern matching", ex);
+			}
+		}
+
 		var errorMessage = e.getMessage();
 
 		// If the error message is empty or null, return an empty string
@@ -638,6 +684,15 @@ private static class CollectionList extends ArrayList<Collection> {
 
 	}
 
+	/**
+	 * Chroma API error response.
+	 *
+	 * @param error The error message from Chroma API.
+	 */
+	@JsonInclude(JsonInclude.Include.NON_NULL)
+	private record ErrorResponse(@JsonProperty("error") String error) {
+	}
+
 	public static final class Builder {
 
 		private String baseUrl = ChromaApiConstants.DEFAULT_BASE_URL;