A high-throughput and memory-efficient inference and serving engine for LLMs
Mirrored from https://github.com/tduncan-lum/Nvidia-Optimization-Stack---VLLM.git
Synced Nov 16, 20:45 UTC
[Bugfix] Convert image to RGB by default (#6430)
Cyrus Leung committed
Jul 15, 2024 at 13:39 UTC
de199163140974876d4416e936934ad621b2eb0c
1 file changed
+30
-10
vllm/multimodal/utils.py
+30
-10
@@ -35,8 +35,12 @@ def _load_image_from_data_url(image_url: str):
35
return load_image_from_base64(image_base64)
36
37
38
-def fetch_image(image_url: str) -> Image.Image:
39
- """Load PIL image from a url or base64 encoded openai GPT4V format"""
38
+def fetch_image(image_url: str, *, image_mode: str = "RGB") -> Image.Image:
39
+ """
40
+ Load a PIL image from a HTTP or base64 data URL.
41
+
42
+ By default, the image is converted into RGB format.
43
+ """
44
if image_url.startswith('http'):
45
_validate_remote_url(image_url, name="image_url")
46
@@ -53,7 +57,7 @@ def fetch_image(image_url: str) -> Image.Image:
57
raise ValueError("Invalid 'image_url': A valid 'image_url' must start "
58
"with either 'data:image' or 'http'.")
59
56
- return image
60
+ return image.convert(image_mode)
61
62
63
class ImageFetchAiohttp:
@@ -70,8 +74,17 @@ class ImageFetchAiohttp:
74
return cls.aiohttp_client
75
76
@classmethod
73
- async def fetch_image(cls, image_url: str) -> Image.Image:
74
- """Load PIL image from a url or base64 encoded openai GPT4V format"""
77
+ async def fetch_image(
78
+ cls,
79
+ image_url: str,
80
+ *,
81
+ image_mode: str = "RGB",
82
+ ) -> Image.Image:
83
+ """
84
+ Asynchronously load a PIL image from a HTTP or base64 data URL.
85
+
86
+ By default, the image is converted into RGB format.
87
+ """
88
89
if image_url.startswith('http'):
90
_validate_remote_url(image_url, name="image_url")
@@ -91,7 +104,7 @@ class ImageFetchAiohttp:
104
"Invalid 'image_url': A valid 'image_url' must start "
105
"with either 'data:image' or 'http'.")
106
94
- return image
107
+ return image.convert(image_mode)
108
109
110
async def async_get_and_parse_image(image_url: str) -> MultiModalDataDict:
@@ -99,12 +112,19 @@ async def async_get_and_parse_image(image_url: str) -> MultiModalDataDict:
112
return {"image": image}
113
114
102
-def encode_image_base64(image: Image.Image, format: str = 'JPEG') -> str:
103
- """Encode a pillow image to base64 format."""
115
+def encode_image_base64(
116
+ image: Image.Image,
117
+ *,
118
+ image_mode: str = "RGB",
119
+ format: str = "JPEG",
120
+) -> str:
121
+ """
122
+ Encode a pillow image to base64 format.
123
124
+ By default, the image is converted into RGB format before being encoded.
125
+ """
126
buffered = BytesIO()
106
- if format == 'JPEG':
107
- image = image.convert('RGB')
127
+ image = image.convert(image_mode)
128
image.save(buffered, format)
129
return base64.b64encode(buffered.getvalue()).decode('utf-8')
130