ezKit 1.9.7__tar.gz → 1.9.9__tar.gz

{ezkit-1.9.7/ezKit.egg-info → ezkit-1.9.9}/PKG-INFO

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

{ezkit-1.9.7 → ezkit-1.9.9}/ezKit/database.py

@@ -101,19 +101,17 @@ class Database():
         csv_file: str | None = None,
         csv_file_kwargs: dict | None = None
     ) -> CursorResult[Any] | bool:
-        """
-        echo 是否打印日志
-        某些情况下只需要结果, 不需要日志, 将 echo 设置为 False 即可
-        """
-
-        # info_prefix = '[Execute SQL]'
+        """"运行"""
 
         # ------------------------------------------------------------
 
         # 提取 SQL
         # 如果 sql 和 sql_file 同时存在, 优先执行 sql
+
         sql_object = None
-        info: str = "Extract SQL"
+
+        info: str = f"""Extract SQL: {sql}"""
+
         try:
 
             logger.info(f"{info} ......")
@@ -157,7 +155,9 @@ class Database():
         # ------------------------------------------------------------
 
         # 执行 SQL
-        info: str = "Execute SQL"
+
+        info = f"""Execute SQL: {sql_object}"""
+
         try:
 
             logger.info(f"{info} ......")
@@ -170,6 +170,8 @@ class Database():
 
                 result = connect.execute(text(sql_object))
 
+                connect.commit()
+
                 if csv_file is None:
                     # 如果 csv_file 没有定义, 则直接返回结果
                     logger.success(f'{info} [success]')

{ezkit-1.9.7 → ezkit-1.9.9}/ezKit/utils.py

@@ -8,6 +8,7 @@ import subprocess
 import time
 import tomllib
 from copy import deepcopy
+from itertools import islice
 from multiprocessing import Pool, Process
 from multiprocessing.pool import ThreadPool
 from pathlib import Path
@@ -352,90 +353,57 @@ def list_dict_sorted_by_key(
         logger.exception(e)
         return None
 
-
 def list_split(
     data: list,
     number: int,
     equally: bool = False
 ) -> list | None:
-    """list split"""
+    """列表分割"""
+
     # 列表分割
     #
-    # 默认: 将 list 以 number个元素为一个list 分割
-    #
-    #     data = [1, 2, 3, 4, 5, 6, 7]
-    #
-    #     list_split(data, 2) -> 将 data 以 2个元素为一个 list 分割
-    #     [[1, 2], [3, 4], [5, 6], [7]]
+    # 默认: 将 list 以 number 个元素为一个子 list 分割
     #
-    #     list_split(data, 3) -> 将 data 以 3个元素为一个 list 分割
-    #     [[1, 2, 3], [4, 5, 6], [7]]
+    #   data = [1, 2, 3, 4, 5, 6, 7]                                奇数个元素
+    #   list_split(data, 2) -> [[1, 2], [3, 4], [5, 6], [7]]        将 data 以 2个元素 为一个 list 分割
+    #   list_split(data, 3) -> [[1, 2, 3], [4, 5, 6], [7]]          将 data 以 3个元素 为一个 list 分割
     #
-    # equally 为 True 时, 将 data 平均分成 number 份
+    #   data = [1, 2, 3, 4, 5, 6, 7, 8]                             偶数个元素
+    #   list_split(data, 2) -> [[1, 2], [3, 4], [5, 6], [7, 8]]     将 data 以 2个元素 为一个 list 分割
+    #   list_split(data, 3) -> [[1, 2, 3], [4, 5, 6], [7, 8]]       将 data 以 3个元素 为一个 list 分割
     #
-    #     data = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+    # equally 为 True 时, 将 list 平均分成 number 个元素的子 list
     #
-    #     list_split_equally(data, 5) -> 将 data 平均分成 5 份
-    #     [[1, 2, 3, 4], [5, 6, 7, 8], [9, 10, 11, 12], [13, 14, 15, 16], [17, 18, 19]]
+    #   data = [1, 2, 3, 4, 5, 6, 7]                                奇数个元素
+    #   list_split(data, 2, True) -> [[1, 2, 3, 4], [5, 6, 7]]      将 data 平均分成 2个子list
+    #   list_split(data, 3, True) -> [[1, 2, 3], [4, 5, 6], [7]]    将 data 平均分成 3个子list
     #
-    #     list_split_equally(data, 6) -> 将 data 平均分成 6 份
-    #     [[1, 2, 3, 4], [5, 6, 7], [8, 9, 10], [11, 12, 13], [14, 15, 16], [17, 18, 19]]
-    #
-    #     list_split_equally(data, 7) -> 将 data 平均分成 7 份
-    #     [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12], [13, 14, 15], [16, 17], [18, 19]]
-
-    try:
-
-        # 数据拷贝
-        _data_object = deepcopy(data)
+    #   data = [1, 2, 3, 4, 5, 6, 7, 8]                             偶数个元素
+    #   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
 
-        # 数据长度
-        _data_length = len(_data_object)
-
-        # 数据平分后的结果
-        _data_result = []
-
-        _step_number: Optional[int] = None
-
-        if _data_length < number:
+    # 判断参数是否正确
+    match True:
+        case True if not isTrue(data, list):
+            logger.error("argument error: data")
             return None
+        case True if not isTrue(number, int):
+            logger.error("argument error: number")
+            return None
+        case _:
+            pass
 
-        if _data_length == number:
-
-            _data_result = [[i] for i in _data_object]
-
-        else:
-
-            if isTrue(equally, bool):
-
-                _step_number = step_number_for_split_equally(_data_length, number)
-
-                if _data_length % number == 0:
-
-                    index_number_list = list(range(0, _data_length, number))
-                    for index_number in index_number_list:
-                        _data_result.append(deepcopy(_data_object[index_number:index_number + number]))
-
-                else:
-
-                    # 前一部分
-                    if _step_number is not None:
-                        previous_end_number = (_data_length % number) * _step_number
-                        previous_index_number_list = list(range(0, previous_end_number, _step_number))
-                        for index_number in previous_index_number_list:
-                            _data_result.append(deepcopy(_data_object[index_number:index_number + _step_number]))
-
-                        # 后一部分
-                        next_number_list = list(range(previous_end_number, _data_length, _step_number - 1))
-                        for index_number in next_number_list:
-                            _data_result.append(deepcopy(_data_object[index_number:index_number + (_step_number - 1)]))
-
-            else:
+    try:
 
-                for index_number in list(range(0, _data_length, number)):
-                    _data_result.append(deepcopy(_data_object[index_number:index_number + number]))
+        # 要将列表平均分成 n 个子列表
+        if isTrue(equally, bool):
+            it = iter(data)
+            chunk_size = (len(data) + number - 1) // number  # 每组至少多少个元素
+            return [list(islice(it, chunk_size)) for _ in range(number)]
 
-        return _data_result
+        # 将列表按每 n 个元素为一个列表进行分割
+        it = iter(data)
+        return [list(islice(it, number)) for _ in range((len(data) + number - 1) // number)]
 
     except Exception as e:
         logger.exception(e)

{ezkit-1.9.7 → ezkit-1.9.9/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.9.7 → ezkit-1.9.9}/setup.py

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