ezKit 1.9.10__tar.gz → 1.9.12__tar.gz

{ezkit-1.9.10/ezKit.egg-info → ezkit-1.9.12}/PKG-INFO

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

{ezkit-1.9.10 → ezkit-1.9.12}/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)
@@ -292,18 +317,28 @@ def save_data_to_database(engine: Engine, code: str, latest: bool = False) -> bo
 
         logger.info(f"{info} ......")
 
+        # 代码名称转换
+        name = coderename(code)
+
+        if not isinstance(name, str):
+            logger.error(f"{info} [代码名称转换错误]")
+            return False
+
+        # 获取数据
         df: DataFrame | None = get_stock_data_from_akshare(code)
 
         if df is None:
-            logger.error(f"{info} [获取数据失败]")
+            logger.error(f"{info} [获取数据错误]")
             return False
 
-        name = coderename(code)
+        # 计算数据
+        df: DataFrame | None = data_vector(df)
 
-        if not isinstance(name, str):
-            logger.error(f"{info} [代码名称转换失败]")
+        if df is None:
+            logger.error(f"{info} [计算数据错误]")
             return False
 
+        # 保存到数据库
         if utils.isTrue(latest, bool):
             df = df.tail(1)
             df.to_sql(name=name, con=engine, if_exists="append", index=False)

{ezkit-1.9.10 → ezkit-1.9.12/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.9.10 → ezkit-1.9.12}/setup.py

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