py-img-processor 1.2.0__tar.gz → 1.2.3__tar.gz

{py_img_processor-1.2.0/py_img_processor.egg-info → py_img_processor-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-img-processor
-Version: 1.2.0
+Version: 1.2.3
 Summary: Image editor using Python and Pillow.
 Home-page: https://github.com/SkylerHu/py-img-processor.git
 Author: SkylerHu
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: py-enum>=1.1.1
+Requires-Dist: py-enum>=2.1.1
 Requires-Dist: Pillow>=8
 
 # py-img-processor

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/__init__.py

@@ -5,7 +5,7 @@ import importlib
 
 
 __all__ = ["settings", "VERSION"]
-__version__ = "1.2.0"
+__version__ = "1.2.3"
 
 
 VERSION = __version__

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/__init__.py

@@ -17,16 +17,16 @@ from .watermark import WatermarkParser
 from .merge import MergeParser
 
 
-_ACTION_PARASER_MAP: dict[str, BaseParser] = {
-    enums.OpAction.RESIZE: ResizeParser,  # type: ignore
-    enums.OpAction.CROP: CropParser,  # type: ignore
-    enums.OpAction.CIRCLE: CircleParser,  # type: ignore
-    enums.OpAction.BLUR: BlurParser,  # type: ignore
-    enums.OpAction.ROTATE: RotateParser,  # type: ignore
-    enums.OpAction.ALPHA: AlphaParser,  # type: ignore
-    enums.OpAction.GRAY: GrayParser,  # type: ignore
-    enums.OpAction.WATERMARK: WatermarkParser,  # type: ignore
-    enums.OpAction.MERGE: MergeParser,  # type: ignore
+_ACTION_PARASER_MAP: dict[str, typing.Any] = {
+    enums.OpAction.RESIZE.value: ResizeParser,
+    enums.OpAction.CROP.value: CropParser,
+    enums.OpAction.CIRCLE.value: CircleParser,
+    enums.OpAction.BLUR.value: BlurParser,
+    enums.OpAction.ROTATE.value: RotateParser,
+    enums.OpAction.ALPHA.value: AlphaParser,
+    enums.OpAction.GRAY.value: GrayParser,
+    enums.OpAction.WATERMARK.value: WatermarkParser,
+    enums.OpAction.MERGE.value: MergeParser,
 }
 
 
@@ -77,7 +77,7 @@ class ProcessParams(object):
                 key, param_str = info
             if not key:
                 raise ParamParseException(f"参数必须指定操作类型 [{item}]不符合参数要求")
-            if key in [enums.OpAction.FORMAT, enums.OpAction.QUALITY, enums.OpAction.INTERLACE]:
+            if key in [enums.OpAction.FORMAT.value, enums.OpAction.QUALITY.value, enums.OpAction.INTERLACE.value]:
                 save_args.append(f"{key}_{param_str}")
             else:
                 action_cls = _ACTION_PARASER_MAP.get(key)

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/alpha.py

@@ -10,10 +10,10 @@ from .base import BaseParser, pre_processing
 
 class AlphaParser(BaseParser):
 
-    KEY = enums.OpAction.ALPHA
+    KEY = enums.OpAction.ALPHA.value
     ARGS = {
         # 不透明度, 为100时，完全不透明，即原图; 为0时，完全透明
-        "value": {"type": enums.ArgType.INTEGER, "default": 100, "min": 0, "max": 100},
+        "value": {"type": enums.ArgType.INTEGER.value, "default": 100, "min": 0, "max": 100},
     }
 
     def __init__(

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/base.py

@@ -7,9 +7,11 @@ import re
 import tempfile
 import urllib.parse
 from urllib.request import urlretrieve
+from contextlib import contextmanager
 
 from PIL import Image, ImageOps
 
+from py_enum import ChoiceEnum
 from imgprocessor import settings, enums, utils
 from imgprocessor.exceptions import ParamValidateException, ParamParseException, ProcessLimitException
 
@@ -67,21 +69,23 @@ class BaseParser(object):
             else:
                 value = kwargs.get(key)
                 try:
-                    if _type == enums.ArgType.INTEGER:
+                    if _type == enums.ArgType.INTEGER.value:
                         value = cls._validate_number(value, **config)
-                    elif _type == enums.ArgType.FLOAT:
+                    elif _type == enums.ArgType.FLOAT.value:
                         value = cls._validate_number(value, use_float=True, **config)
-                    elif _type == enums.ArgType.STRING:
+                    elif _type == enums.ArgType.STRING.value:
                         value = cls._validate_str(value, enable_base64=enable_base64, **config)
-                    elif _type == enums.ArgType.URI:
+                    elif _type == enums.ArgType.URI.value:
                         value = cls._validate_uri(value, enable_base64=enable_base64, **config)
-                    elif _type == enums.ArgType.ACTION:
+                    elif _type == enums.ArgType.ACTION.value:
                         if value and isinstance(value, str):
                             value = cls._validate_str(value, enable_base64=enable_base64, **config)
 
                     choices = config.get("choices")
+                    if isinstance(choices, ChoiceEnum):
+                        choices = choices.values
                     if choices and value not in choices:
-                        raise ParamValidateException(f"{key}枚举值只能是其中之一 {choices.values}")
+                        raise ParamValidateException(f"{key}枚举值只能是其中之一 {choices}")
                 except ParamValidateException as e:
                     raise ParamValidateException(f"参数 {key}={value} 不符合要求：{e}")
                 data[key] = value
@@ -241,23 +245,23 @@ def compute_by_geography(
     src_w: int, src_h: int, x: int, y: int, w: int, h: int, g: typing.Optional[str], pf: str
 ) -> tuple[int, int]:
     """计算 大小(w,h)的图像相对于(src_w, src_h)图像的原点(x,y)位置"""
-    if g == enums.Geography.NW:
+    if g == enums.Geography.NW.value:
         x, y = 0, 0
-    elif g == enums.Geography.NORTH:
+    elif g == enums.Geography.NORTH.value:
         x, y = int(src_w / 2 - w / 2), 0
-    elif g == enums.Geography.NE:
+    elif g == enums.Geography.NE.value:
         x, y = src_w - w, 0
-    elif g == enums.Geography.WEST:
+    elif g == enums.Geography.WEST.value:
         x, y = 0, int(src_h / 2 - h / 2)
-    elif g == enums.Geography.CENTER:
+    elif g == enums.Geography.CENTER.value:
         x, y = int(src_w / 2 - w / 2), int(src_h / 2 - h / 2)
-    elif g == enums.Geography.EAST:
+    elif g == enums.Geography.EAST.value:
         x, y = src_w - w, int(src_h / 2 - h / 2)
-    elif g == enums.Geography.SW:
+    elif g == enums.Geography.SW.value:
         x, y = 0, src_h - h
-    elif g == enums.Geography.SOUTH:
+    elif g == enums.Geography.SOUTH.value:
         x, y = int(src_w / 2 - w / 2), src_h - h
-    elif g == enums.Geography.SE:
+    elif g == enums.Geography.SE.value:
         x, y = src_w - w, src_h - h
     elif pf:
         if "x" in pf:
@@ -302,8 +306,8 @@ def compute_splice_two_im(
     h1: int,
     w2: int,
     h2: int,
-    align: int = enums.PositionAlign.VERTIAL_CENTER,  # type: ignore
-    order: int = enums.PositionOrder.BEFORE,  # type: ignore
+    align: int = enums.PositionAlign.VERTIAL_CENTER.value,
+    order: int = enums.PositionOrder.BEFORE.value,
     interval: int = 0,
 ) -> tuple:
     """拼接2个图像，计算整体大小和元素原点位置；数值单位都是像素
@@ -325,33 +329,37 @@ def compute_splice_two_im(
         第2个元素的原点位置x2
         第2个元素的原点位置y2
     """
-    if align in [enums.PositionAlign.TOP, enums.PositionAlign.HORIZONTAL_CENTER, enums.PositionAlign.BOTTOM]:
+    if align in [
+        enums.PositionAlign.TOP.value,
+        enums.PositionAlign.HORIZONTAL_CENTER.value,
+        enums.PositionAlign.BOTTOM.value,
+    ]:
         # 水平顺序
         # 计算整体占位大小w,h
         w, h = w1 + w2 + interval, max(h1, h2)
 
-        if align == enums.PositionAlign.TOP:
+        if align == enums.PositionAlign.TOP.value:
             y1, y2 = 0, 0
-        elif align == enums.PositionAlign.BOTTOM:
+        elif align == enums.PositionAlign.BOTTOM.value:
             y1, y2 = h - h1, h - h2
         else:
             y1, y2 = int((h - h1) / 2), int((h - h2) / 2)
 
-        if order == enums.PositionOrder.BEFORE:
+        if order == enums.PositionOrder.BEFORE.value:
             x1, x2 = 0, w1 + interval
         else:
             x1, x2 = w2 + interval, 0
     else:
         # 垂直
         w, h = max(w1, w2), h1 + h2 + interval
-        if align == enums.PositionAlign.LEFT:
+        if align == enums.PositionAlign.LEFT.value:
             x1, x2 = 0, 0
-        elif align == enums.PositionAlign.RIGHT:
+        elif align == enums.PositionAlign.RIGHT.value:
             x1, x2 = w - w1, w - w2
         else:
             x1, x2 = int((w - w1) / 2), int((w - w2) / 2)
 
-        if order == enums.PositionOrder.BEFORE:
+        if order == enums.PositionOrder.BEFORE.value:
             y1, y2 = 0, h1 + interval
         else:
             y1, y2 = h2 + interval, 0
@@ -369,11 +377,22 @@ def validate_ori_im(ori_im: Image) -> None:
         raise ProcessLimitException(f"图像总像素不可超过{settings.PROCESSOR_MAX_PIXEL}像素，输入图像({src_w}, {src_h})")
 
 
-def trans_uri_to_im(uri: str) -> Image:
+def copy_full_img(ori_im: Image) -> Image:
+    out_im = ori_im.copy()
+    # 复制格式信息
+    out_im.format = ori_im.format
+    # 复制info中的元数据（包括ICC配置文件等）
+    out_im.info = ori_im.info.copy()
+    return out_im
+
+
+@contextmanager
+def trans_uri_to_im(uri: str, use_copy: bool = False) -> typing.Generator:
     """将输入资源转换成Image对象
 
     Args:
         uri: 文件路径 或者 可下载的链接地址
+        use_copy: 是否复制图像，使其不依赖打开的文件
 
     Raises:
         ProcessLimitException: 处理图像大小/像素限制
@@ -392,27 +411,30 @@ def trans_uri_to_im(uri: str) -> Image:
             if size > settings.PROCESSOR_MAX_FILE_SIZE * 1024 * 1024:
                 raise ProcessLimitException(f"图像文件大小不得超过{settings.PROCESSOR_MAX_FILE_SIZE}MB")
 
-            ori_im = Image.open(fp)
-            validate_ori_im(ori_im)
-            # 解决临时文件close后im对象不能正常使用得问题
-            ori_im = ori_im.copy()
+            with Image.open(fp) as uri_im:
+                validate_ori_im(uri_im)
+                # 解决临时文件close后im对象不能正常使用得问题
+                ori_im = copy_full_img(uri_im)
+                yield ori_im
     else:
         size = os.path.getsize(uri)
         if size > settings.PROCESSOR_MAX_FILE_SIZE * 1024 * 1024:
             raise ProcessLimitException(f"图像文件大小不得超过{settings.PROCESSOR_MAX_FILE_SIZE}MB")
-        ori_im = Image.open(uri)
-        validate_ori_im(ori_im)
-
-    return ori_im
+        with Image.open(uri) as uri_im:
+            validate_ori_im(uri_im)
+            ori_im = uri_im
+            if use_copy:
+                ori_im = copy_full_img(ori_im)
+            yield ori_im
 
 
 class ImgSaveParser(BaseParser):
     KEY = ""
     ARGS = {
-        "format": {"type": enums.ArgType.STRING, "default": None},
-        "quality": {"type": enums.ArgType.INTEGER, "default": None, "min": 1, "max": 100},
+        "format": {"type": enums.ArgType.STRING.value, "default": None},
+        "quality": {"type": enums.ArgType.INTEGER.value, "default": None, "min": 1, "max": 100},
         # 1 表示将原图设置成渐进显示
-        "interlace": {"type": enums.ArgType.INTEGER, "default": 0, "choices": [0, 1]},
+        "interlace": {"type": enums.ArgType.INTEGER.value, "default": 0, "choices": [0, 1]},
     }
 
     def __init__(

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/blur.py

@@ -10,10 +10,10 @@ from .base import BaseParser, pre_processing
 
 class BlurParser(BaseParser):
 
-    KEY = enums.OpAction.BLUR
+    KEY = enums.OpAction.BLUR.value
     ARGS = {
         # 模糊半径，值越大，图片越模糊
-        "r": {"type": enums.ArgType.INTEGER, "required": True, "min": 1, "max": 50},
+        "r": {"type": enums.ArgType.INTEGER.value, "required": True, "min": 1, "max": 50},
     }
 
     def __init__(

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/circle.py

@@ -10,9 +10,9 @@ from .base import BaseParser, pre_processing
 
 class CircleParser(BaseParser):
 
-    KEY = enums.OpAction.CIRCLE
+    KEY = enums.OpAction.CIRCLE.value
     ARGS = {
-        "r": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "r": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
     }
 
     def __init__(

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/crop.py

@@ -9,20 +9,20 @@ from .base import BaseParser, pre_processing, compute_by_geography, compute_by_r
 
 class CropParser(BaseParser):
 
-    KEY = enums.OpAction.CROP
+    KEY = enums.OpAction.CROP.value
     ARGS = {
-        "w": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
-        "h": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
-        "ratio": {"type": enums.ArgType.STRING, "regex": r"^\d+:\d+$"},
-        "x": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
-        "y": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
-        "g": {"type": enums.ArgType.STRING, "choices": enums.Geography},
+        "w": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "h": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "ratio": {"type": enums.ArgType.STRING.value, "regex": r"^\d+:\d+$"},
+        "x": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "y": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "g": {"type": enums.ArgType.STRING.value, "choices": enums.Geography},
         # percent field, eg: xywh
-        "pf": {"type": enums.ArgType.STRING, "default": ""},
+        "pf": {"type": enums.ArgType.STRING.value, "default": ""},
         # padding right
-        "padr": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "padr": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
         # padding bottom
-        "padb": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "padb": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
         # 左和上通过x,y控制
     }
 

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/gray.py

@@ -10,7 +10,7 @@ from .base import BaseParser
 
 class GrayParser(BaseParser):
 
-    KEY = enums.OpAction.GRAY
+    KEY = enums.OpAction.GRAY.value
     ARGS = {}
 
     def __init__(

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/merge.py

@@ -6,33 +6,43 @@ from PIL import Image
 
 from imgprocessor import enums, settings
 from imgprocessor.exceptions import ParamValidateException
-from .base import BaseParser, pre_processing, compute_by_geography, compute_splice_two_im, trans_uri_to_im
+from .base import (
+    BaseParser,
+    pre_processing,
+    compute_by_geography,
+    compute_splice_two_im,
+    trans_uri_to_im,
+)
 
 
 class MergeParser(BaseParser):
 
-    KEY = enums.OpAction.MERGE
+    KEY = enums.OpAction.MERGE.value
     ARGS = {
         # 要处理的图片
-        "image": {"type": enums.ArgType.URI, "required": True, "base64_encode": True},
+        "image": {"type": enums.ArgType.URI.value, "required": True, "base64_encode": True},
         # 对image的处理参数
-        "actions": {"type": enums.ArgType.ACTION, "base64_encode": True},
-        # 使用输入图像的大小作为参照进行缩放
-        "p": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": 1000},
+        "actions": {"type": enums.ArgType.ACTION.value, "base64_encode": True},
         # 是否将imgae当做背景放在输入图像之下; 定义输入图像和image参数的拼接顺序
-        "bg": {"type": enums.ArgType.INTEGER, "default": 0, "choices": [0, 1]},
+        "bg": {"type": enums.ArgType.INTEGER.value, "default": 0, "choices": [0, 1]},
+        # 使用输入图像的大小作为参照进行缩放,bg=1按照image缩放输入图像
+        "p": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": 1000},
         # 对齐方式
-        "order": {"type": enums.ArgType.INTEGER, "choices": enums.PositionOrder},
-        "align": {"type": enums.ArgType.INTEGER, "default": enums.PositionAlign.BOTTOM, "choices": enums.PositionAlign},
-        "interval": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 1000},
+        "order": {"type": enums.ArgType.INTEGER.value, "choices": enums.PositionOrder},
+        "align": {
+            "type": enums.ArgType.INTEGER.value,
+            "default": enums.PositionAlign.BOTTOM.value,
+            "choices": enums.PositionAlign,
+        },
+        "interval": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 1000},
         # 粘贴的位置
-        "g": {"type": enums.ArgType.STRING, "choices": enums.Geography},
-        "x": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
-        "y": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
-        "pf": {"type": enums.ArgType.STRING, "default": ""},
+        "g": {"type": enums.ArgType.STRING.value, "choices": enums.Geography},
+        "x": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "y": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "pf": {"type": enums.ArgType.STRING.value, "default": ""},
         # 拼接后大小包含2个图像，空白区域使用color颜色填充
         "color": {
-            "type": enums.ArgType.STRING,
+            "type": enums.ArgType.STRING.value,
             "default": "0000",  # 为了保证透明背景
             "regex": r"^([0-9a-fA-F]{6}|[0-9a-fA-F]{8}|[0-9a-fA-F]{3,4})$",
         },
@@ -80,7 +90,7 @@ class MergeParser(BaseParser):
                 raise ParamValidateException(f"merage操作中actions参数校验异常，其中 {e}")
 
     def compute(self, src_w: int, src_h: int, w2: int, h2: int) -> tuple:
-        if self.order in enums.PositionOrder:  # type: ignore
+        if self.order in enums.PositionOrder:
             order = typing.cast(int, self.order)
             w, h, x1, y1, x2, y2 = compute_splice_two_im(
                 src_w,
@@ -107,23 +117,26 @@ class MergeParser(BaseParser):
 
     def do_action(self, im: Image) -> Image:
         im = pre_processing(im, use_alpha=True)
-        src_w, src_h = im.size
 
         # 处理要合并的图像
-        im2 = trans_uri_to_im(self.image)
-        im2 = pre_processing(im2, use_alpha=True)
+        with trans_uri_to_im(self.image, use_copy=True) as _im2:
+            im2 = pre_processing(_im2, use_alpha=True)
+
         if self.actions:
             from imgprocessor.processor import ProcessorCtr
 
             im2 = ProcessorCtr.handle_img_actions(im2, self.actions)
-        if self.p:
-            w2, h2 = round(src_w * self.p / 100), round(src_h * self.p / 100)
-            im2 = im2.resize((w2, h2), resample=Image.LANCZOS)
 
+        # 调整拼接顺序
         if self.bg:
-            # 调整拼接顺序
             im, im2 = im2, im
 
+        # 缩放图像
+        if self.p:
+            src_w, src_h = im.size
+            w2, h2 = round(src_w * self.p / 100), round(src_h * self.p / 100)
+            im2 = im2.resize((w2, h2), resample=Image.LANCZOS)
+
         src_w, src_h = im.size
         w2, h2 = im2.size
 

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/resize.py

@@ -10,25 +10,29 @@ from .base import BaseParser, pre_processing
 
 class ResizeParser(BaseParser):
 
-    KEY = enums.OpAction.RESIZE
+    KEY = enums.OpAction.RESIZE.value
     ARGS = {
-        "m": {"type": enums.ArgType.STRING, "default": enums.ResizeMode.LFIT, "choices": enums.ResizeMode},
-        "w": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
-        "h": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
-        "l": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
-        "s": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
-        "limit": {"type": enums.ArgType.INTEGER, "default": 1, "choices": [0, 1]},
+        "m": {
+            "type": enums.ArgType.STRING.value,
+            "default": enums.ResizeMode.LFIT.value,
+            "choices": enums.ResizeMode,
+        },
+        "w": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "h": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "l": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "s": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "limit": {"type": enums.ArgType.INTEGER.value, "default": 1, "choices": [0, 1]},
         "color": {
-            "type": enums.ArgType.STRING,
+            "type": enums.ArgType.STRING.value,
             "default": "FFFFFF",  # 默认白色
             "regex": r"^([0-9a-fA-F]{6}|[0-9a-fA-F]{8}|[0-9a-fA-F]{3,4})$",
         },
-        "p": {"type": enums.ArgType.INTEGER, "default": 0, "min": 1, "max": 1000},
+        "p": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 1, "max": 1000},
     }
 
     def __init__(
         self,
-        m: str = enums.ResizeMode.LFIT,  # type: ignore
+        m: str = enums.ResizeMode.LFIT.value,
         w: int = 0,
         h: int = 0,
         l: int = 0,  # noqa: E741
@@ -50,13 +54,13 @@ class ResizeParser(BaseParser):
     def compute(self, src_w: int, src_h: int) -> tuple:
         """计算出`Image.resize`需要的参数"""
         if self.w or self.h:
-            if self.m in [enums.ResizeMode.FIXED, enums.ResizeMode.PAD, enums.ResizeMode.FIT]:
+            if self.m in [enums.ResizeMode.FIXED.value, enums.ResizeMode.PAD.value, enums.ResizeMode.FIT.value]:
                 # 有可能改变原图宽高比
                 if not (self.w and self.h):
                     raise ParamValidateException(f"当m={self.m}的模式下，参数w和h都必不可少且不能为0")
                 # w,h按指定的即可，无需计算
                 w, h = self.w, self.h
-            elif self.m == enums.ResizeMode.MFIT:
+            elif self.m == enums.ResizeMode.MFIT.value:
                 # 低版本Pillow未实现 ImageOps.cover 方法，自行处理
                 # 等比缩放
                 if self.w and self.h:
@@ -70,7 +74,7 @@ class ResizeParser(BaseParser):
                 else:
                     w, h = round(self.h * src_w / src_h), self.h
             else:
-                # 默认 enums.ResizeMode.LFIT
+                # 默认 enums.ResizeMode.LFIT.value
                 # 等比缩放
                 if self.w and self.h:
                     # 指定w与h的矩形内的最大图像
@@ -114,9 +118,9 @@ class ResizeParser(BaseParser):
         if size == im.size:
             # 大小没有变化直接返回
             return im
-        if self.m == enums.ResizeMode.PAD:
+        if self.m == enums.ResizeMode.PAD.value:
             out = ImageOps.pad(im, size, color=f"#{self.color}")
-        elif self.m == enums.ResizeMode.FIT:
+        elif self.m == enums.ResizeMode.FIT.value:
             out = ImageOps.fit(im, size)
         else:
             out = im.resize(size, resample=Image.LANCZOS)

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/rotate.py

@@ -10,10 +10,10 @@ from .base import BaseParser, pre_processing
 
 class RotateParser(BaseParser):
 
-    KEY = enums.OpAction.ROTATE
+    KEY = enums.OpAction.ROTATE.value
     ARGS = {
         # 顺时针旋转的度数
-        "value": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 360},
+        "value": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 360},
     }
 
     def __init__(

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/parsers/watermark.py

@@ -6,45 +6,63 @@ from PIL import Image, ImageFont, ImageDraw
 
 from imgprocessor import enums, settings, utils
 from imgprocessor.exceptions import ParamValidateException
-from .base import BaseParser, pre_processing, compute_splice_two_im, compute_by_geography, trans_uri_to_im
+from .base import (
+    BaseParser,
+    pre_processing,
+    compute_splice_two_im,
+    compute_by_geography,
+    trans_uri_to_im,
+)
 
 
 class WatermarkParser(BaseParser):
 
-    KEY = enums.OpAction.WATERMARK
+    KEY = enums.OpAction.WATERMARK.value
     ARGS = {
         # 水印本身的不透明度，100表示完全不透明
-        "t": {"type": enums.ArgType.INTEGER, "default": 100, "min": 0, "max": 100},
-        "g": {"type": enums.ArgType.STRING, "choices": enums.Geography},
-        "x": {"type": enums.ArgType.INTEGER, "default": 10, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
-        "y": {"type": enums.ArgType.INTEGER, "default": 10, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "t": {"type": enums.ArgType.INTEGER.value, "default": 100, "min": 0, "max": 100},
+        "g": {"type": enums.ArgType.STRING.value, "choices": enums.Geography},
+        "x": {"type": enums.ArgType.INTEGER.value, "default": 10, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
+        "y": {"type": enums.ArgType.INTEGER.value, "default": 10, "min": 0, "max": settings.PROCESSOR_MAX_W_H},
         # percent field, eg: xy
-        "pf": {"type": enums.ArgType.STRING, "default": ""},
+        "pf": {"type": enums.ArgType.STRING.value, "default": ""},
         # 是否将图片水印或文字水印铺满原图; 值为1开启
-        "fill": {"type": enums.ArgType.INTEGER, "default": 0, "choices": [0, 1]},
-        "padx": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 4096},
-        "pady": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 4096},
+        "fill": {"type": enums.ArgType.INTEGER.value, "default": 0, "choices": [0, 1]},
+        "padx": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 4096},
+        "pady": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 4096},
         # 图片水印路径
-        "image": {"type": enums.ArgType.URI, "base64_encode": True},
+        "image": {"type": enums.ArgType.URI.value, "base64_encode": True},
         # 水印的原始设计参照尺寸，会根据原图大小缩放水印
-        "design": {"type": enums.ArgType.INTEGER, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
+        "design": {"type": enums.ArgType.INTEGER.value, "min": 1, "max": settings.PROCESSOR_MAX_W_H},
         # 文字
-        "text": {"type": enums.ArgType.STRING, "base64_encode": True, "max_length": 64},
-        "font": {"type": enums.ArgType.STRING, "base64_encode": True},
+        "text": {"type": enums.ArgType.STRING.value, "base64_encode": True, "max_length": 64},
+        "font": {"type": enums.ArgType.STRING.value, "base64_encode": True},
         # 文字默认黑色
-        "color": {"type": enums.ArgType.STRING, "default": "000000", "regex": "^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$"},
-        "size": {"type": enums.ArgType.INTEGER, "default": 40, "min": 1, "max": 1000},
+        "color": {
+            "type": enums.ArgType.STRING.value,
+            "default": "000000",
+            "regex": "^([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$",
+        },
+        "size": {"type": enums.ArgType.INTEGER.value, "default": 40, "min": 1, "max": 1000},
         # 文字水印的阴影透明度, 0表示没有阴影
-        "shadow": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 100},
+        "shadow": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 100},
         # 顺时针旋转角度
-        "rotate": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 360},
+        "rotate": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 360},
         # 图文混合水印参数
         # 文字和图片水印的前后顺序; 0表示图片水印在前；1表示文字水印在前
-        "order": {"type": enums.ArgType.INTEGER, "default": enums.PositionOrder.BEFORE, "choices": enums.PositionOrder},
+        "order": {
+            "type": enums.ArgType.INTEGER.value,
+            "default": enums.PositionOrder.BEFORE.value,
+            "choices": enums.PositionOrder,
+        },
         # 文字水印和图片水印的对齐方式; 0表示文字水印和图片水印上对齐; 1表示文字水印和图片水印中对齐; 2: 表示文字水印和图片水印下对齐
-        "align": {"type": enums.ArgType.INTEGER, "default": enums.PositionAlign.BOTTOM, "choices": enums.PositionAlign},
+        "align": {
+            "type": enums.ArgType.INTEGER.value,
+            "default": enums.PositionAlign.BOTTOM.value,
+            "choices": enums.PositionAlign,
+        },
         # 文字水印和图片水印间的间距
-        "interval": {"type": enums.ArgType.INTEGER, "default": 0, "min": 0, "max": 1000},
+        "interval": {"type": enums.ArgType.INTEGER.value, "default": 0, "min": 0, "max": 1000},
     }
 
     def __init__(
@@ -100,8 +118,8 @@ class WatermarkParser(BaseParser):
         w1, h1, w2, h2 = 0, 0, 0, 0
         icon = None
         if self.image:
-            icon = trans_uri_to_im(self.image)
-            icon = pre_processing(icon, use_alpha=True)
+            with trans_uri_to_im(self.image, use_copy=True) as _icon:
+                icon = pre_processing(_icon, use_alpha=True)
             if not self.text:
                 # 没有文字，直接返回
                 return icon

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/imgprocessor/processor.py

@@ -27,12 +27,12 @@ class ProcessorCtr(object):
 
     def run(self) -> typing.Optional[typing.ByteString]:
         # 初始化输入
-        ori_im = trans_uri_to_im(self.input_uri)
-        # 处理图像
-        im = self.handle_img_actions(ori_im, self.params.actions)
-        # 输出、保存
-        kwargs = self.params.save_parser.compute(ori_im, im)
-        return self.save_img_to_file(im, out_path=self.out_path, **kwargs)
+        with trans_uri_to_im(self.input_uri) as ori_im:
+            # 处理图像
+            im = self.handle_img_actions(ori_im, self.params.actions)
+            # 输出、保存
+            kwargs = self.params.save_parser.compute(ori_im, im)
+            return self.save_img_to_file(im, out_path=self.out_path, **kwargs)
 
     @classmethod
     def handle_img_actions(cls, ori_im: Image, actions: list[BaseParser]) -> Image:
@@ -51,13 +51,12 @@ class ProcessorCtr(object):
         **kwargs: typing.Any,
     ) -> typing.Optional[typing.ByteString]:
         fmt = kwargs.get("format") or im.format
-        kwargs["format"] = fmt
 
-        if fmt.upper() == enums.ImageFormat.JPEG and im.mode == "RGBA":
+        if fmt and fmt.upper() == enums.ImageFormat.JPEG.value and im.mode == "RGBA":
             im = im.convert("RGB")
 
         if not kwargs.get("quality"):
-            if fmt.upper() == enums.ImageFormat.JPEG and im.format == enums.ImageFormat.JPEG:
+            if fmt and fmt.upper() == enums.ImageFormat.JPEG.value and im.format == enums.ImageFormat.JPEG.value:
                 kwargs["quality"] = "keep"
             else:
                 kwargs["quality"] = settings.PROCESSOR_DEFAULT_QUALITY
@@ -107,20 +106,20 @@ def extract_main_color(img_path: str, delta_h: float = 0.3) -> str:
         颜色值，eg: FFFFFF
     """
     r, g, b = 0, 0, 0
-    im = Image.open(img_path)
-    if im.mode != "RGB":
-        im = im.convert("RGB")
-    # 转换成HSV即 色相(Hue)、饱和度(Saturation)、明度(alue)，取值范围[0,1]
-    # 取H计算平均色相
-    all_h = [colorsys.rgb_to_hsv(*im.getpixel((x, y)))[0] for x in range(im.size[0]) for y in range(im.size[1])]
-    avg_h = sum(all_h) / (im.size[0] * im.size[1])
-    # 取与平均色相相近的像素色值rgb用于计算，像素值取值范围[0,255]
-    beyond = list(
-        filter(
-            lambda x: abs(colorsys.rgb_to_hsv(*x)[0] - avg_h) < delta_h,
-            [im.getpixel((x, y)) for x in range(im.size[0]) for y in range(im.size[1])],
+    with Image.open(img_path) as im:
+        if im.mode != "RGB":
+            im = im.convert("RGB")
+        # 转换成HSV即 色相(Hue)、饱和度(Saturation)、明度(alue)，取值范围[0,1]
+        # 取H计算平均色相
+        all_h = [colorsys.rgb_to_hsv(*im.getpixel((x, y)))[0] for x in range(im.size[0]) for y in range(im.size[1])]
+        avg_h = sum(all_h) / (im.size[0] * im.size[1])
+        # 取与平均色相相近的像素色值rgb用于计算，像素值取值范围[0,255]
+        beyond = list(
+            filter(
+                lambda x: abs(colorsys.rgb_to_hsv(*x)[0] - avg_h) < delta_h,
+                [im.getpixel((x, y)) for x in range(im.size[0]) for y in range(im.size[1])],
+            )
         )
-    )
     if len(beyond):
         r = int(sum(e[0] for e in beyond) / len(beyond))
         g = int(sum(e[1] for e in beyond) / len(beyond))

{py_img_processor-1.2.0 → py_img_processor-1.2.3/py_img_processor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-img-processor
-Version: 1.2.0
+Version: 1.2.3
 Summary: Image editor using Python and Pillow.
 Home-page: https://github.com/SkylerHu/py-img-processor.git
 Author: SkylerHu
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: py-enum>=1.1.1
+Requires-Dist: py-enum>=2.1.1
 Requires-Dist: Pillow>=8
 
 # py-img-processor

py_img_processor-1.2.3/py_img_processor.egg-info/requires.txt

@@ -0,0 +1,2 @@
+py-enum>=2.1.1
+Pillow>=8

{py_img_processor-1.2.0 → py_img_processor-1.2.3}/setup.py

@@ -39,7 +39,7 @@ setup(
         ]
     },
     install_requires=[
-        "py-enum>=1.1.1",
+        "py-enum>=2.1.1",
         "Pillow>=8",
     ],
     python_requires=">=3.9",

py_img_processor-1.2.0/py_img_processor.egg-info/requires.txt

@@ -1,2 +0,0 @@
-py-enum>=1.1.1
-Pillow>=8