py-img-processor 1.2.3__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.2.3"
+__version__ = "1.3.1"
 
 
 VERSION = __version__
@@ -45,6 +45,8 @@ class SettingsProxy(object):
     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", "裁剪")

imgprocessor/main.py

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

@@ -33,6 +33,14 @@ _ACTION_PARASER_MAP: dict[str, typing.Any] = {
 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,
@@ -66,6 +74,7 @@ class ProcessParams(object):
 
         save_args = [""]  # 加空字符串，是为了保证解析出key
 
+        save_keys = list(ImgSaveParser.ARGS.keys())
         for item in value.split("/"):
             if not item:
                 continue
@@ -77,7 +86,7 @@ class ProcessParams(object):
                 key, param_str = info
             if not key:
                 raise ParamParseException(f"参数必须指定操作类型 [{item}]不符合参数要求")
-            if key in [enums.OpAction.FORMAT.value, enums.OpAction.QUALITY.value, enums.OpAction.INTERLACE.value]:
+            if key in save_keys:
                 save_args.append(f"{key}_{param_str}")
             else:
                 action_cls = _ACTION_PARASER_MAP.get(key)

imgprocessor/parsers/base.py

@@ -402,7 +402,10 @@ def trans_uri_to_im(uri: str, use_copy: bool = False) -> typing.Generator:
     """
     parsed_url = urllib.parse.urlparse(uri)
     if parsed_url.scheme in _ALLOW_SCHEMES:
-        with tempfile.NamedTemporaryFile() as fp:
+        # 可能包含 %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)
@@ -430,6 +433,8 @@ def trans_uri_to_im(uri: str, use_copy: bool = False) -> typing.Generator:
 
 class ImgSaveParser(BaseParser):
     KEY = ""
+
+    # 定义的key注意和枚举 `OpAction` 中的key不能重复
     ARGS = {
         "format": {"type": enums.ArgType.STRING.value, "default": None},
         "quality": {"type": enums.ArgType.INTEGER.value, "default": None, "min": 1, "max": 100},

imgprocessor/processor.py

@@ -13,27 +13,6 @@ from imgprocessor.parsers.base import trans_uri_to_im
 
 class ProcessorCtr(object):
 
-    def __init__(self, input_uri: str, out_path: str, params: typing.Union[ProcessParams, dict, str]) -> None:
-        # 输入文件检验路径
-        self.input_uri = BaseParser._validate_uri(input_uri)
-        self.out_path = out_path
-        # 初始化处理参数
-        if isinstance(params, dict):
-            params = ProcessParams(**params)
-        elif isinstance(params, str):
-            params = ProcessParams.parse_str(params)
-        params = typing.cast(ProcessParams, params)
-        self.params = params
-
-    def run(self) -> typing.Optional[typing.ByteString]:
-        # 初始化输入
-        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:
         im = ori_im
@@ -68,7 +47,7 @@ class ProcessorCtr(object):
 
         # 没有传递保存的路径，返回文件内容
         suffix = fmt or "png"
-        with tempfile.NamedTemporaryFile(suffix=f".{suffix}") as fp:
+        with tempfile.NamedTemporaryFile(suffix=f".{suffix}", dir=settings.PROCESSOR_TEMP_DIR) as fp:
             im.save(fp.name, **kwargs)
             fp.seek(0)
             content = fp.read()
@@ -76,14 +55,17 @@ class ProcessorCtr(object):
 
 
 def process_image(
-    input_uri: str, out_path: str, params: typing.Union[ProcessParams, dict, str]
+    input_uri: str,
+    params: typing.Union[ProcessParams, dict, str],
+    out_path: typing.Optional[str] = None,
+    **kwargs: typing.Any,
 ) -> typing.Optional[typing.ByteString]:
     """处理图像
 
     Args:
         input_uri: 输入图像路径
-        out_path: 输出图像保存路径
         params: 图像处理参数
+        out_path: 输出图像保存路径
 
     Raises:
         ProcessLimitException: 超过处理限制会抛出异常
@@ -91,8 +73,40 @@ def process_image(
     Returns:
         默认输出直接存储无返回，仅当out_path为空时会返回处理后图像的二进制内容
     """
-    ctr = ProcessorCtr(input_uri, out_path, params)
-    return ctr.run()
+    # 初始化输入
+    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:
+    """处理图像
+
+    Args:
+        ori_im: 输入图像为Image对象
+        params: 图像处理参数
+        out_path: 输出图像保存路径
+
+    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:

{py_img_processor-1.2.3.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.2.3
+Version: 1.3.1
 Summary: Image editor using Python and Pillow.
 Home-page: https://github.com/SkylerHu/py-img-processor.git
 Author: SkylerHu
@@ -73,6 +73,7 @@ Image editor using Python and Pillow.
 | 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系统存在的字体，建议设置字体文件路径。
 
@@ -85,16 +86,18 @@ Image editor using Python and Pillow.
 
 ### 处理函数
 ```python
-from imgprocessor.processor import process_image
+from imgprocessor.processor import process_image, process_image_obj
 
-process_image(input_uri, out_path, params)
+process_image(input_uri, params, out_path=out_path)
+# 或者
+process_image_obj(im, params, out_path=out_path)
 ```
 
 参数说明：
 
 - `input_uri` str，输入图像文件路径或者链接地址
-- `out_path` str, 输出图像保存路径
 - `params` str or json，图像处理参数，参数说明详见 [Reference.md](https://github.com/SkylerHu/py-img-processor/blob/master/docs/Reference.md)
+- `out_path` str, 输出图像保存路径, 默认为空，为空时返回二进制内容
 
 
 ### 图像处理参数为字符串
@@ -110,9 +113,9 @@ from imgprocessor.processor import process_image
 
 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",
 )
 ```
 
@@ -128,7 +131,6 @@ process_image(
 ```python
 process_image(
     "docs/imgs/lenna-400x225.jpg",
-    "/tmp/output.png",
     {
         "actions": [
             {"key": "resize", "s": 200},
@@ -139,6 +141,7 @@ process_image(
         ],
         "format": "png",
     },
+    out_path="/tmp/output.png",
 )
 ```
 该操作与上述字符串示例参数等效。

{py_img_processor-1.2.3.dist-info → py_img_processor-1.3.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
-imgprocessor/__init__.py,sha256=MRxiDm197O7yKi84nRtUSDP1NvjN5FhzFgtJB8j4-fA,2485
-imgprocessor/enums.py,sha256=uionzxbpytnM1iWPTj2Imh6v20kOhGy1i2HPsH-J14U,3129
+imgprocessor/__init__.py,sha256=qtGcx7kDmNawsCwjn2HY7nJoQibl63Mrwdk8mD4kEds,2540
+imgprocessor/enums.py,sha256=FEkNzclXiu9Ne0DXuWxlqG3m6q7yENSmlcObnfpDFus,2955
 imgprocessor/exceptions.py,sha256=kj9win_XjCbZnXr93sYs4Cfg1hAJX2fn5hgr1YMNoHQ,384
-imgprocessor/main.py,sha256=WDRsVtHNqlsngZHVZHuY0IE93OsXC5XD1fL-Zbw0KDs,4117
-imgprocessor/processor.py,sha256=VEZfDSDtJb5F8XbaFli234GKt50D1JUDGzPGkzugqDM,4555
+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=J3KQGgqUerzcnXihIcy7l0Z5JF8UjlVLqVEDEigPS8I,2937
+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=xLbCBjxuyqjU5GDh-hfHLVxSztGXxJlD5eZnqpqX-ko,16932
+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
@@ -15,9 +15,9 @@ imgprocessor/parsers/merge.py,sha256=4UIeWwDVg9rJRbTVRvNTyv-mxTA8W5TIgWAvWYXjvhA
 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.2.3.dist-info/LICENSE,sha256=Sr4UxtHWGmoO_enyTUeAN276LkBqJpse0guCcb6f9BQ,1066
-py_img_processor-1.2.3.dist-info/METADATA,sha256=DoivN4bYUzPjDEdt2cm_4vJAgMdMBZbG0_wRLyT7dhQ,7553
-py_img_processor-1.2.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-py_img_processor-1.2.3.dist-info/entry_points.txt,sha256=MLeLjzpkH7DkDMgICWCQ99D9ElqAvTBVBGA8yjg4dhQ,57
-py_img_processor-1.2.3.dist-info/top_level.txt,sha256=5Pm26oHcqZoihGGxc5N6qQJ2LuVa2i4au_uqHBMqehI,13
-py_img_processor-1.2.3.dist-info/RECORD,,
+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,,