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

Make allow image url for Anthropic API

Browse Source 
Signed-off-by: jonghoonpark <dev@jonghoonpark.com>
This commit is contained in:
jonghoonpark
2025-04-21 17:38:09 +09:00
committed by Ilayaperumal Gopinathan
parent d7eb9bb32e
commit c6ccc1a4a3
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatModel.java
View File

@@ -88,6 +88,7 @@ import org.springframework.util.StringUtils;
* @author Thomas Vitale
* @author Claudio Silva Junior
* @author Alexandros Pappas
* @author Jonghoon Park
* @since 1.0.0
*/
public class AnthropicChatModel implements ChatModel {
@@ -355,6 +356,18 @@ public class AnthropicChatModel implements ChatModel {
.build();
}
private Source getSourceByMedia(Media media) {
String data = this.fromMediaData(media.getData());
// http is not allowed and redirect not allowed
if (data.startsWith("https://")) {
return new Source(data);
}
else {
return new Source(media.getMimeType().toString(), data);
}
}
private String fromMediaData(Object mediaData) {
if (mediaData instanceof byte[] bytes) {
return Base64.getEncoder().encodeToString(bytes);
@@ -455,8 +468,7 @@ public class AnthropicChatModel implements ChatModel {
if (!CollectionUtils.isEmpty(userMessage.getMedia())) {
List<ContentBlock> mediaContent = userMessage.getMedia().stream().map(media -> {
Type contentBlockType = getContentBlockTypeByMedia(media);
var source = new Source(media.getMimeType().toString(),
this.fromMediaData(media.getData()));
var source = getSourceByMedia(media);
return new ContentBlock(contentBlockType, source);
}).toList();
contents.addAll(mediaContent);

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

@@ -933,7 +933,8 @@ public class AnthropicApi {
// @formatter:off
@JsonProperty("type") String type,
@JsonProperty("media_type") String mediaType,
@JsonProperty("data") String data) {
@JsonProperty("data") String data,
@JsonProperty("url") String url) {
// @formatter:on
/**
@@ -942,7 +943,11 @@ public class AnthropicApi {
* @param data The content data.
*/
public Source(String mediaType, String data) {
this("base64", mediaType, data);
this("base64", mediaType, data, null);
}
public Source(String url) {
this("url", null, null, url);
}
}

8
models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/client/AnthropicChatClientIT.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 the original author or authors.
* Copyright 2023-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -301,14 +301,12 @@ class AnthropicChatClientIT {
assertThat(response).containsAnyOf("bananas", "apple", "bowl", "basket", "fruit stand");
}
@Disabled("Currently Anthropic API does not support external image URLs")
@ParameterizedTest(name = "{0} : {displayName} ")
@ValueSource(strings = { "claude-3-opus-latest", "claude-3-5-sonnet-latest", "claude-3-haiku-latest",
"claude-3-7-sonnet-latest" })
@ValueSource(strings = { "claude-3-opus-latest", "claude-3-5-sonnet-latest", "claude-3-7-sonnet-latest" })
void multiModalityImageUrl(String modelName) throws IOException {
// TODO: add url method that wrapps the checked exception.
URL url = new URL("https://docs.spring.io/spring-ai/reference/1.0.0-SNAPSHOT/_images/multimodal.test.png");
URL url = new URL("https://docs.spring.io/spring-ai/reference/_images/multimodal.test.png");
// @formatter:off
String response = ChatClient.create(this.chatModel).prompt()