Add more admissible types for convert_image + corresponding tests

Author: benoit74

src/zimscraperlib/image/convertion.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 # vim: ai ts=4 sts=4 et sw=4 nu
 
+import io
 import pathlib
-from typing import Optional
+from typing import Union
 
 import PIL
 
@@ -13,7 +14,9 @@
 
 
 def convert_image(
-    src: pathlib.Path, dst: pathlib.Path, **params: Optional[dict]
+    src: Union[pathlib.Path, io.BytesIO],
+    dst: Union[pathlib.Path, io.BytesIO],
+    **params: str,
 ) -> None:
     """convert an image file from one format to another
     params: Image.save() parameters. Depends on dest format.

src/zimscraperlib/image/transformation.py

@@ -19,7 +19,7 @@ def resize_image(
     dst: Optional[Union[pathlib.Path, io.BytesIO]] = None,
     method: Optional[str] = "width",
     allow_upscaling: Optional[bool] = True,  # noqa: FBT002
-    **params: Optional[dict],
+    **params: str,
 ) -> None:
     """resize an image to requested dimensions
 

src/zimscraperlib/image/utils.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python
 # vim: ai ts=4 sts=4 et sw=4 nu
 
+import io
 import pathlib
-from typing import Optional
+from typing import Optional, Union
 
 from PIL import Image
 
 
 def save_image(
     src: Image,  # pyright: ignore
-    dst: pathlib.Path,
+    dst: Union[pathlib.Path, io.BytesIO],
     fmt: Optional[str] = None,
-    **params: Optional[dict],
+    **params: str,
 ) -> None:
     """PIL.Image.save() wrapper setting default parameters"""
     args = {"JPEG": {"quality": 100}, "PNG": {}}.get(fmt, {})  # pyright: ignore

tests/image/test_image.py

@@ -296,6 +296,30 @@ def test_change_image_format_defaults(png_image, tmp_path):
     assert dst_image.format == "WEBP"
 
 
+def test_convert_io_src_dst(png_image: pathlib.Path):
+    src = io.BytesIO(png_image.read_bytes())
+    dst = io.BytesIO()
+    convert_image(src, dst, fmt="PNG")
+    dst_image = Image.open(dst)
+    assert dst_image.format == "PNG"
+
+
+def test_convert_io_src_path_dst(png_image: pathlib.Path, tmp_path: pathlib.Path):
+    src = io.BytesIO(png_image.read_bytes())
+    dst = tmp_path / "test.png"
+    convert_image(src, dst, fmt="PNG")
+    dst_image = Image.open(dst)
+    assert dst_image.format == "PNG"
+
+
+def test_convert_path_src_io_dst(png_image: pathlib.Path):
+    src = png_image
+    dst = io.BytesIO()
+    convert_image(src, dst, fmt="PNG")
+    dst_image = Image.open(dst)
+    assert dst_image.format == "PNG"
+
+
 @pytest.mark.parametrize(
     "fmt,exp_size",
     [("png", 128), ("jpg", 128)],