ezKit 1.9.1__py3-none-any.whl → 1.9.2__py3-none-any.whl

ezKit/stock.py

@@ -1,60 +1,113 @@
 """股票"""
+import re
 from copy import deepcopy
-from typing import Any
 
 from loguru import logger
+from pandas import DataFrame
 
 from . import utils
 
 
 def coderename(target: str | dict, restore: bool = False) -> str | dict | None:
-    """
-    正向:
-        coderename('000001') => 'sz000001'
-        coderename({'code': '000001', 'name': '平安银行'}) => {'code': 'sz000001', 'name': '平安银行'}
-    反向:
-        coderename('sz000001', restore=True) => '000001'
-        coderename({'code': 'sz000001', 'name': '平安银行'}) => {'code': '000001', 'name': '平安银行'}
-    """
+    """代码重命名"""
+
+    # 正向:
+    #     coderename('000001') => 'sz000001'
+    #     coderename({'code': '000001', 'name': '平安银行'}) => {'code': 'sz000001', 'name': '平安银行'}
+    # 反向:
+    #     coderename('sz000001', restore=True) => '000001'
+    #     coderename({'code': 'sz000001', 'name': '平安银行'}) => {'code': '000001', 'name': '平安银行'}
+
+    # 判断参数类型
+    match True:
+        case True if True not in [isinstance(target, str), isinstance(target, dict)]:
+            logger.error("argument type error: target")
+            return None
+        case _:
+            pass
+
+    # 判断参数数据
+    match True:
+        case True if True not in [utils.isTrue(target, str), utils.isTrue(target, dict)]:
+            logger.error("argument data error: data")
+            return None
+        case _:
+            pass
 
     try:
 
-        _object: Any = None
-        _code_name: Any = None
+        # 初始化
+        code_object: dict = {}
+        code_name: str | dict = ""
 
         # 判断 target 是 string 还是 dictionary
         if isinstance(target, str) and utils.isTrue(target, str):
-            _code_name = target
+            code_name = target
         elif isinstance(target, dict) and utils.isTrue(target, dict):
-            _object = deepcopy(target)
-            _code_name = str(deepcopy(target["code"]))
+            code_object = deepcopy(target)
+            code_name = str(deepcopy(target["code"]))
         else:
             return None
 
         # 是否还原
-        if restore:
-            if len(_code_name) == 8 and ("sh" in _code_name or "sz" in _code_name):
-                _code_name = _code_name[2:8]
+        if utils.isTrue(restore, bool):
+            if len(code_name) == 8 and re.match(r"^(sz|sh)", code_name):
+                code_name = deepcopy(code_name[2:8])
             else:
                 return None
         else:
-            if _code_name[0:2] == "00":
-                _code_name = "sz" + _code_name
-            elif _code_name[0:2] == "60":
-                _code_name = "sh" + _code_name
+            if code_name[0:2] == "00":
+                code_name = f"sz{code_name}"
+            elif code_name[0:2] == "60":
+                code_name = f"sh{code_name}"
             else:
                 return None
 
         # 返回结果
         if utils.isTrue(target, str):
-            return _code_name
+            return code_name
 
         if utils.isTrue(target, dict):
-            _object["code"] = _code_name
-            return _object
+            code_object["code"] = code_name
+            return code_object
 
         return None
 
     except Exception as e:
         logger.exception(e)
         return None
+
+
+# --------------------------------------------------------------------------------------------------
+
+
+def kdj_vector(df: DataFrame, cp: int = 9, sp1: int = 3, sp2: int = 3) -> DataFrame | None:
+    """KDJ计算器"""
+
+    # 计算周期：Calculation Period, 也可使用 Lookback Period 表示回溯周期, 指用于计算指标值的时间周期.
+    # 移动平均周期: Smoothing Period 或 Moving Average Period, 指对指标进行平滑处理时采用的周期.
+    # 同花顺默认参数: 9 3 3
+    # https://www.daimajiaoliu.com/daima/4ed4ffa26100400
+    # 说明: KDJ 指标的中文名称又叫随机指标, 融合了动量观念、强弱指标和移动平均线的一些优点, 能够比较迅速、快捷、直观地研判行情, 被广泛用于股市的中短期趋势分析.
+    # 有采用 ewm 使用 com=2 的, 但是如果使用 com=2 在默认值的情况下KDJ值是正确的.
+    # 但是非默认值, 比如调整参数, 尝试慢速 KDJ 时就不对了, 最终采用 alpha = 1/m 的情况, 对比同花顺数据, 是正确的.
+
+    # 判断参数类型
+    match True:
+        case True if not isinstance(df, DataFrame):
+            logger.error("argument type error: df")
+            return None
+        case _:
+            pass
+
+    try:
+        low_list = df['low'].rolling(cp).min()
+        high_list = df['high'].rolling(cp).max()
+        rsv = (df['close'] - low_list) / (high_list - low_list) * 100
+        df['K'] = rsv.ewm(alpha=1 / sp1, adjust=False).mean()
+        df['D'] = df['K'].ewm(alpha=1 / sp2, adjust=False).mean()
+        df['J'] = (3 * df['K']) - (2 * df['D'])
+        return df
+    except Exception as e:
+        logger.exception(e)
+        return None

ezKit/utils.py

@@ -35,23 +35,21 @@ def isTrue(
     true_list: list | tuple | set | str | None = None,
     false_list: list | tuple | set | str | None = None
 ) -> bool:
-    """
-    检查对象类型以及对象数据是否为 True
-
-    常见类型:
-
-        Boolean     bool            False
-        Numbers     int/float       0/0.0
-        String      str             ""
-        List        list/tuple/set  []/()/{}
-        Dictionary  dict            {}
-
-    查看变量类型: type(x)
+    """检查对象类型以及对象数据是否为 True"""
 
-    判断变量类型: isinstance(x, str)
-
-    函数使用 callable(func) 判断
-    """
+    # 常见类型:
+    #
+    #     Boolean     bool            False
+    #     Numbers     int/float       0/0.0
+    #     String      str             ""
+    #     List        list/tuple/set  []/()/{}
+    #     Dictionary  dict            {}
+    #
+    # 查看变量类型: type(x)
+    #
+    # 判断变量类型: isinstance(x, str)
+    #
+    # 函数使用 callable(func) 判断
 
     try:
 
@@ -411,9 +409,33 @@ def list_print_by_step(
     step: int,
     separator: str = " "
 ) -> bool:
-    """
-    根据 步长 和 分隔符 有规律的打印列表中的数据
-    """
+    """根据 步长 和 分隔符 有规律的打印列表中的数据"""
+
+    # 判断参数类型
+    match True:
+        case True if not isinstance(data, list):
+            logger.error("argument type error: data")
+            return False
+        case True if not isinstance(step, int):
+            logger.error("argument type error: step")
+            return False
+        case True if not isinstance(separator, str):
+            logger.error("argument type error: separator")
+            return False
+        case _:
+            pass
+
+    # 判断参数数据
+    match True:
+        case True if not isTrue(data, list):
+            logger.error("argument data error: data")
+            return False
+        case True if not isTrue(step, int):
+            logger.error("argument data error: step")
+            return False
+        case _:
+            pass
+
     try:
 
         # result: list = []
@@ -431,31 +453,6 @@ def list_print_by_step(
 
         # return True
 
-        # 判断参数类型
-        match True:
-            case True if isinstance(data, list) is False:
-                logger.error("argument type error: data")
-                return False
-            case True if isinstance(step, int) is False:
-                logger.error("argument type error: step")
-                return False
-            case True if isinstance(separator, str) is False:
-                logger.error("argument type error: separator")
-                return False
-            case _:
-                pass
-
-        # 判断参数数据
-        match True:
-            case True if not isTrue(data, list):
-                logger.error("argument error: data")
-                return False
-            case True if not isTrue(step, int):
-                logger.error("argument error: step")
-                return False
-            case _:
-                pass
-
         # 打印
         for i, v in enumerate(data):
             if i > 0 and i % step == 0:

{ezKit-1.9.1.dist-info → ezKit-1.9.2.dist-info}/METADATA

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

{ezKit-1.9.1.dist-info → ezKit-1.9.2.dist-info}/RECORD

@@ -9,12 +9,12 @@ ezKit/mongo.py,sha256=5KDDYQnOE3lw4QJlLp-EAuzbKM6VzbU0w0GR9iklldA,2379
 ezKit/qywx.py,sha256=X_H4fzP-iEqeDEbumr7D1bXi6dxczaxfO8iyutzy02s,7171
 ezKit/redis.py,sha256=5TQ7s8fkc-ArXuHT5gOlkR0EBgm3Z-9yTTtS1BgI5Qk,1951
 ezKit/sendemail.py,sha256=3YyBqFHPDZl9CwgWtmGABubARE_ih8P473mIcEp5VsY,8193
-ezKit/stock.py,sha256=lVzIL1BeB-7Stsm-xToTF7ivZiujozmKKpLErAIN3_A,1730
+ezKit/stock.py,sha256=_gWighuVzqSub4GRnN-X_9TVY7kUEYvKHKdbYJPYSYE,4001
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=H130-ITDTmd4jwiie6pdyv20mPOk0KZxBcgmtey4rf4,43005
+ezKit/utils.py,sha256=q6DbXJNgC6sqzjqUPmxbiSiiXqiQFCVnI3jp_zi1ujs,42927
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.9.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.9.1.dist-info/METADATA,sha256=Jj9sOr2ut2eUgx6kVPqYkgZPmhQlnQHNltlRFxfqXY4,190
-ezKit-1.9.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.9.1.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.9.1.dist-info/RECORD,,
+ezKit-1.9.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.9.2.dist-info/METADATA,sha256=ZoiSVL8T2mtsb9ZxR61cHS8dGvixGvGS5lUui0Y5e8M,190
+ezKit-1.9.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.9.2.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.9.2.dist-info/RECORD,,