ezKit 1.11.2__tar.gz → 1.11.4__tar.gz

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

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

{ezkit-1.11.2 → ezkit-1.11.4}/ezKit/bottle_extensions.py

@@ -1,10 +1,11 @@
 """Bottle Extensions"""
-from typing import Callable
+from types import FunctionType
+from typing import Any
 
 from . import bottle, utils
 
 
-def enable_cors(fn: Callable) -> Callable:
+def enable_cors(fn: FunctionType) -> Any | None:
     """Bottle CORS"""
     # 参考文档:
     # - https://stackoverflow.com/a/17262900

{ezkit-1.11.2 → ezkit-1.11.4}/ezKit/qywx.py

@@ -60,8 +60,9 @@ class QYWX:
     # Token: https://developer.work.weixin.qq.com/document/path/90665#access-token
     access_token: str = ""
 
-    def __init__(self, work_id: str, agent_id: str, agent_secret: str):
+    def __init__(self, work_id: str, agent_id: str, agent_secret: str, api_prefix: str = "https://qyapi.weixin.qq.com"):
         """Initiation"""
+        self.api_prefix = api_prefix
         self.work_id = work_id
         self.agent_id = agent_id
         self.agent_secret = agent_secret

{ezkit-1.11.2 → ezkit-1.11.4}/ezKit/sendemail.py

@@ -6,7 +6,7 @@ from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.utils import formataddr, parseaddr
-from typing import Optional, TypedDict, cast
+from typing import TypedDict, cast
 
 from loguru import logger
 
@@ -28,9 +28,10 @@ class TypedSender(TypedDict):
 class TypedBody(TypedDict, total=False):
     """body type"""
     content: str
-    type: Optional[str]
+    type: str | None  # "plain", "html", or "file"
 
 def format_parse(s):
+    """格式化邮件地址"""
     _name, _addr = parseaddr(s)
     return formataddr((Header(_name, "utf-8").encode(), _addr))
 
@@ -42,33 +43,33 @@ def sendemail(
     body: TypedBody,
     images: None | list = None
 ) -> bool:
-    """
-    smtp SMTP信息
-
-        server  SMTP地址
-        port    SMTP端口
-        tls     是否使用TLS
-
-    sender 发件人信息
-
-        name     发件人名称
-        address  发件人邮箱地址
-        password 发件人邮箱密码(SMTP)
-
-    recipients  收件人(或列表)
-
-    subject     邮件主题
-
-    body        邮件主体
-
-        content 内容
-        type    类型 (默认 plain, 或者 file, 或者 html)
-
-    images 图片列表(可选)
-
-        cid  图片CID
-        path 图片路径
-    """
+    """发送邮件"""
+
+    # smtp SMTP信息
+    #
+    #     server  SMTP地址
+    #     port    SMTP端口
+    #     tls     是否使用TLS
+    #
+    # sender 发件人信息
+    #
+    #     name     发件人名称
+    #     address  发件人邮箱地址
+    #     password 发件人邮箱密码(SMTP)
+    #
+    # recipients  收件人(或列表)
+    #
+    # subject     邮件主题
+    #
+    # body        邮件主体
+    #
+    #     content 内容
+    #     type    类型 (默认 plain, 或者 file, 或者 html)
+    #
+    # images 图片列表(可选)
+    #
+    #     cid  图片CID
+    #     path 图片路径
 
     logger.success("sendemail start")
 

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

@@ -13,7 +13,8 @@ from multiprocessing import Pool
 from multiprocessing.pool import ThreadPool
 from pathlib import Path
 from shutil import rmtree
-from typing import Any, Callable, List, Optional, Union
+from types import FunctionType
+from typing import Any
 from urllib.parse import ParseResult, urlparse
 from uuid import uuid4
 
@@ -23,7 +24,7 @@ from loguru import logger
 
 
 # None Type
-NoneType = type(None)
+# from types import NoneType
 
 
 # --------------------------------------------------------------------------------------------------
@@ -741,7 +742,7 @@ def parent_dir(
 # --------------------------------------------------------------------------------------------------
 
 
-def retry(func: Callable, times: int = 3, **kwargs):
+def retry(func: FunctionType, times: int = 3, **kwargs):
     """重试"""
 
     # 函数传递参数: https://stackoverflow.com/a/803632
@@ -1005,9 +1006,9 @@ def shell(
     command: str,
     isfile: bool = False,
     sh_shell: str = "/bin/bash",
-    sh_option: Optional[str] = None,
+    sh_option: str | None = None,
     **kwargs
-) -> Optional[subprocess.CompletedProcess]:
+) -> subprocess.CompletedProcess | None:
     """执行 Shell 命令 或 脚本"""
 
     # :param command: 需要执行的命令
@@ -1100,7 +1101,7 @@ def json_sort(
 
 
 def delete_files(
-    files: Union[str, List]
+    files: str | list
 ) -> bool:
     """删除文件"""
     try:
@@ -1132,7 +1133,7 @@ def delete_files(
 
 
 def delete_directory(
-    directory: Union[str, List]
+    directory: str | list,
 ) -> bool:
     """
     delete directory
@@ -1190,12 +1191,12 @@ def delete_directory(
 
 
 def processor(
-    process_func: Callable,
-    process_data: List[Any],
+    process_func: FunctionType,
+    process_data: list[Any],
     process_num: int = 2,
     thread: bool = False,
     **kwargs
-) -> Union[List[Any], bool]:
+) -> list | bool:
     """使用多线程或多进程对数据进行并行处理"""
 
     # :param process_func: 处理函数

{ezkit-1.11.2 → ezkit-1.11.4}/ezKit/xftp.py

@@ -10,7 +10,15 @@ from loguru import logger
 class XFTP:
     """XFTP"""
 
-    def __init__(self, host="127.0.0.1", port=21, username="anonymous", password="", encoding="UTF-8", debuglevel=0):
+    def __init__(
+        self,
+        host: str = "127.0.0.1",
+        port: int = 21,
+        username: str = "anonymous",
+        password: str = "",
+        encoding: str = "UTF-8",
+        debuglevel: int = 0
+    ):
         """Initiation"""
         self.ftp = FTP()
         self.ftp.set_debuglevel(debuglevel)

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

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

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

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