sticker-convert 2.7.7__tar.gz → 2.7.8__tar.gz

{sticker-convert-2.7.7/src/sticker_convert.egg-info → sticker-convert-2.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.7
+Version: 2.7.8
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -367,13 +367,13 @@ License-File: LICENSE
 Requires-Dist: aiolimiter~=1.1.0
 Requires-Dist: anyio~=3.7.1
 Requires-Dist: apngasm_python~=1.2.3
-Requires-Dist: av~=11.0.0
+Requires-Dist: av~=12.0.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.3.6
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: numpy>=1.22.4
-Requires-Dist: Pillow~=10.2.0
+Requires-Dist: Pillow==10.1.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
@@ -592,7 +592,7 @@ Compression options:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
   --scale-filter SCALE_FILTER
-                        Set scale filter. Default as lanczos. Valid options are:
+                        Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
                         -box = Similar to nearest, but better downscaling
                         - bilinear = Linear interpolation

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/README.md

@@ -206,7 +206,7 @@ Compression options:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
   --scale-filter SCALE_FILTER
-                        Set scale filter. Default as lanczos. Valid options are:
+                        Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
                         -box = Similar to nearest, but better downscaling
                         - bilinear = Linear interpolation

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/requirements.txt

@@ -1,13 +1,13 @@
 aiolimiter~=1.1.0
 anyio~=3.7.1
 apngasm_python~=1.2.3
-av~=11.0.0
+av~=12.0.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.3.6
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
 numpy>=1.22.4
-Pillow~=10.2.0
+Pillow==10.1.0
 pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert/converter.py

@@ -6,10 +6,11 @@ from io import BytesIO
 from math import ceil, floor
 from pathlib import Path
 from queue import Queue
-from typing import TYPE_CHECKING, Any, List, Literal, Optional, Tuple, Union, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
 import numpy as np
 from PIL import Image
+from PIL import __version__ as PillowVersion
 
 from sticker_convert.job_option import CompOption
 from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
@@ -378,10 +379,10 @@ class StickerConvert:
                 self.frames_raw.append(np.asarray(im.convert("RGBA")))
 
     def _frames_import_pyav(self) -> None:
-        import av  # type: ignore
-        from av.codec.context import CodecContext  # type: ignore
-        from av.container.input import InputContainer  # type: ignore
-        from av.video.codeccontext import VideoCodecContext  # type: ignore
+        import av
+        from av.codec.context import CodecContext
+        from av.container.input import InputContainer
+        from av.video.codeccontext import VideoCodecContext
 
         # Crashes when handling some webm in yuv420p and convert to rgba
         # https://github.com/PyAV-Org/PyAV/issues/1166
@@ -390,16 +391,17 @@ class StickerConvert:
             file = self.in_f.as_posix()
         else:
             file = BytesIO(self.in_f)
-        with av.open(file) as container:  # type: ignore
+        with av.open(file) as container:
             container = cast(InputContainer, container)
             context = container.streams.video[0].codec_context
             if context.name == "vp8":
-                context = CodecContext.create("libvpx", "r")  # type: ignore
+                context = cast(VideoCodecContext, CodecContext.create("libvpx", "r"))
             elif context.name == "vp9":
-                context = CodecContext.create("libvpx-vp9", "r")  # type: ignore
-            context = cast(VideoCodecContext, context)
+                context = cast(
+                    VideoCodecContext, CodecContext.create("libvpx-vp9", "r")
+                )
 
-            for packet in container.demux(container.streams.video):  # type: ignore
+            for packet in container.demux(container.streams.video):
                 for frame in context.decode(packet):
                     if frame.width % 2 != 0:
                         width = frame.width - 1
@@ -410,22 +412,22 @@ class StickerConvert:
                     else:
                         height = frame.height
                     if frame.format.name == "yuv420p":
-                        rgb_array = frame.to_ndarray(format="rgb24")  # type: ignore
+                        rgb_array = frame.to_ndarray(format="rgb24")
                         cast("np.ndarray[Any, Any]", rgb_array)
                         rgba_array = np.dstack(
                             (
                                 rgb_array,
                                 np.zeros(rgb_array.shape[:2], dtype=np.uint8) + 255,
-                            )  # type: ignore
+                            )
                         )
                     else:
                         # yuva420p may cause crash
                         # https://github.com/laggykiller/sticker-convert/issues/114
-                        frame = frame.reformat(  # type: ignore
+                        frame = frame.reformat(
                             width=width,
                             height=height,
                             format="yuva420p",
-                            dst_colorspace=1,  # type: ignore
+                            dst_colorspace=1,
                         )
 
                         # https://stackoverflow.com/questions/72308308/converting-yuv-to-rgb-in-python-coefficients-work-with-array-dont-work-with-n
@@ -522,7 +524,7 @@ class StickerConvert:
         elif self.opt_comp.scale_filter == "lanczos":
             resample = Image.LANCZOS
         else:
-            resample = Image.LANCZOS
+            resample = Image.BICUBIC
 
         for frame in frames_in:
             with Image.fromarray(frame, "RGBA") as im:  # type: ignore
@@ -615,6 +617,8 @@ class StickerConvert:
                 self._frames_export_png()
         elif self.out_f.suffix == ".webp" and is_animated:
             self._frames_export_webp()
+        elif self.out_f.suffix == ".gif":
+            self._frames_export_gif()
         elif self.out_f.suffix in (".webm", ".mp4", ".mkv") or is_animated:
             self._frames_export_pyav()
         else:
@@ -629,22 +633,17 @@ class StickerConvert:
             )
 
     def _frames_export_pyav(self) -> None:
-        import av  # type: ignore
-        from av.container import OutputContainer  # type: ignore
-        from av.video.stream import VideoStream  # type: ignore
+        import av
+        from av.video.stream import VideoStream
 
-        options = {}
+        options: Dict[str, str] = {}
 
         if isinstance(self.quality, int):
             # Seems not actually working
             options["quality"] = str(self.quality)
             options["lossless"] = "0"
 
-        if self.out_f.suffix == ".gif":
-            codec = "gif"
-            pixel_format = "rgb8"
-            options["loop"] = "0"
-        elif self.out_f.suffix in (".apng", ".png"):
+        if self.out_f.suffix in (".apng", ".png"):
             codec = "apng"
             pixel_format = "rgba"
             options["plays"] = "0"
@@ -657,11 +656,10 @@ class StickerConvert:
             pixel_format = "yuv420p"
             options["loop"] = "0"
 
-        with av.open(  # type: ignore
+        with av.open(
             self.tmp_f, "w", format=self.out_f.suffix.replace(".", "")
         ) as output:
-            output = cast(OutputContainer, output)  # type: ignore
-            out_stream = output.add_stream(codec, rate=self.fps, options=options)  # type: ignore
+            out_stream = output.add_stream(codec, rate=self.fps, options=options)
             out_stream = cast(VideoStream, out_stream)
             assert isinstance(self.res_w, int) and isinstance(self.res_h, int)
             out_stream.width = self.res_w
@@ -669,12 +667,49 @@ class StickerConvert:
             out_stream.pix_fmt = pixel_format
 
             for frame in self.frames_processed:
-                av_frame = av.VideoFrame.from_ndarray(frame, format="rgba")  # type: ignore
-                for packet in out_stream.encode(av_frame):  # type: ignore
-                    output.mux(packet)  # type: ignore
-
-            for packet in out_stream.encode():  # type: ignore
-                output.mux(packet)  # type: ignore
+                av_frame = av.VideoFrame.from_ndarray(frame, format="rgba")
+                output.mux(out_stream.encode(av_frame))
+            output.mux(out_stream.encode())
+
+    def _frames_export_gif(self) -> None:
+        extra_kwargs: Dict[str, Any] = {}
+
+        # disposal=2 on gif cause flicker in image with transparency
+        # Occurs in Pillow == 10.2.0
+        # https://github.com/python-pillow/Pillow/issues/7787
+        if PillowVersion == "10.2.0":
+            extra_kwargs["optimize"] = False
+        else:
+            extra_kwargs["optimize"] = True
+
+        # Only enable transparency if all pixels have alpha channel
+        # with value of 0 or 255
+        alpha_channel_values = np.unique(np.array(self.frames_raw)[:, :, :, 3])
+        illegals = np.setxor1d(
+            alpha_channel_values, [0, 255]
+        )  # Find all values not 0 or 255
+        if illegals.size == 0:
+            extra_kwargs["transparency"] = 0
+            extra_kwargs["disposal"] = 2
+            im_out = [self.quantize(Image.fromarray(i)) for i in self.frames_processed]
+        else:
+            im_out = [
+                self.quantize(Image.fromarray(i).convert("RGB")).convert("RGB")
+                for i in self.frames_processed
+            ]
+
+        if self.fps:
+            extra_kwargs["save_all"] = True
+            extra_kwargs["append_images"] = im_out[1:]
+            extra_kwargs["duration"] = int(1000 / self.fps)
+            extra_kwargs["loop"] = 0
+
+        im_out[0].save(
+            self.tmp_f,
+            format="GIF",
+            quality=self.quality,
+            **extra_kwargs,
+        )
 
     def _frames_export_webp(self) -> None:
         import webp  # type: ignore

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert/job.py

@@ -29,7 +29,6 @@ from sticker_convert.utils.files.json_resources_loader import OUTPUT_JSON
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 
-CbQueueType = Queue[CbQueueItemType]
 WorkListItemType = Optional[Tuple[Callable[..., Any], Tuple[Any, ...]]]
 if TYPE_CHECKING:
     # mypy complains about this
@@ -59,7 +58,7 @@ class Executor:
         # Especially when using scale_filter=nearest
         self.work_list: WorkListType = self.manager.list()
         self.results_queue: Queue[Any] = self.manager.Queue()
-        self.cb_queue: CbQueueType = self.manager.Queue()
+        self.cb_queue: Queue[CbQueueItemType] = self.manager.Queue()
         self.cb_return = CallbackReturn()
         self.processes: List[Process] = []
 
@@ -76,7 +75,7 @@ class Executor:
 
     def cb_thread(
         self,
-        cb_queue: CbQueueType,
+        cb_queue: Queue[CbQueueItemType],
         cb_return: CallbackReturn,
     ) -> None:
         for i in iter(cb_queue.get, None):
@@ -113,7 +112,7 @@ class Executor:
     def worker(
         work_list: WorkListType,
         results_queue: Queue[Any],
-        cb_queue: CbQueueType,
+        cb_queue: Queue[CbQueueItemType],
         cb_return: CallbackReturn,
     ) -> None:
         while True:

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert/resources/compression.json

@@ -40,7 +40,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -85,7 +85,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -130,7 +130,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -175,7 +175,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -220,7 +220,7 @@
         },
         "steps": 16,
         "fake_vid": true,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -265,7 +265,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -310,7 +310,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -355,7 +355,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -400,7 +400,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -445,7 +445,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
@@ -490,7 +490,7 @@
         },
         "steps": 16,
         "fake_vid": false,
-        "scale_filter": "lanczos",
+        "scale_filter": "bicubic",
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     }

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert/resources/help.json

@@ -45,7 +45,7 @@
         "vid_format": "Set file format if input is animated.",
         "img_format": "Set file format if input is static.",
         "fake_vid": "Convert (faking) image to video.\nUseful if:\n(1) Size limit for video is larger than image;\n(2) Mix image and video into same pack.",
-        "scale_filter": "Set scale filter. Default as lanczos. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n-box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
+        "scale_filter": "Set scale filter. Default as bicubic. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n-box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
         "quantize_method": "Set method for quantizing image. Default as imagequant. Valid options are:\n- imagequant = Best quality but slow\n- fastoctree = Fast but image looks chunky\n- none = No image quantizing, large image size as result",
         "cache_dir": "Set custom cache directory.\nUseful for debugging, or speed up conversion if cache_dir is on RAM disk.",
         "default_emoji": "Set the default emoji for uploading Signal and Telegram sticker packs."

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert/utils/media/codec_info.py

@@ -230,8 +230,8 @@ class CodecInfo:
         frames_to_iterate: Optional[int] = None,
         frames_only: bool = False,
     ) -> Tuple[int, int]:
-        import av  # type: ignore
-        from av.container.input import InputContainer  # type: ignore
+        import av
+        from av.container.input import InputContainer
 
         # Getting fps and frame count from metadata is not reliable
         # Example: https://github.com/laggykiller/sticker-convert/issues/114
@@ -242,7 +242,7 @@ class CodecInfo:
         else:
             file_ref = BytesIO(file)
 
-        with av.open(file_ref) as container:  # type: ignore
+        with av.open(file_ref) as container:
             container = cast(InputContainer, container)
             stream = container.streams.video[0]
             if container.duration:
@@ -257,7 +257,7 @@ class CodecInfo:
 
             frame_count = 0
             last_frame = None
-            for frame_count, frame in enumerate(container.decode(stream)):  # type: ignore
+            for frame_count, frame in enumerate(container.decode(stream)):
                 if frames_to_iterate is not None and frame_count == frames_to_iterate:
                     break
                 last_frame = frame
@@ -310,11 +310,11 @@ class CodecInfo:
         if codec is not None:
             return codec.lower()
 
-        import av  # type: ignore
-        from av.error import InvalidDataError  # type: ignore
+        import av
+        from av.error import InvalidDataError
 
         try:
-            with av.open(file_ref) as container:  # type: ignore
+            with av.open(file_ref) as container:
                 return container.streams.video[0].codec_context.name.lower()
         except InvalidDataError:
             pass
@@ -354,7 +354,7 @@ class CodecInfo:
             else:
                 file_ref = BytesIO(file)
 
-            with av.open(file_ref) as container:  # type: ignore
+            with av.open(file_ref) as container:
                 stream = container.streams.video[0]
                 width = stream.width
                 height = stream.height

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "2.7.7"
+__version__ = "2.7.8"

{sticker-convert-2.7.7 → sticker-convert-2.7.8/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.7
+Version: 2.7.8
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -367,13 +367,13 @@ License-File: LICENSE
 Requires-Dist: aiolimiter~=1.1.0
 Requires-Dist: anyio~=3.7.1
 Requires-Dist: apngasm_python~=1.2.3
-Requires-Dist: av~=11.0.0
+Requires-Dist: av~=12.0.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.3.6
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: numpy>=1.22.4
-Requires-Dist: Pillow~=10.2.0
+Requires-Dist: Pillow==10.1.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
@@ -592,7 +592,7 @@ Compression options:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
   --scale-filter SCALE_FILTER
-                        Set scale filter. Default as lanczos. Valid options are:
+                        Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
                         -box = Similar to nearest, but better downscaling
                         - bilinear = Linear interpolation

{sticker-convert-2.7.7 → sticker-convert-2.7.8}/src/sticker_convert.egg-info/requires.txt

@@ -1,13 +1,13 @@
 aiolimiter~=1.1.0
 anyio~=3.7.1
 apngasm_python~=1.2.3
-av~=11.0.0
+av~=12.0.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.3.6
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
 numpy>=1.22.4
-Pillow~=10.2.0
+Pillow==10.1.0
 pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0