diff --git a/litellm/images/utils.py b/litellm/images/utils.py index 5bdb7a2da21..8f70f75e642 100644 --- a/litellm/images/utils.py +++ b/litellm/images/utils.py @@ -18,6 +18,8 @@ _JPEG_FIRST_SEGMENT_OFFSET: Final = 2 _JPEG_SOF_PAYLOAD_SIZE: Final = 5 _HEADER_READ_SIZE: Final = 32 _MIN_PNG_HEADER_SIZE: Final = 24 +_MIN_GIF_HEADER_SIZE: Final = 10 +_MIN_BMP_HEADER_SIZE: Final = 26 _MIN_WEBP_HEADER_SIZE: Final = 30 @@ -37,10 +39,26 @@ def _png_dimensions(head: bytes) -> tuple[int, int] | None: return width, height +def _gif_dimensions(head: bytes) -> tuple[int, int] | None: + if len(head) < _MIN_GIF_HEADER_SIZE: + return None + width: Final = int.from_bytes(head[6:8], "little") + height: Final = int.from_bytes(head[8:10], "little") + return width, height + + +def _bmp_dimensions(head: bytes) -> tuple[int, int] | None: + if len(head) < _MIN_BMP_HEADER_SIZE: + return None + width: Final = int.from_bytes(head[18:22], "little", signed=True) + height: Final = int.from_bytes(head[22:26], "little", signed=True) + return width, abs(height) + + def _webp_dimensions(head: bytes) -> tuple[int, int] | None: if len(head) < _MIN_WEBP_HEADER_SIZE: return None - match head[12:16]: + match head[12:16]: # pyright: ignore[reportMatchNotExhaustive] # unknown fourccs fall through to the None below case b"VP8X": return int.from_bytes(head[24:27], "little") + 1, int.from_bytes(head[27:30], "little") + 1 case b"VP8 ": @@ -85,6 +103,10 @@ def _header_dimensions(stream: IO[bytes], position: int) -> tuple[int, int] | No return _webp_dimensions(head) case "jpeg": return _jpeg_sof_dimensions(stream, position, _JPEG_FIRST_SEGMENT_OFFSET, _MAX_JPEG_SEGMENTS) + case "gif": + return _gif_dimensions(head) + if head[:2] == b"BM": + return _bmp_dimensions(head) return None diff --git a/tests/test_litellm/images/test_image_edit_utils.py b/tests/test_litellm/images/test_image_edit_utils.py index 45b31ee196b..2c644c6179e 100644 --- a/tests/test_litellm/images/test_image_edit_utils.py +++ b/tests/test_litellm/images/test_image_edit_utils.py @@ -86,16 +86,14 @@ JPEG_SOF2_MARKER: Final = 0xC2 PADDED_JPEG: Final = JPEG_SOI + b"\xff\xff" + _jpeg_sof_segment(JPEG_SOF0_MARKER, 320, 200) SHORT_LENGTH_JPEG: Final = JPEG_SOI + bytes((0xFF, JPEG_APP0, 0x00, 0x01)) TRUNCATED_SOF_JPEG: Final = JPEG_SOI + bytes((0xFF, JPEG_SOF0_MARKER, 0x00, 0x11, 0x08)) -SEGMENTS_63_JPEG: Final = JPEG_SOI + _jpeg_segment(JPEG_APP0, bytes(4)) * 63 + _jpeg_sof_segment( - JPEG_SOF0_MARKER, 320, 200 +SEGMENTS_63_JPEG: Final = ( + JPEG_SOI + _jpeg_segment(JPEG_APP0, bytes(4)) * 63 + _jpeg_sof_segment(JPEG_SOF0_MARKER, 320, 200) ) -SEGMENTS_65_JPEG: Final = JPEG_SOI + _jpeg_segment(JPEG_APP0, bytes(4)) * 65 + _jpeg_sof_segment( - JPEG_SOF0_MARKER, 320, 200 +SEGMENTS_65_JPEG: Final = ( + JPEG_SOI + _jpeg_segment(JPEG_APP0, bytes(4)) * 65 + _jpeg_sof_segment(JPEG_SOF0_MARKER, 320, 200) ) PROGRESSIVE_JPEG: Final = JPEG_SOI + _jpeg_sof_segment(JPEG_SOF2_MARKER, 111, 55) -DHT_JPEG: Final = JPEG_SOI + _jpeg_segment(JPEG_DHT, bytes(8)) + _jpeg_sof_segment( - JPEG_SOF0_MARKER, 400, 300 -) +DHT_JPEG: Final = JPEG_SOI + _jpeg_segment(JPEG_DHT, bytes(8)) + _jpeg_sof_segment(JPEG_SOF0_MARKER, 400, 300) VP8_BODY: Final = bytes(3) + b"\x9d\x01\x2a" + struct.pack(" bytes: + return version + struct.pack(" bytes: + return b"BM" + bytes(12) + struct.pack("