ezKit 1.11.4__tar.gz → 1.11.6__tar.gz

{ezkit-1.11.4/ezKit.egg-info → ezkit-1.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.11.4
+Version: 1.11.6
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.11.4 → ezkit-1.11.6}/ezKit/utils.py

@@ -7,14 +7,12 @@ import os
 import subprocess
 import time
 import tomllib
+from concurrent.futures import ProcessPoolExecutor, ThreadPoolExecutor
 from copy import deepcopy
 from itertools import islice
-from multiprocessing import Pool
-from multiprocessing.pool import ThreadPool
 from pathlib import Path
 from shutil import rmtree
-from types import FunctionType
-from typing import Any
+from typing import Any, Callable
 from urllib.parse import ParseResult, urlparse
 from uuid import uuid4
 
@@ -742,7 +740,7 @@ def parent_dir(
 # --------------------------------------------------------------------------------------------------
 
 
-def retry(func: FunctionType, times: int = 3, **kwargs):
+def retry(func: Callable, times: int = 3, **kwargs) -> Any:
     """重试"""
 
     # 函数传递参数: https://stackoverflow.com/a/803632
@@ -887,7 +885,7 @@ def datetime_to_string(
 
 
 def datetime_to_timestamp(
-    datetime_instance: datetime.datetime,
+    datetime_instance: datetime.datetime = datetime.datetime.now(),
     utc: bool = False
 ) -> int | None:
     """
@@ -1191,12 +1189,12 @@ def delete_directory(
 
 
 def processor(
-    process_func: FunctionType,
-    process_data: list[Any],
+    process_func: Callable,
+    process_data: list,
     process_num: int = 2,
     thread: bool = False,
     **kwargs
-) -> list | bool:
+) -> Any:
     """使用多线程或多进程对数据进行并行处理"""
 
     # :param process_func: 处理函数
@@ -1226,13 +1224,13 @@ def processor(
 
         # 确保并行数不超过数据量
         process_num = min(len(process_data), process_num)
-        _data_chunks = (
+        data_chunks = (
             list_split(process_data, process_num, equally=True)
             if process_num > 1
             else [process_data]
         )
 
-        if not _data_chunks:
+        if not data_chunks:
             logger.error("data chunks error")
             return False
 
@@ -1241,9 +1239,9 @@ def processor(
         )
 
         # 执行多线程或多进程任务
-        pool_cls = ThreadPool if thread else Pool
-        with pool_cls(process_num, **kwargs) as pool:
-            return pool.map(process_func, _data_chunks)
+        pool = ThreadPoolExecutor if thread else ProcessPoolExecutor
+        with pool(process_num, **kwargs) as executor:
+            return executor.map(process_func, data_chunks)
 
     except Exception as e:
         logger.exception(e)

{ezkit-1.11.4 → ezkit-1.11.6/ezKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.11.4
+Version: 1.11.6
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.11.4 → ezkit-1.11.6}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ezKit',
-    version='1.11.4',
+    version='1.11.6',
     author='septvean',
     author_email='septvean@gmail.com',
     description='Easy Kit',