Skip to content

Add WebP support for Google GenAI and Vertex AI #6526

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

Open
jialiuyang wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

Add WebP support for Google GenAI and Vertex AI #6526

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions ...g-ai-google-genai/src/main/java/org/springframework/ai/google/genai/MimeTypeDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* <li>image/gif
* <li>image/png
* <li>image/jpeg
* <li>image/webp
* <li>video/mov
* <li>video/mpeg
* <li>video/mp4
Expand Down Expand Up @@ -109,6 +110,7 @@ public static MimeType getMimeType(String path) {
GEMINI_MIME_TYPES.put("jpeg", MimeTypeUtils.IMAGE_JPEG);
GEMINI_MIME_TYPES.put("jpg", MimeTypeUtils.IMAGE_JPEG);
GEMINI_MIME_TYPES.put("gif", MimeTypeUtils.IMAGE_GIF);
GEMINI_MIME_TYPES.put("webp", MimeTypeUtils.parseMimeType("image/webp"));
GEMINI_MIME_TYPES.put("mov", new MimeType("video", "mov"));
GEMINI_MIME_TYPES.put("mp4", new MimeType("video", "mp4"));
GEMINI_MIME_TYPES.put("mpg", new MimeType("video", "mpg"));
Expand Down
4 changes: 2 additions & 2 deletions ...google-genai/src/test/java/org/springframework/ai/google/genai/MimeTypeDetectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void getMimeTypeByStringWithInvalidInputShouldThrowException(String invalidPath)
}

@ParameterizedTest
@ValueSource(strings = { "JPG", "PNG", "GIF" })
@ValueSource(strings = { "JPG", "PNG", "GIF", "WEBP" })
void getMimeTypeByStringWithUppercaseExtensionsShouldWork(String uppercaseExt) {
String upperFileName = "test." + uppercaseExt;
String lowerFileName = "test." + uppercaseExt.toLowerCase();
Expand All @@ -118,7 +118,7 @@ void getMimeTypeByStringWithUppercaseExtensionsShouldWork(String uppercaseExt) {
}

@ParameterizedTest
@ValueSource(strings = { "test.jpg", "test.png", "test.gif" })
@ValueSource(strings = { "test.jpg", "test.png", "test.gif", "test.webp" })
void getMimeTypeSupportedFileAcrossDifferentMethodsShouldBeConsistent(String fileName) {
MimeType stringResult = MimeTypeDetector.getMimeType(fileName);
MimeType fileResult = MimeTypeDetector.getMimeType(new File(fileName));
Expand Down
3 changes: 2 additions & 1 deletion ...rg/springframework/ai/vertexai/embedding/multimodal/VertexAiMultimodalEmbeddingModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ public class VertexAiMultimodalEmbeddingModel implements DocumentEmbeddingModel
private static final MimeType VIDEO_MIME_TYPE = MimeTypeUtils.parseMimeType("video/*");

private static final List<MimeType> SUPPORTED_IMAGE_MIME_SUB_TYPES = List.of(MimeTypeUtils.IMAGE_JPEG,
MimeTypeUtils.IMAGE_GIF, MimeTypeUtils.IMAGE_PNG, MimeTypeUtils.parseMimeType("image/bmp"));
MimeTypeUtils.IMAGE_GIF, MimeTypeUtils.IMAGE_PNG, MimeTypeUtils.parseMimeType("image/bmp"),
MimeTypeUtils.parseMimeType("image/webp"));

private static final Map<String, Integer> KNOWN_EMBEDDING_DIMENSIONS = Stream
.of(VertexAiMultimodalEmbeddingModelName.values())
Expand Down