ezKit 1.9.9__py3-none-any.whl → 1.9.11__py3-none-any.whl

ezKit/stock.py

@@ -94,16 +94,17 @@ def kdj_vector(
     # 有采用 ewm 使用 com=2 的, 但是如果使用 com=2 在默认值的情况下KDJ值是正确的.
     # 但是非默认值, 比如调整参数, 尝试慢速 KDJ 时就不对了, 最终采用 alpha = 1/m 的情况, 对比同花顺数据, 是正确的.
 
-    # 判断参数是否正确
-    match True:
-        case True if not utils.isTrue(df, DataFrame):
-            logger.error("argument error: df")
-            return None
-        case True if not any([utils.isTrue(kdj_options, tuple), all(utils.isTrue(item, int) for item in kdj_options)]):
-            logger.error("argument error: kdj_options")
-            return None
-        case _:
-            pass
+    # 检查参数
+    if isinstance(df, DataFrame) and df.empty:
+        logger.error("argument error: df")
+        return None
+
+    if not utils.check_arguments([(kdj_options, tuple, "kdj_options")]):
+        return None
+
+    if not all(utils.isTrue(item, int) for item in kdj_options):
+        logger.error("argument error: kdj_options")
+        return None
 
     try:
         low_list = df['low'].rolling(kdj_options[0]).min()
@@ -128,25 +129,23 @@ def data_vector(
 ) -> DataFrame | None:
     """数据运算"""
 
-    # 判断参数是否正确
-    match True:
-        case True if not utils.isTrue(df, DataFrame):
-            logger.error("argument error: df")
-            return None
-        case True if not any([utils.isTrue(macd_options, tuple), all(utils.isTrue(item, int) for item in macd_options)]):
-            logger.error("argument error: macd_options")
-            return None
-        case True if not any([utils.isTrue(kdj_options, tuple), all(utils.isTrue(item, int) for item in kdj_options)]):
-            logger.error("argument error: kdj_options")
-            return None
-        case _:
-            pass
+    # 检查参数
+    if isinstance(df, DataFrame) and df.empty:
+        logger.error("argument error: df")
+        return None
 
-    try:
+    if not utils.check_arguments([(macd_options, tuple, "macd_options"), (kdj_options, tuple, "kdj_options")]):
+        return None
 
-        # 数据为空
-        if isinstance(df, DataFrame) and df.empty:
-            return None
+    if not all(utils.isTrue(item, int) for item in macd_options):
+        logger.error("argument error: macd_options")
+        return None
+
+    if not all(utils.isTrue(item, int) for item in kdj_options):
+        logger.error("argument error: kdj_options")
+        return None
+
+    try:
 
         # ------------------------------------------------------------------------------------------
 
@@ -174,7 +173,13 @@ def data_vector(
         # ------------------------------------------------------------------------------------------
 
         # 计算 MACD: 默认参数 12 26 9
-        macd_dif, macd_dea, macd_bar = ta.MACD(df['close'].values, fastperiod=macd_options[0], slowperiod=macd_options[1], signalperiod=macd_options[2])  # type: ignore
+        macd_dif, macd_dea, macd_bar = ta.MACD(  # type: ignore
+            df['close'].values,
+            fastperiod=macd_options[0],
+            slowperiod=macd_options[1],
+            signalperiod=macd_options[2]
+        )
+
         macd_dif[np.isnan(macd_dif)], macd_dea[np.isnan(macd_dea)], macd_bar[np.isnan(macd_bar)] = 0, 0, 0
 
         # https://www.bilibili.com/read/cv10185856
@@ -182,15 +187,26 @@ def data_vector(
         df['MACD_DIF'] = macd_dif
         df['MACD_DEA'] = macd_dea
 
-        # MACD 金叉死叉: 0 无, 1 金叉, 2 死叉
+        # 初始化 MACD_X 列(0 无, 1 金叉, 2 死叉)
         df['MACD_X'] = 0
+
+        # 计算 MACD 条件
         macd_position = df['MACD_DIF'] > df['MACD_DEA']
-        df.loc[macd_position[(macd_position is True) & (macd_position.shift() is False)].index, 'MACD_X'] = 1  # type: ignore
-        df.loc[macd_position[(macd_position is False) & (macd_position.shift() is True)].index, 'MACD_X'] = 2  # type: ignore
+
+        # 设置 MACD_X = 1: 从 False 变为 True 的位置
+        df.loc[macd_position & ~macd_position.shift(fill_value=False), 'MACD_X'] = 1
+
+        # 设置 MACD_X = 2: 从 True 变为 False 的位置
+        df.loc[~macd_position & macd_position.shift(fill_value=False), 'MACD_X'] = 2
+
+        # 将浮点数限制为小数点后两位
+        df['MACD'] = df['MACD'].round(2)
+        df['MACD_DIF'] = df['MACD_DIF'].round(2)
+        df['MACD_DEA'] = df['MACD_DEA'].round(2)
 
         # ------------------------------------------------------------------------------------------
 
-        # 计算 KDJ: : 默认参数 9 3 3
+        # # 计算 KDJ: : 默认参数 9 3 3
         kdj_data = kdj_vector(df, kdj_options)
 
         if kdj_data is not None:
@@ -200,11 +216,22 @@ def data_vector(
             df['D'] = kdj_data['D'].values
             df['J'] = kdj_data['J'].values
 
-            # KDJ 金叉死叉: 0 无, 1 金叉, 2 死叉
+            # 初始化 KDJ_X 列(0 无, 1 金叉, 2 死叉)
             df['KDJ_X'] = 0
+
+            # 计算 MACD 条件
             kdj_position = df['J'] > df['D']
-            df.loc[kdj_position[(kdj_position is True) & (kdj_position.shift() is False)].index, 'KDJ_X'] = 1  # type: ignore
-            df.loc[kdj_position[(kdj_position is False) & (kdj_position.shift() is True)].index, 'KDJ_X'] = 2  # type: ignore
+
+            # 设置 KDJ_X = 1: 从 False 变为 True 的位置
+            df.loc[kdj_position & ~kdj_position.shift(fill_value=False), 'KDJ_X'] = 1
+
+            # 设置 KDJ_X = 2: 从 True 变为 False 的位置
+            df.loc[~kdj_position & kdj_position.shift(fill_value=False), 'KDJ_X'] = 2
+
+            # 将浮点数限制为小数点后两位
+            df['K'] = df['K'].round(2)
+            df['D'] = df['D'].round(2)
+            df['J'] = df['J'].round(2)
 
         # ------------------------------------------------------------------------------------------
 
@@ -261,12 +288,10 @@ def get_stock_data_from_akshare(
             "收盘": "close",
             "最高": "high",
             "最低": "low",
-            "成交量": "volume",
-            "成交额": "turnover"
+            "成交量": "volume"
         })
-        df = df.round({'turnover': 4})
         logger.success(f"{info} [成功]")
-        return df[['date', 'open', 'close', 'high', 'low', 'volume', 'turnover']].copy()
+        return df[['date', 'open', 'close', 'high', 'low', 'volume']].copy()
     except Exception as e:
         logger.error(f"{info} [失败]")
         logger.exception(e)

ezKit/utils.py

@@ -30,15 +30,10 @@ NoneType = type(None)
 # --------------------------------------------------------------------------------------------------
 
 
-def isTrue(
-    object_data: Any,
-    object_type: Any = None,
-    true_list: list | tuple | set | str | None = None,
-    false_list: list | tuple | set | str | None = None
-) -> bool:
-    """检查对象类型以及对象数据是否为 True"""
+def isTrue(target: object, typeClass: Any) -> bool:
+    """检查对象是否为真"""
 
-    # 常见类型:
+    # 常见布尔类型:
     #
     #     Boolean     bool            False
     #     Numbers     int/float       0/0.0
@@ -60,44 +55,33 @@ def isTrue(
     # all() 用于检查一个可迭代对象(如列表、元组、集合等)中的 所有 元素是否为 真值 (truthy), 所有元素为真, 返回 True
     # any() 用于检查一个可迭代对象(如列表、元组、集合等)中的 某个 元素是否为 真值 (truthy), 某个元素为真, 返回 True
     # 与 all() 作用相反的 not any(), 可以用来检查所有元素是否为 假值 (falsy), any() 中所有元素为假, not any() 返回 True
+    #
+    # return target not in [False, None, 0, 0.0, '', (), [], {}, {*()}, {*[]}, {*{}}]
 
     try:
+        return isinstance(target, typeClass) and bool(target)
+    except Exception as e:
+        logger.exception(e)
+        return False
 
-        if isinstance(object_data, object_type):
-
-            if all(
-                [
-                    true_list is not None,
-                    false_list is None,
-                    isinstance(true_list, (list, tuple, set, str))
-                ]
-            ):
-                return object_data in true_list
-
-            if all(
-                [
-                    true_list is None,
-                    false_list is not None,
-                    isinstance(false_list, (list, tuple, set, str))
-                ]
-            ):
-                return object_data not in false_list
-
-            if all(
-                [
-                    true_list is not None,
-                    false_list is not None,
-                    isinstance(true_list, (list, tuple, set, str)),
-                    isinstance(false_list, (list, tuple, set, str))
-                ]
-            ):
-                return (object_data in true_list) and (object_data not in false_list)
-
-            # return object_data not in [False, None, 0, 0.0, '', (), [], {}, {*()}, {*[]}, {*{}}]
-            return bool(object_data)
 
-        return False
+# --------------------------------------------------------------------------------------------------
+
+
+def check_arguments(data: list) -> bool:
+    """检查函数参数"""
+
+    # data 示例: [(name, str, "name"), (age, int, "age")]
 
+    try:
+        if not isTrue(data, list):
+            logger.error("argument error: data")
+            return False
+        for arg, arg_type, arg_name in data:
+            if not isTrue(arg, arg_type):
+                logger.error(f"argument error: {arg_name}")
+                return False
+        return True
     except Exception as e:
         logger.exception(e)
         return False
@@ -116,13 +100,9 @@ def os_environ(
     # Python 没有全局变量, 多个文件无法调用同一个变量.
     # 为了解决这个问题, 将变量设置为系统变量, 从而实现多个文件调用同一个变量.
 
-    # 判断参数是否正确
-    match True:
-        case True if not isTrue(name, str):
-            logger.error("argument error: name")
-            return None
-        case _:
-            pass
+    # 检查参数是否正确
+    if not check_arguments([(name, str, "name")]):
+        return None
 
     try:
 
@@ -165,29 +145,24 @@ def mam_of_numbers(
     # numbers 数字列表 (仅支持 list 和 tuple, 不支 set)
     # dest_type 目标类型 (将数字列表中的数字转换成统一的类型)
 
-    # 判断参数是否正确
-    match True:
-        case True if not isTrue(numbers, (list, tuple)):
-            logger.error("argument error: numbers")
-            return None
-        case True if not any([isTrue(dest_type, str), dest_type is None]):
-            logger.error("argument error: dest_type")
-            return None
-        case _:
-            pass
+    # 检查参数是否正确
+    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
 
     try:
 
         _numbers = deepcopy(numbers)
 
         # 转换数据类型
-        match True:
-            case True if dest_type == "float":
-                _numbers = [float(i) for i in numbers]
-            case True if dest_type == "int":
-                _numbers = [int(i) for i in numbers]
-            case _:
-                pass
+        if dest_type == "float":
+            _numbers = [float(i) for i in numbers]
+
+        if dest_type == "int":
+            _numbers = [int(i) for i in numbers]
 
         # 提取数据
         _num_max = max(_numbers)
@@ -248,6 +223,9 @@ def division(
     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:
@@ -262,14 +240,15 @@ def check_file_type(
     file_object: str,
     file_type: str
 ) -> bool:
-    """
-    check file type
+    """检查文件类型"""
 
-    检查文件类型
+    # file_object 文件对象
+    # file_type 文件类型
+
+    # 检查参数是否正确
+    if not check_arguments([(file_object, str, "file"), (file_type, str, "file_type")]):
+        return False
 
-        file_object 文件对象
-        file_type 文件类型
-    """
     try:
 
         _file_path = Path(file_object)

{ezKit-1.9.9.dist-info → ezKit-1.9.11.dist-info}/METADATA

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

{ezKit-1.9.9.dist-info → ezKit-1.9.11.dist-info}/RECORD

@@ -9,12 +9,12 @@ ezKit/mongo.py,sha256=dOm_1wXEPp_e8Ml5Qq78M7FDNrQUAZaThzVIiiLJJwk,2393
 ezKit/qywx.py,sha256=X_H4fzP-iEqeDEbumr7D1bXi6dxczaxfO8iyutzy02s,7171
 ezKit/redis.py,sha256=g2_V4jvq0djRc20jLZkgeAeF_bYrq-Rbl_kHcCUPZcA,1965
 ezKit/sendemail.py,sha256=tRXCsJm_RfTJ9xEWe_lTQ5kOs2JxHGPXvq0oWA7prq0,7263
-ezKit/stock.py,sha256=cbL0ZXCur4G290wFN5ynmLmMjgDRNSvVQgsE_0jSQKU,11802
+ezKit/stock.py,sha256=J-fM2XH2q7G6-Q30N8clqLIv7sSn87_fN1qjLOiTrFk,12088
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=H-VaWzH1TkpJe_lpPBW2yaP6R7NElDbHRTsByRj_t9w,43234
+ezKit/utils.py,sha256=TDsL3PRkQy6NdZgphkgwacbWvHqEmq4LOkfNzmxV4DY,42682
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.9.9.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.9.9.dist-info/METADATA,sha256=i9NRcyP11nSCxo9bCngbdreKObAoIebkPJz5Sh1EiR0,190
-ezKit-1.9.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.9.9.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.9.9.dist-info/RECORD,,
+ezKit-1.9.11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.9.11.dist-info/METADATA,sha256=O05DZpUqxTH6u_llpwm7s7FCxb1EgTqMwX_xjYx3fcw,191
+ezKit-1.9.11.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.9.11.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.9.11.dist-info/RECORD,,