py-img-processor 1.1.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

imgprocessor/__init__.py

@@ -5,7 +5,7 @@ import importlib
 
 
 __all__ = ["settings", "VERSION"]
-__version__ = "1.1.0"
+__version__ = "1.3.1"
 
 
 VERSION = __version__
@@ -41,6 +41,12 @@ class SettingsProxy(object):
     PROCESSOR_DEFAULT_QUALITY = 75
     # 默认字体文件; 默认配置了MacOS系统中的字体
     PROCESSOR_TEXT_FONT = "Arial Unicode.ttf"
+    # 工作目录列表：例如水印文件必须限制在设定的目录下，避免恶意访问文件
+    PROCESSOR_WORKSPACES = ()
+    # 当资源文件uri使用链接地址时，限制地址域名来源
+    PROCESSOR_ALLOW_DOMAINS = ()
+    # 临时文件目录
+    PROCESSOR_TEMP_DIR = None
 
     def __getattribute__(self, attr: str) -> typing.Any:
         try:

imgprocessor/enums.py

@@ -31,10 +31,6 @@ class ImageOrientation(ChoiceEnum):
 class OpAction(ChoiceEnum):
     """支持的操作类型"""
 
-    # 以下几个比较特殊，在保存文件时使用
-    FORMAT = ("format", "格式")
-    QUALITY = ("quality", "质量")
-    INTERLACE = ("interlace", "渐进显示")
     # 其他
     RESIZE = ("resize", "缩放")
     CROP = ("crop", "裁剪")
@@ -62,6 +58,8 @@ class ArgType(ChoiceEnum):
     STRING = ("str", "字符串")
     INTEGER = ("int", "整数")
     FLOAT = ("float", "浮点数")
+    URI = ("uri", "资源路径/链接")
+    ACTION = ("action", "对图像的操作")
 
 
 class Geography(ChoiceEnum):

imgprocessor/main.py

@@ -7,7 +7,7 @@ import argparse
 import traceback
 
 from imgprocessor import VERSION
-from imgprocessor.processor import ProcessParams, process_image_by_path
+from imgprocessor.processor import ProcessParams, process_image
 
 
 def main(argv: typing.Optional[list[str]] = None) -> int:
@@ -95,7 +95,7 @@ def main(argv: typing.Optional[list[str]] = None) -> int:
             if not os.path.exists(cur_out_dir):
                 os.makedirs(cur_out_dir)
             try:
-                process_image_by_path(file_path, out_path, param_str)
+                process_image(file_path, param_str, out_path=out_path)
                 print(f"{tag}\t 成功", flush=True)
             except Exception as e:
                 print(f"{tag}\t \033[31m失败：{e}\033[0m", file=sys.stderr, flush=True)

imgprocessor/parsers/__init__.py

@@ -4,7 +4,8 @@ import typing
 
 from imgprocessor import enums
 from imgprocessor.exceptions import ParamParseException
-from .base import BaseParser, ImgSaveParser  # noqa: F401
+
+from .base import BaseParser, ImgSaveParser
 from .resize import ResizeParser
 from .crop import CropParser
 from .circle import CircleParser
@@ -16,22 +17,30 @@ 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,
 }
 
 
 class ProcessParams(object):
     """图像处理输入参数"""
 
+    @classmethod
+    def init(cls, params: typing.Union["ProcessParams", dict, str]) -> "ProcessParams":
+        if isinstance(params, ProcessParams):
+            return params
+        if isinstance(params, dict):
+            return cls(**params)
+        return cls.parse_str(params)
+
     def __init__(
         self,
         enable_base64: bool = False,
@@ -40,7 +49,7 @@ class ProcessParams(object):
     ) -> None:
         self.save_parser: ImgSaveParser = ImgSaveParser.init(kwargs, enable_base64=enable_base64)  # type: ignore
 
-        _actions = []
+        _actions: list[BaseParser] = []
         for i in actions or []:
             key = i.get("key")
             cls = _ACTION_PARASER_MAP.get(key)
@@ -65,6 +74,7 @@ class ProcessParams(object):
 
         save_args = [""]  # 加空字符串，是为了保证解析出key
 
+        save_keys = list(ImgSaveParser.ARGS.keys())
         for item in value.split("/"):
             if not item:
                 continue
@@ -76,7 +86,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 save_keys:
                 save_args.append(f"{key}_{param_str}")
             else:
                 action_cls = _ACTION_PARASER_MAP.get(key)

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__(

imgprocessor/parsers/base.py

@@ -1,11 +1,22 @@
+#!/usr/bin/env python
+# coding=utf-8
 import typing
 
+import os
 import re
+import tempfile
+import urllib.parse
+from urllib.request import urlretrieve
+from contextlib import contextmanager
 
 from PIL import Image, ImageOps
 
-from imgprocessor import enums, utils
-from imgprocessor.exceptions import ParamValidateException, ParamParseException
+from py_enum import ChoiceEnum
+from imgprocessor import settings, enums, utils
+from imgprocessor.exceptions import ParamValidateException, ParamParseException, ProcessLimitException
+
+
+_ALLOW_SCHEMES = ("http", "https")
 
 
 class BaseParser(object):
@@ -58,16 +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.value:
+                        value = cls._validate_uri(value, enable_base64=enable_base64, **config)
+                    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
@@ -82,7 +100,7 @@ class BaseParser(object):
         regex: typing.Optional[str] = None,
         base64_encode: bool = False,
         max_length: typing.Optional[int] = None,
-        **kwargs: dict,
+        **kwargs: typing.Any,
     ) -> str:
         if not isinstance(value, str):
             raise ParamValidateException("参数类型不符合要求，必须是字符串类型")
@@ -101,7 +119,7 @@ class BaseParser(object):
         min: typing.Optional[int] = None,
         max: typing.Optional[int] = None,
         use_float: bool = False,
-        **kwargs: dict,
+        **kwargs: typing.Any,
     ) -> typing.Union[int, float]:
         if isinstance(value, int) or (use_float and isinstance(value, (int, float))):
             v = value
@@ -125,6 +143,47 @@ class BaseParser(object):
 
         return v
 
+    @classmethod
+    def _validate_uri(cls, value: typing.Any, **kwargs: typing.Any) -> str:
+        """校验输入的资源，转换为本地绝对路径
+
+        Args:
+            value: 输入值
+            workspace: 限制资源路径，可传递空字符串忽略校验. Defaults to None.
+            allow_domains: 限制资源地址的域名，可传递空数组忽略校验. Defaults to None.
+
+        Raises:
+            ParamValidateException: 参数校验异常
+
+        Returns:
+            系统文件绝对路径
+        """
+        # 首先是字符串
+        value = cls._validate_str(value, **kwargs)
+        ori_value = value
+        # 判断是否是链接
+        parsed_url = urllib.parse.urlparse(value)
+        if parsed_url.scheme not in _ALLOW_SCHEMES:
+            value = os.path.realpath(os.fspath(value))
+            if not os.path.isfile(value):
+                raise ParamValidateException(f"系统文件不存在: {ori_value}")
+
+            workspaces: tuple = settings.PROCESSOR_WORKSPACES or ()
+            _workspace = [os.path.realpath(os.fspath(ws)) for ws in workspaces]
+            if _workspace and not value.startswith(tuple(_workspace)):
+                raise ParamValidateException(f"文件必须在 PROCESSOR_WORKSPACES={workspaces} 目录下: {ori_value}")
+        else:
+            # 是链接地址
+            domain = parsed_url.netloc
+            if not domain:
+                raise ParamValidateException(f"链接未解析出域名: {ori_value}")
+            allow_domains = settings.PROCESSOR_ALLOW_DOMAINS
+            if allow_domains and not parsed_url.netloc.endswith(tuple(allow_domains)):
+                raise ParamValidateException(
+                    f"域名不合法, {parsed_url.netloc} 不在 {allow_domains} 范围内: {ori_value}"
+                )
+        return value
+
     @classmethod
     def parse_str(cls, param_str: str) -> dict:
         """将字符串参数转化为json格式数据
@@ -186,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:
@@ -247,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个图像，计算整体大小和元素原点位置；数值单位都是像素
@@ -270,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
@@ -304,13 +367,79 @@ def compute_splice_two_im(
     return w, h, x1, y1, x2, y2
 
 
+def validate_ori_im(ori_im: Image) -> None:
+    src_w, src_h = ori_im.size
+    if src_w > settings.PROCESSOR_MAX_W_H or src_h > settings.PROCESSOR_MAX_W_H:
+        raise ProcessLimitException(
+            f"图像宽和高单边像素不能超过{settings.PROCESSOR_MAX_W_H}像素，输入图像({src_w}, {src_h})"
+        )
+    if src_w * src_h > settings.PROCESSOR_MAX_PIXEL:
+        raise ProcessLimitException(f"图像总像素不可超过{settings.PROCESSOR_MAX_PIXEL}像素，输入图像({src_w}, {src_h})")
+
+
+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: 处理图像大小/像素限制
+
+    Returns:
+        Image对象
+    """
+    parsed_url = urllib.parse.urlparse(uri)
+    if parsed_url.scheme in _ALLOW_SCHEMES:
+        # 可能包含 %20 (空格) 等编码，需要 unquote
+        filename = os.path.basename(urllib.parse.unquote(parsed_url.path))
+        _, suffix = os.path.splitext(filename)
+        with tempfile.NamedTemporaryFile(suffix=suffix, dir=settings.PROCESSOR_TEMP_DIR) as fp:
+            # 输入值计算md5作为文件名；重复地址本地若存在不下载多次
+            urlretrieve(uri, filename=fp.name)
+            fp.seek(0)
+
+            size = os.path.getsize(fp.name)
+            if size > settings.PROCESSOR_MAX_FILE_SIZE * 1024 * 1024:
+                raise ProcessLimitException(f"图像文件大小不得超过{settings.PROCESSOR_MAX_FILE_SIZE}MB")
+
+            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")
+        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 = ""
+
+    # 定义的key注意和枚举 `OpAction` 中的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__(

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__(

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__(

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控制
     }
 

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__(

imgprocessor/parsers/merge.py

@@ -5,65 +5,92 @@ import typing
 from PIL import Image
 
 from imgprocessor import enums, settings
-from .base import BaseParser, pre_processing, compute_by_geography, compute_splice_two_im
+from imgprocessor.exceptions import ParamValidateException
+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.STRING, "required": True, "base64_encode": True},
+        "image": {"type": enums.ArgType.URI.value, "required": True, "base64_encode": True},
         # 对image的处理参数
-        "action": {"type": enums.ArgType.STRING, "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.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,
-            "default": "FFFFFF",
+            "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})$",
         },
     }
 
     def __init__(
         self,
-        image: typing.Optional[str] = None,
-        action: typing.Optional[str] = None,
+        image: str = "",
+        actions: typing.Union[str, list] = "",
         p: int = 0,
         order: typing.Optional[int] = None,
         align: int = 2,
         interval: int = 0,
+        bg: int = 0,
         g: typing.Optional[str] = None,
         x: int = 0,
         y: int = 0,
         pf: str = "",
-        color: str = "FFFFFF",
+        color: str = "0000",
         **kwargs: typing.Any,
     ) -> None:
         self.image = image
-        self.action = action
         self.p = p
         self.order = order
         self.align = align
         self.interval = interval
+        self.bg = bg
         self.g = g
         self.x = x
         self.y = y
         self.pf = pf
         self.color = color
 
+        self.actions: list[BaseParser] = []
+        if actions:
+            from imgprocessor.processor import ProcessParams
+
+            try:
+                if isinstance(actions, str):
+                    params = ProcessParams.parse_str(actions)
+                else:
+                    params = ProcessParams(actions=actions)
+                self.actions = params.actions
+            except ParamValidateException as e:
+                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,
@@ -90,20 +117,30 @@ class MergeParser(BaseParser):
 
     def do_action(self, im: Image) -> Image:
         im = pre_processing(im, use_alpha=True)
-        src_w, src_h = im.size
 
-        im2 = Image.open(self.image)
-        im2 = pre_processing(im2, use_alpha=True)
-        if self.action:
-            from imgprocessor.processor import ProcessParams, handle_img_actions
+        # 处理要合并的图像
+        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
 
-            params = ProcessParams.parse_str(self.action)
-            im2 = handle_img_actions(im2, params.actions)
+            im2 = ProcessorCtr.handle_img_actions(im2, self.actions)
+
+        # 调整拼接顺序
+        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
 
+        # 计算合并像素点
         w, h, x1, y1, x2, y2 = self.compute(src_w, src_h, w2, h2)
         out = Image.new("RGBA", (w, h), color=f"#{self.color}")
         out.paste(im, (x1, y1), im)

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,
-            "default": "FFFFFF",
+            "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)

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__(

imgprocessor/parsers/watermark.py

@@ -6,44 +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
+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.STRING, "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},
-        "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},
+        "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.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__(
@@ -99,8 +118,8 @@ class WatermarkParser(BaseParser):
         w1, h1, w2, h2 = 0, 0, 0, 0
         icon = None
         if self.image:
-            icon = Image.open(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

imgprocessor/processor.py

@@ -1,75 +1,71 @@
 #!/usr/bin/env python
 # coding=utf-8
 import typing
-import os
 import tempfile
 import colorsys
 
 from PIL import Image, ImageOps
 
-from imgprocessor import settings, enums
-from imgprocessor.exceptions import ProcessLimitException
+from imgprocessor import enums, settings
 from imgprocessor.parsers import BaseParser, ProcessParams
-
-
-def handle_img_actions(ori_im: Image, actions: list[BaseParser]) -> Image:
-    src_w, src_h = ori_im.size
-    if src_w > settings.PROCESSOR_MAX_W_H or src_h > settings.PROCESSOR_MAX_W_H:
-        raise ProcessLimitException(
-            f"图像宽和高单边像素不能超过{settings.PROCESSOR_MAX_W_H}像素，输入图像({src_w}, {src_h})"
-        )
-    if src_w * src_h > settings.PROCESSOR_MAX_PIXEL:
-        raise ProcessLimitException(f"图像总像素不可超过{settings.PROCESSOR_MAX_PIXEL}像素，输入图像({src_w}, {src_h})")
-
-    im = ori_im
-    im = ImageOps.exif_transpose(im)
-
-    for parser in actions:
-        im = parser.do_action(im)
-
-    return im
-
-
-def save_img_to_file(
-    im: Image,
+from imgprocessor.parsers.base import trans_uri_to_im
+
+
+class ProcessorCtr(object):
+
+    @classmethod
+    def handle_img_actions(cls, ori_im: Image, actions: list[BaseParser]) -> Image:
+        im = ori_im
+        # 解决旋转问题
+        im = ImageOps.exif_transpose(im)
+        for parser in actions:
+            im = parser.do_action(im)
+        return im
+
+    @classmethod
+    def save_img_to_file(
+        cls,
+        im: Image,
+        out_path: typing.Optional[str] = None,
+        **kwargs: typing.Any,
+    ) -> typing.Optional[typing.ByteString]:
+        fmt = kwargs.get("format") or im.format
+
+        if fmt and fmt.upper() == enums.ImageFormat.JPEG.value and im.mode == "RGBA":
+            im = im.convert("RGB")
+
+        if not kwargs.get("quality"):
+            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
+
+        if out_path:
+            # icc_profile 是为解决色域的问题
+            im.save(out_path, **kwargs)
+            return None
+
+        # 没有传递保存的路径，返回文件内容
+        suffix = fmt or "png"
+        with tempfile.NamedTemporaryFile(suffix=f".{suffix}", dir=settings.PROCESSOR_TEMP_DIR) as fp:
+            im.save(fp.name, **kwargs)
+            fp.seek(0)
+            content = fp.read()
+        return content
+
+
+def process_image(
+    input_uri: str,
+    params: typing.Union[ProcessParams, dict, str],
     out_path: typing.Optional[str] = None,
     **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":
-        im = im.convert("RGB")
-
-    if not kwargs.get("quality"):
-        if fmt.upper() == enums.ImageFormat.JPEG and im.format == enums.ImageFormat.JPEG:
-            kwargs["quality"] = "keep"
-        else:
-            kwargs["quality"] = settings.PROCESSOR_DEFAULT_QUALITY
-
-    if out_path:
-        # icc_profile 是为解决色域的问题
-        im.save(out_path, **kwargs)
-        return None
-
-    # 没有传递保存的路径，返回文件内容
-    suffix = fmt or "png"
-    with tempfile.NamedTemporaryFile(suffix=f".{suffix}") as fp:
-        im.save(fp.name, **kwargs)
-        fp.seek(0)
-        content = fp.read()
-    return content
-
-
-def process_image_by_path(
-    input_path: str, out_path: str, params: typing.Union[ProcessParams, dict, str]
 ) -> typing.Optional[typing.ByteString]:
     """处理图像
 
     Args:
-        input_path: 输入图像文件路径
-        out_path: 输出图像保存路径
+        input_uri: 输入图像路径
         params: 图像处理参数
+        out_path: 输出图像保存路径
 
     Raises:
         ProcessLimitException: 超过处理限制会抛出异常
@@ -77,21 +73,40 @@ def process_image_by_path(
     Returns:
         默认输出直接存储无返回，仅当out_path为空时会返回处理后图像的二进制内容
     """
-    size = os.path.getsize(input_path)
-    if size > settings.PROCESSOR_MAX_FILE_SIZE * 1024 * 1024:
-        raise ProcessLimitException(f"图像文件大小不得超过{settings.PROCESSOR_MAX_FILE_SIZE}MB")
-    if isinstance(params, dict):
-        params = ProcessParams(**params)
-    elif isinstance(params, str):
-        params = ProcessParams.parse_str(params)
-    params = typing.cast(ProcessParams, params)
+    # 初始化输入
+    params_obj: ProcessParams = ProcessParams.init(params)
+    with trans_uri_to_im(input_uri) as ori_im:
+        # 处理图像
+        im = ProcessorCtr.handle_img_actions(ori_im, params_obj.actions)
+        # 输出、保存
+        _kwargs = params_obj.save_parser.compute(ori_im, im)
+        _kwargs.update(kwargs)
+        ret = ProcessorCtr.save_img_to_file(im, out_path=out_path, **_kwargs)
+    return ret
+
+
+def process_image_obj(
+    ori_im: Image,
+    params: typing.Union[ProcessParams, dict, str],
+    out_path: typing.Optional[str] = None,
+    **kwargs: typing.Any,
+) -> Image:
+    """处理图像
 
-    ori_im = Image.open(input_path)
-    # 处理图像
-    im = handle_img_actions(ori_im, params.actions)
+    Args:
+        ori_im: 输入图像为Image对象
+        params: 图像处理参数
+        out_path: 输出图像保存路径
 
-    kwargs = params.save_parser.compute(ori_im, im)
-    return save_img_to_file(im, out_path=out_path, **kwargs)
+    Returns:
+        默认输出直接存储无返回，仅当out_path为空时会返回处理后图像的二进制内容
+    """
+    params_obj: ProcessParams = ProcessParams.init(params)
+    im = ProcessorCtr.handle_img_actions(ori_im, params_obj.actions)
+    _kwargs = params_obj.save_parser.compute(ori_im, im)
+    _kwargs.update(kwargs)
+    ret = ProcessorCtr.save_img_to_file(im, out_path=out_path, **_kwargs)
+    return ret
 
 
 def extract_main_color(img_path: str, delta_h: float = 0.3) -> str:
@@ -105,20 +120,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.1.0.dist-info → py_img_processor-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-img-processor
-Version: 1.1.0
+Version: 1.3.1
 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
@@ -71,6 +71,9 @@ Image editor using Python and Pillow.
 | PROCESSOR_MAX_PIXEL | int | width x height总像素3亿，处理前后的值都被此配置限制 | 300000000 |
 | PROCESSOR_DEFAULT_QUALITY | int | 图像处理后的默认质量 | 75 |
 | PROCESSOR_TEXT_FONT | str | 默认字体文件，默认从系统中寻找；也可以直接传递字体文件路径 | Arial Unicode.ttf |
+| PROCESSOR_WORKSPACES | tuple | 限制水印等资源路径 （startswith匹配）， 默认无限制 | `()` |
+| PROCESSOR_ALLOW_DOMAINS | tuple | 限制链接地址域名 （endswith匹配），默认无限制 | `()` |
+| PROCESSOR_TEMP_DIR | str | tmpfile使用的临时目录,不设置默认使用系统tmp目录 | `None` |
 
 > `注意`：`PROCESSOR_TEXT_FONT` 字体的设置是文字水印必要参数，需保证系统已安装该字体。默认值 `Arial Unicode.ttf` 是MacOS系统存在的字体，建议设置字体文件路径。
 
@@ -82,13 +85,19 @@ Image editor using Python and Pillow.
 
 
 ### 处理函数
-`process_image_by_path(input_path, out_path, params)`
+```python
+from imgprocessor.processor import process_image, process_image_obj
+
+process_image(input_uri, params, out_path=out_path)
+# 或者
+process_image_obj(im, params, out_path=out_path)
+```
 
 参数说明：
 
-- `input_path` str，输入图像文件路径
-- `out_path` str, 输出图像保存路径
+- `input_uri` str，输入图像文件路径或者链接地址
 - `params` str or json，图像处理参数，参数说明详见 [Reference.md](https://github.com/SkylerHu/py-img-processor/blob/master/docs/Reference.md)
+- `out_path` str, 输出图像保存路径, 默认为空，为空时返回二进制内容
 
 
 ### 图像处理参数为字符串
@@ -100,13 +109,13 @@ Image editor using Python and Pillow.
 
 ```python
 from imgprocessor.utils import base64url_encode
-from imgprocessor.processor import process_image_by_path
+from imgprocessor.processor import process_image
 
-process_image_by_path(
+process_image(
     "docs/imgs/lenna-400x225.jpg",
-    "/tmp/output.png",
     # 对图片缩放、裁剪、生成圆角、并转成png存储
     f"resize,s_200/crop,w_200,h_200,g_center/watermark,text_{base64url_encode('Hello 世界')},color_FFF,size_20/circle,r_10/format,png",
+    out_path="/tmp/output.png",
 )
 ```
 
@@ -120,9 +129,8 @@ process_image_by_path(
 - 其他参数都放在 `actions` 数组中；
 
 ```python
-process_image_by_path(
+process_image(
     "docs/imgs/lenna-400x225.jpg",
-    "/tmp/output.png",
     {
         "actions": [
             {"key": "resize", "s": 200},
@@ -133,6 +141,7 @@ process_image_by_path(
         ],
         "format": "png",
     },
+    out_path="/tmp/output.png",
 )
 ```
 该操作与上述字符串示例参数等效。

py_img_processor-1.3.1.dist-info/RECORD

@@ -0,0 +1,23 @@
+imgprocessor/__init__.py,sha256=qtGcx7kDmNawsCwjn2HY7nJoQibl63Mrwdk8mD4kEds,2540
+imgprocessor/enums.py,sha256=FEkNzclXiu9Ne0DXuWxlqG3m6q7yENSmlcObnfpDFus,2955
+imgprocessor/exceptions.py,sha256=kj9win_XjCbZnXr93sYs4Cfg1hAJX2fn5hgr1YMNoHQ,384
+imgprocessor/main.py,sha256=oBDQJAyx9iC_7xNllsJ6qlSE91Tks0LNJ6O1MzryMoY,4126
+imgprocessor/processor.py,sha256=ocXllGWPiDiSnXEPZqRIU8qNFwomZTJ6_L0m_gTk-fY,4833
+imgprocessor/utils.py,sha256=KBRQJaN8FuuRD2QQPYuuHQ7S-2ML-ctz4rstQTrEdog,1202
+imgprocessor/parsers/__init__.py,sha256=NdXhxC_3a74lUDlFelQ3oGAeK_7tJ9_OwfCOmEd-ZvA,3192
+imgprocessor/parsers/alpha.py,sha256=PudXZBu-s5Fzj6fB7Aae4yxJkmdfd_l_oAFSk7279Zk,877
+imgprocessor/parsers/base.py,sha256=5wVUWLDcch2FyFBCYQCORR_2RHYUghCjqtcgpphfGSE,17231
+imgprocessor/parsers/blur.py,sha256=twVLORVV4nXfvHBaqi353X6odOnRi414sye3AOGG5bY,673
+imgprocessor/parsers/circle.py,sha256=VXWgKIkz9emQHWOoO2jbkUFrEbXb1s6ZM-R8BRxSi4c,1665
+imgprocessor/parsers/crop.py,sha256=FfPPmN63XUQZCgRkKuuycj9SLdS-0hnLAU5mRrj-4Uc,3524
+imgprocessor/parsers/gray.py,sha256=qMPid9X2tJko3pt5O-RNpXBR5drTowwOHTlfEFksiuQ,402
+imgprocessor/parsers/merge.py,sha256=4UIeWwDVg9rJRbTVRvNTyv-mxTA8W5TIgWAvWYXjvhA,5211
+imgprocessor/parsers/resize.py,sha256=31iJws5YVsqJZN4O-HG9OjGBtKFW_mGE5536pYvWchU,5175
+imgprocessor/parsers/rotate.py,sha256=Vb23OJuGQrdGRkJWpDJeeVkZUF9bbsRD2e58P5Q1b1k,734
+imgprocessor/parsers/watermark.py,sha256=MTlRVvtVMR5IyJODk5DMFe01KQKGAulaaNy7f23NvME,8862
+py_img_processor-1.3.1.dist-info/LICENSE,sha256=Sr4UxtHWGmoO_enyTUeAN276LkBqJpse0guCcb6f9BQ,1066
+py_img_processor-1.3.1.dist-info/METADATA,sha256=FslQFBULB1AewqEkX80vfFjkacVAngSLAWWWfpq96lw,7810
+py_img_processor-1.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+py_img_processor-1.3.1.dist-info/entry_points.txt,sha256=MLeLjzpkH7DkDMgICWCQ99D9ElqAvTBVBGA8yjg4dhQ,57
+py_img_processor-1.3.1.dist-info/top_level.txt,sha256=5Pm26oHcqZoihGGxc5N6qQJ2LuVa2i4au_uqHBMqehI,13
+py_img_processor-1.3.1.dist-info/RECORD,,

py_img_processor-1.1.0.dist-info/RECORD

@@ -1,23 +0,0 @@
-imgprocessor/__init__.py,sha256=2ebw4pYHInmKQKQEbkwQ-fHx0uM7ED026wgR04y7EYo,2243
-imgprocessor/enums.py,sha256=-eA9pv5g-0Xm23jrHv5aJf2g56t95-hUgzSz4xlx5Go,3042
-imgprocessor/exceptions.py,sha256=kj9win_XjCbZnXr93sYs4Cfg1hAJX2fn5hgr1YMNoHQ,384
-imgprocessor/main.py,sha256=QDkz__RJ_iIjrb1p56bhPzZ7yLbtzhXvvKpLmvkJEkI,4133
-imgprocessor/processor.py,sha256=4f6DTNeIRMTAlvtEn7UQQFuNUxMQJSB_dfkzERjvUQ4,4388
-imgprocessor/utils.py,sha256=KBRQJaN8FuuRD2QQPYuuHQ7S-2ML-ctz4rstQTrEdog,1202
-imgprocessor/parsers/__init__.py,sha256=3aSxKTflK2hZxaiYtaX3HsFvLwg9QE7YLIp4gdTf7T8,3004
-imgprocessor/parsers/alpha.py,sha256=grOnmZSYhO0wI2pJfGz6CfTwOTc8kfcxspmfM0nzAzA,865
-imgprocessor/parsers/base.py,sha256=80VTehgA8LwwVety3_IGSJ_vsX01mWAZNb-c6v3AT2o,11832
-imgprocessor/parsers/blur.py,sha256=Y9BeTK7e-y8HPNeLQxgtqiquOVf2cVLXhXn1bv9072g,661
-imgprocessor/parsers/circle.py,sha256=z0IZZSv_zuY2jzB6kN01sB1jGhBure33DPt7JAEeNsk,1653
-imgprocessor/parsers/crop.py,sha256=P2kqNVn9tiorq_kgBXLxygthL2EKulNkP6aRh1FrmVw,3464
-imgprocessor/parsers/gray.py,sha256=ZDBHZlBfI91TePWWBU0feSHmtD1ekre5-uV2BDLFTKA,396
-imgprocessor/parsers/merge.py,sha256=JwJKIVlmeKxEQIeuYBKT_i5E6jBBOM2m4fqKWpPfuhs,4049
-imgprocessor/parsers/resize.py,sha256=Zeh9LDLQVaEqijcOsljKGDNTQ2rUmijzQ0ziAgYsSoI,5020
-imgprocessor/parsers/rotate.py,sha256=EDKvlxTgZZu7vAkSS9cuZ296dbAhe5Aq6huH9Hjtvy0,722
-imgprocessor/parsers/watermark.py,sha256=y5ddCw9lRS1fwMjHtI0lIGpWcCIFSQA6Q0l7gpcNS7g,8488
-py_img_processor-1.1.0.dist-info/LICENSE,sha256=Sr4UxtHWGmoO_enyTUeAN276LkBqJpse0guCcb6f9BQ,1066
-py_img_processor-1.1.0.dist-info/METADATA,sha256=bEzbYrVLFqjJBP6pbvt-55Tq789Yo6e_L3Pgyi--RCY,7286
-py_img_processor-1.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-py_img_processor-1.1.0.dist-info/entry_points.txt,sha256=MLeLjzpkH7DkDMgICWCQ99D9ElqAvTBVBGA8yjg4dhQ,57
-py_img_processor-1.1.0.dist-info/top_level.txt,sha256=5Pm26oHcqZoihGGxc5N6qQJ2LuVa2i4au_uqHBMqehI,13
-py_img_processor-1.1.0.dist-info/RECORD,,