ezKit 1.12.1__py3-none-any.whl → 1.12.2__py3-none-any.whl

ezKit/database.py

@@ -251,9 +251,7 @@ class Database:
                 with open(encoding="utf-8", **read_sql_file_kwargs) as _file:
                     sql_statement = _file.read()
             else:
-                if not (
-                    isinstance(sql, str) and utils.check_arguments([(sql, str, "sql")])
-                ):
+                if not isinstance(sql, str):
                     return None
                 sql_statement = sql
         except Exception as e:
@@ -277,9 +275,7 @@ class Database:
                     logger.success(f"{info} [success]")
 
                     # 返回查询结果
-                    if isinstance(save_to_csv, dict) and utils.isTrue(
-                        save_to_csv, dict
-                    ):
+                    if isinstance(save_to_csv, dict) and utils.isTrue(save_to_csv, dict):
                         save_to_csv_kwargs: dict = {
                             "mode": "w",
                             "encoding": "utf-8",
@@ -298,9 +294,7 @@ class Database:
 
     # ----------------------------------------------------------------------------------------------
 
-    def read_with_pandas(
-        self, method: str = "read_sql", result_type: str = "df", **kwargs
-    ) -> pd.DataFrame | list | dict:
+    def read_with_pandas(self, method: str = "read_sql", result_type: str = "df", **kwargs) -> pd.DataFrame | list | dict:
         """读取数据"""
 
         # 使用SQL查询数据: 使用 pd.read_sql 的参数
@@ -311,12 +305,6 @@ class Database:
 
         data: pd.DataFrame = pd.DataFrame()
 
-        if not utils.check_arguments([(method, str, "method")]):
-            return data
-
-        if not utils.check_arguments([(result_type, str, "result_type")]):
-            return data
-
         info: str = "read data"
 
         try:

ezKit/qywx.py

@@ -169,10 +169,6 @@ class QYWX:
 
         info: str = f"根据电话号码获取用户ID: {mobile}"
 
-        if not utils.check_arguments([(mobile, str, "mobile")]):
-            logger.error(f"{info} [错误]")
-            return None
-
         try:
 
             logger.info(f"{info} ......")
@@ -236,12 +232,6 @@ class QYWX:
 
         info: str = "发送消息"
 
-        if not utils.check_arguments(
-            [(mobile, (str, list), "mobile"), (message, str, "message")]
-        ):
-            logger.error(f"{info} [失败]")
-            return False
-
         try:
 
             logger.info(f"{info} ......")
@@ -267,19 +257,12 @@ class QYWX:
 
                 user_object = self.get_user_id_by_mobile(user)
 
-                if not (
-                    isinstance(user_object, dict) and utils.isTrue(user_object, dict)
-                ):
+                if not (isinstance(user_object, dict) and utils.isTrue(user_object, dict)):
                     logger.error(f"{info} [获取用户ID错误: {user}]")
                     continue
 
-                if (
-                    user_object.get("errcode", -1) != 0
-                    or user_object.get("errmsg", "") != "ok"
-                ):
-                    logger.error(
-                        f"{user_object.get('errcode')}: {user_object.get('errmsg')}"
-                    )
+                if user_object.get("errcode", -1) != 0 or user_object.get("errmsg", "") != "ok":
+                    logger.error(f"{user_object.get('errcode')}: {user_object.get('errmsg')}")
                     continue
 
                 json_dict = {

ezKit/utils.py

@@ -73,23 +73,23 @@ def isTrue(target: object, typeClass: Any) -> bool:
 # --------------------------------------------------------------------------------------------------
 
 
-def check_arguments(data: list) -> bool:
-    """检查函数参数"""
+# def check_arguments(data: list) -> bool:
+#     """检查函数参数"""
 
-    # data 示例: [(name, str, "name"), (age, int, "age")]
+#     # data 示例: [(name, str, "name"), (age, int, "age")]
 
-    try:
-        if not isTrue(data, list):
-            logger.error(f"argument error: data {type(data)}")
-            return False
-        for arg, arg_type, info in data:
-            if not isTrue(arg, arg_type):
-                logger.error(f"argument error: {info} {type(arg)}")
-                return False
-        return True
-    except Exception as e:
-        logger.exception(e)
-        return False
+#     try:
+#         if not isTrue(data, list):
+#             logger.error(f"argument error: data {type(data)}")
+#             return False
+#         for arg, arg_type, info in data:
+#             if not isTrue(arg, arg_type):
+#                 logger.error(f"argument error: {info} {type(arg)}")
+#                 return False
+#         return True
+#     except Exception as e:
+#         logger.exception(e)
+#         return False
 
 
 # --------------------------------------------------------------------------------------------------
@@ -102,10 +102,6 @@ def os_environ(name: str, value: Any = None) -> Any:
     # Python 没有全局变量, 多个文件无法调用同一个变量.
     # 为了解决这个问题, 将变量设置为系统变量, 从而实现多个文件调用同一个变量.
 
-    # 检查参数是否正确
-    if not check_arguments([(name, str, "name")]):
-        return None
-
     try:
 
         # 变量名添加一个前缀, 防止和系统中其它变量名冲突
@@ -144,10 +140,6 @@ def mam_of_numbers(numbers: list | tuple, dest_type: str | None = None) -> tuple
     # numbers 数字列表 (仅支持 list 和 tuple, 不支 set)
     # dest_type 目标类型 (将数字列表中的数字转换成统一的类型)
 
-    # 检查参数是否正确
-    if not check_arguments([(numbers, (list, tuple), "numbers")]):
-        return None
-
     if not any([isTrue(dest_type, str), dest_type is None]):
         logger.error("argument error: dest_type")
         return None
@@ -184,9 +176,7 @@ def mam_of_numbers(numbers: list | tuple, dest_type: str | None = None) -> tuple
 # --------------------------------------------------------------------------------------------------
 
 
-def step_number_for_split_equally(
-    integer: int, split_equally_number: int
-) -> int | None:
+def step_number_for_split_equally(integer: int, split_equally_number: int) -> int | None:
     """
     step number for split equally
 
@@ -218,11 +208,6 @@ def step_number_for_split_equally(
 
 def division(dividend: int | float, divisor: int | float) -> float | None:
     """Division"""
-    # 检查参数是否正确
-    if not check_arguments(
-        [(dividend, (int, float), "dividend"), (divisor, (int, float), "divisor")]
-    ):
-        return None
     try:
         return dividend / divisor
     except Exception as e:
@@ -238,12 +223,6 @@ def format_float(number: float | int, index: int = 2, limit: int = 3) -> float |
 
     # 以两位和三位为例, 如果结果为假, 即: 0, 0.0, 0.00 等，保留小数点后的三位, 否则保留小数点后的两位.
 
-    # 检查参数
-    if not check_arguments(
-        [(number, (float, int), "number"), (index, int, "index"), (limit, int, "limit")]
-    ):
-        return False
-
     try:
         rounded_float = round(number, index)
         return rounded_float if bool(rounded_float) else round(number, limit)
@@ -261,10 +240,6 @@ def check_file_type(file_object: str, file_type: str) -> bool:
     # file_object 文件对象
     # file_type 文件类型
 
-    # 检查参数是否正确
-    if not check_arguments([(file_object, str, "file"), (file_type, str, "file_type")]):
-        return False
-
     try:
 
         _file_path = Path(file_object)
@@ -274,9 +249,7 @@ def check_file_type(file_object: str, file_type: str) -> bool:
                 result = False
             case True if file_type == "absolute" and _file_path.is_absolute() is True:
                 result = True
-            case True if (
-                file_type == "block_device" and _file_path.is_block_device() is True
-            ):
+            case True if file_type == "block_device" and _file_path.is_block_device() is True:
                 result = True
             case True if file_type == "dir" and _file_path.is_dir() is True:
                 result = True
@@ -370,10 +343,6 @@ def list_split(data: list, number: int, equally: bool = False) -> list | None:
     #   list_split(data, 2, True) -> [[1, 2, 3, 4], [5, 6, 7, 8]]   将 data 平均分成 2个子list
     #   list_split(data, 3, True) -> [[1, 2, 3], [4, 5, 6], [7, 8]] 将 data 平均分成 3个子list
 
-    # 检查参数是否正确
-    if not check_arguments([(data, list, "data"), (number, int, "number")]):
-        return None
-
     try:
 
         # 要将列表平均分成 n 个子列表
@@ -384,9 +353,7 @@ def list_split(data: list, number: int, equally: bool = False) -> list | None:
 
         # 将列表按每 n 个元素为一个列表进行分割
         it = iter(data)
-        return [
-            list(islice(it, number)) for _ in range((len(data) + number - 1) // number)
-        ]
+        return [list(islice(it, number)) for _ in range((len(data) + number - 1) // number)]
 
     except Exception as e:
         logger.exception(e)
@@ -396,12 +363,6 @@ def list_split(data: list, number: int, equally: bool = False) -> list | None:
 def list_print_by_step(data: list, step: int, separator: str = " ") -> bool:
     """根据 步长 和 分隔符 有规律的打印列表中的数据"""
 
-    # 检查参数是否正确
-    if not check_arguments(
-        [(data, list, "data"), (step, int, "step"), (separator, str, "separator")]
-    ):
-        return False
-
     try:
 
         # 打印
@@ -789,9 +750,7 @@ def datetime_now(**kwargs) -> datetime | None:
         return None
 
 
-def datetime_offset(
-    datetime_instance: datetime | None = None, **kwargs
-) -> datetime | None:
+def datetime_offset(datetime_instance: datetime | None = None, **kwargs) -> datetime | None:
     """
     获取 '向前或向后特定日期时间' 的日期和时间
 
@@ -812,9 +771,7 @@ def datetime_offset(
         return None
 
 
-def datetime_to_string(
-    datetime_instance: datetime, string_format: str = "%Y-%m-%d %H:%M:%S"
-) -> str | None:
+def datetime_to_string(datetime_instance: datetime, string_format: str = "%Y-%m-%d %H:%M:%S") -> str | None:
     """'日期时间'转换为'字符串'"""
     try:
         if not isTrue(datetime_instance, datetime):
@@ -834,19 +791,13 @@ def datetime_to_timestamp(datetime_instance: datetime, utc: bool = False) -> int
     try:
         if not isTrue(datetime_instance, datetime):
             return None
-        return (
-            int(datetime_instance.replace(tzinfo=timezone.utc).timestamp())
-            if utc is True
-            else int(datetime_instance.timestamp())
-        )
+        return int(datetime_instance.replace(tzinfo=timezone.utc).timestamp()) if utc is True else int(datetime_instance.timestamp())
     except Exception as e:
         logger.exception(e)
         return None
 
 
-def datetime_local_to_timezone(
-    datetime_instance: datetime, tz: timezone = timezone.utc
-) -> datetime | None:
+def datetime_local_to_timezone(datetime_instance: datetime, tz: timezone = timezone.utc) -> datetime | None:
     """
     Local datetime to TimeZone datetime(默认转换为 UTC datetime)
     replace(tzinfo=None) 移除结尾的时区信息
@@ -854,9 +805,7 @@ def datetime_local_to_timezone(
     try:
         if not isTrue(datetime_instance, datetime):
             return None
-        return (datetime.fromtimestamp(datetime_instance.timestamp(), tz=tz)).replace(
-            tzinfo=None
-        )
+        return (datetime.fromtimestamp(datetime_instance.timestamp(), tz=tz)).replace(tzinfo=None)
     except Exception as e:
         logger.exception(e)
         return None
@@ -873,20 +822,14 @@ def datetime_utc_to_timezone(
     try:
         if not isTrue(datetime_instance, datetime):
             return None
-        return (
-            datetime_instance.replace(tzinfo=timezone.utc)
-            .astimezone(tz)
-            .replace(tzinfo=None)
-        )
+        return datetime_instance.replace(tzinfo=timezone.utc).astimezone(tz).replace(tzinfo=None)
 
     except Exception as e:
         logger.exception(e)
         return None
 
 
-def timestamp_to_datetime(
-    timestamp: int, tz: timezone = timezone.utc
-) -> datetime | None:
+def timestamp_to_datetime(timestamp: int, tz: timezone = timezone.utc) -> datetime | None:
     """Unix Timestamp 转换为 Datatime"""
     try:
         if not isTrue(timestamp, int):
@@ -897,9 +840,7 @@ def timestamp_to_datetime(
         return None
 
 
-def datetime_string_to_datetime(
-    datetime_string: str, datetime_format: str = "%Y-%m-%d %H:%M:%S"
-) -> datetime | None:
+def datetime_string_to_datetime(datetime_string: str, datetime_format: str = "%Y-%m-%d %H:%M:%S") -> datetime | None:
     """datetime string to datetime"""
     try:
         if not isTrue(datetime_string, str):
@@ -910,9 +851,7 @@ def datetime_string_to_datetime(
         return None
 
 
-def datetime_string_to_timestamp(
-    datetime_string: str, datetime_format: str = "%Y-%m-%d %H:%M:%S"
-) -> int | None:
+def datetime_string_to_timestamp(datetime_string: str, datetime_format: str = "%Y-%m-%d %H:%M:%S") -> int | None:
     """datetime string to timestamp"""
     try:
         if not isTrue(datetime_string, str):
@@ -972,11 +911,7 @@ def shell(
 
         # 构造命令
         if isfile:
-            args = (
-                [sh_shell, command]
-                if sh_option is None
-                else [sh_shell, sh_option, command]
-            )
+            args = [sh_shell, command] if sh_option is None else [sh_shell, sh_option, command]
         else:
             sh_option = sh_option or "-c"
             args = [sh_shell, sh_option, command]
@@ -1158,25 +1093,15 @@ def processor(
 
     try:
 
-        # 检查参数
-        if not check_arguments([(process_data, list, "process_data")]):
-            return False
-
         # 确保并行数不超过数据量
         process_num = min(len(process_data), process_num)
-        data_chunks = (
-            list_split(process_data, process_num, equally=True)
-            if process_num > 1
-            else [process_data]
-        )
+        data_chunks = list_split(process_data, process_num, equally=True) if process_num > 1 else [process_data]
 
         if not data_chunks:
             logger.error("data chunks error")
             return False
 
-        logger.info(
-            f"Starting {'multi-threading' if thread else 'multi-processing'} with {process_num} workers..."
-        )
+        logger.info(f"Starting {'multi-threading' if thread else 'multi-processing'} with {process_num} workers...")
 
         # 执行多线程或多进程任务
         pool = ThreadPoolExecutor if thread else ProcessPoolExecutor
@@ -1342,8 +1267,6 @@ def url_parse(
     """URL Parse"""
     # none_result = ParseResult(scheme='', netloc='', path='', params='', query='', fragment='')
     try:
-        if not check_arguments([(url, str, "url_parse -> url")]):
-            return None
         # 如果没有 scheme 的话, 字符串是不解析的. 所以, 如果没有 scheme, 就添加一个 scheme, 默认添加 http
         # if isTrue(url, str) and (url.find('://') == -1) and isTrue(scheme, str):
         #     url = f'{scheme}://{url}'
@@ -1388,15 +1311,6 @@ def markdown_to_html(markdown_file: str, html_file: str, title: str) -> bool:
 
         logger.info(f"{info} [开始]")
 
-        if not check_arguments(
-            [
-                (markdown_file, str, "markdown_to_html -> markdown_file"),
-                (html_file, str, "markdown_to_html -> html_file"),
-                (title, str, "markdown_to_html -> title"),
-            ]
-        ):
-            return False
-
         # 读取 HTML模版 文件
         logger.info(f"{info} [读取 HTML模版 文件]")
         html_template_file = f"{current_dir(__file__)}/markdown_to_html.template"

{ezkit-1.12.1.dist-info → ezkit-1.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.1
+Version: 1.12.2
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.12.1.dist-info → ezkit-1.12.2.dist-info}/RECORD

@@ -3,20 +3,20 @@ ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
 ezKit/bottle.py,sha256=43h4v1kzz6qrLvCt5IMN0H-gFtaT0koG9wETqteXsps,181666
 ezKit/bottle_extensions.py,sha256=27rogmfK7mL2qUSjXH79IMGZbCVULtYEikql_N9O6Zs,1165
 ezKit/cipher.py,sha256=7jBarRH7ukSYzkz-Anl8B8JzluhnRz4CLHidPRRj_cg,2939
-ezKit/database.py,sha256=6mfH--zRk2xwjlaqfxEWCeX-9HczMYk2dSnsRkjzpFk,12502
+ezKit/database.py,sha256=InFkXoh9eNLQG-y5EGJ1nhiUjZfAQ4XAblGLQnGZXZE,12165
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
 ezKit/mongo.py,sha256=vsRCjJ2uWbNp-1bnGKICPohNYx25El8XnHp10o-lsM4,2397
-ezKit/qywx.py,sha256=Nc4HTzWia6PsngUcoxJa8FX6-gzAo3XIqBC2IFTrbjA,10797
+ezKit/qywx.py,sha256=3SMm63xJw7Yrj67rvvHIH0ot5PbRHtohShqXLcH0BF0,10325
 ezKit/redis.py,sha256=leAre527XDBmA_FsjlqQ2_JT1eqwM9uvpYid1Ir1Va4,1972
 ezKit/sendemail.py,sha256=xqlFyRp96zggSN3eF3fCBXi0WMwGbOZxwDWkpQMCn9I,7412
 ezKit/token.py,sha256=Ac-i9xfq4TqpGyfCzakjrh4NYzxHiN2sCQrMk1tzVi8,1716
-ezKit/utils.py,sha256=wyh3lNTG2fJ-a-lszNZUoSluEC5V8Y9cs1JiAVI6D_A,44243
+ezKit/utils.py,sha256=VyAw2yEs15VER9RCpMgskx1l0zrSpRlV34X___eOia0,42416
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.1.dist-info/METADATA,sha256=tNwfMN1cWo0bSyTv7WCBubgTscvf7f9HLDeJi74e6OM,316
-ezkit-1.12.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-ezkit-1.12.1.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.1.dist-info/RECORD,,
+ezkit-1.12.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.2.dist-info/METADATA,sha256=yrZHrtCA_1Nhn0-iAshHHl18yDLh0SvBpnkIGqTnnSw,316
+ezkit-1.12.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.2.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.2.dist-info/RECORD,,

{ezkit-1.12.1.dist-info → ezkit-1.12.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any