ezKit 1.9.4__tar.gz → 1.9.5__tar.gz

{ezkit-1.9.4/ezKit.egg-info → ezkit-1.9.5}/PKG-INFO

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

{ezkit-1.9.4 → ezkit-1.9.5}/ezKit/cls.py

@@ -14,9 +14,13 @@ def up_down_analysis(
 ) -> list | pd.DataFrame | None:
     """涨停跌停数据"""
 
-    if not utils.isTrue(target, str):
-        logger.error(f"error type: {target}")
-        return None
+    # 判断参数是否正确
+    match True:
+        case True if not utils.isTrue(target, str):
+            logger.error("argument error: target")
+            return None
+        case _:
+            pass
 
     info: str = "获取涨停池股票"
     match True:
@@ -113,11 +117,11 @@ def latest_data(
 
     # 判断参数类型
     match True:
-        case True if True not in [isinstance(payload, str), isinstance(payload, dict)]:
-            logger.error("Incorrect function argument type: payload")
+        case True if not utils.isTrue(payload, (str, dict)):
+            logger.error("argument error: payload")
             return None
-        case True if False in [isinstance(data_type, str), utils.isTrue(data_type, str)]:
-            logger.error("Incorrect function argument type: data_type")
+        case True if not utils.isTrue(data_type, str):
+            logger.error("argument error: data_type")
             return None
         case _:
             pass
@@ -273,12 +277,18 @@ def latest_data(
 # --------------------------------------------------------------------------------------------------
 
 
-def plate_codes(plate: str) -> list | None:
+def plate_codes(
+    plate: str
+) -> list | None:
     """获取板块成分股代码"""
 
-    if not utils.isTrue(plate, str):
-        logger.error("Incorrect function argument type: plate")
-        return None
+    # 判断参数是否正确
+    match True:
+        case True if not utils.isTrue(plate, str):
+            logger.error("argument error: plate")
+            return None
+        case _:
+            pass
 
     info: str = "获取板块成分股代码"
 

{ezkit-1.9.4 → ezkit-1.9.5}/ezKit/sendemail.py

@@ -70,24 +70,6 @@ def sendemail(
         path 图片路径
     """
 
-    # 参数判断
-    # match True:
-    #     case True if utils.vTrue(smtp, dict) == False:
-    #         logger.error('ERROR!! {} is not dictionary or none'.format('smtp'))
-    #         return False
-    #     case True if utils.vTrue(sender, dict) == False:
-    #         logger.error('ERROR!! {} is not dictionary or none'.format('sender'))
-    #         return False
-    #     case True if (utils.vTrue(recipients, str) == False) and (utils.vTrue(recipients, list) == False):
-    #         logger.error('ERROR!! {} is not list or none'.format('recipients'))
-    #         return False
-    #     case True if utils.vTrue(subject, str) == False:
-    #         logger.error('ERROR!! {} is not string or none'.format('subject'))
-    #         return False
-    #     case True if utils.vTrue(html_file, str) == False:
-    #         logger.error('ERROR!! {} is not string or none'.format('html_file'))
-    #         return False
-
     logger.success("sendemail start")
 
     try:

{ezkit-1.9.4 → ezkit-1.9.5}/ezKit/stock.py

@@ -12,7 +12,10 @@ from sqlalchemy.engine import Engine
 from . import utils
 
 
-def coderename(target: str | dict, restore: bool = False) -> str | dict | None:
+def coderename(
+    target: str | dict,
+    restore: bool = False
+) -> str | dict | None:
     """代码重命名"""
 
     # 正向:
@@ -22,18 +25,10 @@ def coderename(target: str | dict, restore: bool = False) -> str | dict | None:
     #     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")
+        case True if not utils.isTrue(target, (str, dict)):
+            logger.error("argument error: target")
             return None
         case _:
             pass
@@ -85,7 +80,10 @@ def coderename(target: str | dict, restore: bool = False) -> str | dict | None:
 # --------------------------------------------------------------------------------------------------
 
 
-def kdj_vector(df: DataFrame, cp: int = 9, sp1: int = 3, sp2: int = 3) -> DataFrame | None:
+def kdj_vector(
+    df: DataFrame,
+    kdj_options: tuple[int, int, int] = (9, 3, 3)
+) -> DataFrame | None:
     """KDJ计算器"""
 
     # 计算周期：Calculation Period, 也可使用 Lookback Period 表示回溯周期, 指用于计算指标值的时间周期.
@@ -96,20 +94,23 @@ def kdj_vector(df: DataFrame, cp: int = 9, sp1: int = 3, sp2: int = 3) -> DataFr
     # 有采用 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")
+        case True if not utils.isTrue(df, DataFrame):
+            logger.error("argument error: df")
+            return None
+        case True if True not in [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
 
     try:
-        low_list = df['low'].rolling(cp).min()
-        high_list = df['high'].rolling(cp).max()
+        low_list = df['low'].rolling(kdj_options[0]).min()
+        high_list = df['high'].rolling(kdj_options[0]).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['K'] = rsv.ewm(alpha=1 / kdj_options[1], adjust=False).mean()
+        df['D'] = df['K'].ewm(alpha=1 / kdj_options[2], adjust=False).mean()
         df['J'] = (3 * df['K']) - (2 * df['D'])
         return df
     except Exception as e:
@@ -127,6 +128,20 @@ 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 True not in [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 True not in [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
+
     try:
 
         # 数据为空
@@ -176,7 +191,7 @@ def data_vector(
         # ------------------------------------------------------------------------------------------
 
         # 计算 KDJ: : 默认参数 9 3 3
-        kdj_data = kdj_vector(df, kdj_options[0], kdj_options[1], kdj_options[2])
+        kdj_data = kdj_vector(df, kdj_options)
 
         if kdj_data is not None:
 
@@ -226,12 +241,29 @@ def get_code_name_from_akshare() -> DataFrame | None:
 # --------------------------------------------------------------------------------------------------
 
 
-def get_stock_data_from_akshare(code: str) -> DataFrame | None:
+def get_stock_data_from_akshare(
+    code: str,
+    adjust: str = "qfq",
+    period: str = "daily",
+    start_date: str = "19700101",
+    end_date: str = "20500101",
+    timeout: float = 10
+) -> DataFrame | None:
     """从 akshare 获取数据"""
     info = f"获取股票所有数据: {code}"
     try:
         logger.info(f"{info} ......")
-        df: DataFrame = ak.stock_zh_a_daily(symbol=code, adjust="qfq")
+        # https://akshare.akfamily.xyz/data/stock/stock.html#id22
+        df: DataFrame = ak.stock_zh_a_hist(symbol=code, adjust=adjust, period=period, start_date=start_date, end_date=end_date, timeout=timeout)
+        df = df.rename(columns={
+            "日期": "date",
+            "开盘": "open",
+            "收盘": "close",
+            "最高": "high",
+            "最低": "low",
+            "成交量": "volume",
+            "成交额": "turnover"
+        })
         df = df.round({'turnover': 4})
         logger.success(f"{info} [成功]")
         return df[['date', 'open', 'close', 'high', 'low', 'volume', 'turnover']].copy()

{ezkit-1.9.4 → ezkit-1.9.5}/ezKit/utils.py

@@ -50,6 +50,11 @@ def isTrue(
     # 判断变量类型: isinstance(x, str)
     #
     # 函数使用 callable(func) 判断
+    #
+    # 判断多个类型:
+    #
+    #   isTrue("abc", (str, int))
+    #   isTrue("abc", (str | int))
 
     try:
 
@@ -100,33 +105,39 @@ def os_environ(
     name: str,
     value: Any = None
 ) -> Any:
-    """
-    系统变量
+    """系统变量"""
+
+    # 伪全局变量
+    # Python 没有全局变量, 多个文件无法调用同一个变量.
+    # 为了解决这个问题, 将变量设置为系统变量, 从而实现多个文件调用同一个变量.
+
+    # 判断参数是否正确
+    match True:
+        case True if not isTrue(name, str):
+            logger.error("argument error: name")
+            return None
+        case _:
+            pass
 
-    伪全局变量
-    Python 没有全局变量, 多个文件无法调用同一个变量.
-    为了解决这个问题, 将变量设置为系统变量, 从而实现多个文件调用同一个变量.
-    """
     try:
 
         # 变量名添加一个前缀, 防止和系统中其它变量名冲突
         _variable_name = f'PYTHON_VARIABLE_{name}'
 
+        # 如果 value 的值是 None, 则从系统环境获取变量数据
         if value is None:
 
             _data = os.environ.get(_variable_name)
 
             # 判断是否有数据
-            if _data:
-                try:
-                    # 如果环境变量有值, 使用 json.loads() 解析
-                    parsed_data = json.loads(_data)
-                    return parsed_data
-                except json.JSONDecodeError:
-                    return None
-            else:
+            if _data is None or not isTrue(_data, str):
                 return None
 
+            # 使用 json.loads() 解析数据
+            parsed_data = json.loads(_data)
+            return parsed_data
+
+        # 如果 value 的值不是 None, 则保存数据到系统环境变量
         _data = json.dumps(value)
         os.environ[_variable_name] = _data
 
@@ -143,29 +154,52 @@ def os_environ(
 def mam_of_numbers(
     numbers: list | tuple,
     dest_type: str | None = None
-) -> tuple[int | float, int | float, int | float] | tuple[None, None, None]:
-    """
-    (maximum, average, minimum)
+) -> tuple | None:
+    """返回一组数字中的 最大值(maximum), 平均值(average), 最小值(minimum)"""
 
-    返回一组数字中的 最大值(maximum), 平均值(average), 最小值(minimum)
-    numbers 数字列表 (仅支持 list 和 tuple, 不支 set)
-    dest_type 目标类型 (将数字列表中的数字转换成统一的类型)
-    """
+    # 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 True not in [isTrue(dest_type, str), dest_type is None]:
+            logger.error("argument error: dest_type")
+            return None
+        case _:
+            pass
 
     try:
+
         _numbers = deepcopy(numbers)
+
+        # 转换数据类型
         match True:
-            case True if dest_type == 'float':
+            case True if dest_type == "float":
                 _numbers = [float(i) for i in numbers]
-            case True if dest_type == 'int':
+            case True if dest_type == "int":
                 _numbers = [int(i) for i in numbers]
+            case _:
+                pass
+
+        # 提取数据
         _num_max = max(_numbers)
-        _num_avg = sum(_numbers) / len(_numbers)
+        _num_avg = f"{sum(_numbers) / len(_numbers):.2f}"
         _num_min = min(_numbers)
+
+        if dest_type == int:
+            _num_avg = int(_num_avg)
+        else:
+            _num_avg = float(_num_avg)
+
+            # 返回数据
         return _num_max, _num_avg, _num_min
+
     except Exception as e:
         logger.exception(e)
-        return None, None, None
+        return None
 
 
 # --------------------------------------------------------------------------------------------------
@@ -187,10 +221,10 @@ def step_number_for_split_equally(
 
         [1, 2, 3, 4, 5, 6, 7, 8, 9]
 
-        分成 2 份 -> [[1, 2, 3, 4, 5], [6, 7, 8, 9]]        -> 返回 5
-        分成 3 份 -> [[1, 2, 3], [4, 5, 6], [7, 8, 9]]      -> 返回 3
-        分成 4 份 -> [[1, 2, 3], [4, 5], [6, 7], [8, 9]]    -> 返回 3
-        分成 5 份 -> [[1, 2], [3, 4], [5, 6], [7, 8], [9]]  -> 返回 2
+        分成 2 份 -> [[1, 2, 3, 4, 5], [6, 7, 8, 9]] -> 返回 5
+        分成 3 份 -> [[1, 2, 3], [4, 5, 6], [7, 8, 9]] -> 返回 3
+        分成 4 份 -> [[1, 2, 3], [4, 5], [6, 7], [8, 9]] -> 返回 3
+        分成 5 份 -> [[1, 2], [3, 4], [5, 6], [7, 8], [9]] -> 返回 2
     """
     try:
         if integer % split_equally_number == 0:
@@ -411,27 +445,16 @@ def list_print_by_step(
 ) -> 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")
+            logger.error("argument error: data")
             return False
         case True if not isTrue(step, int):
-            logger.error("argument data error: step")
+            logger.error("argument error: step")
+            return False
+        case True if not isTrue(separator, str):
+            logger.error("argument error: separator")
             return False
         case _:
             pass
@@ -943,7 +966,7 @@ def datetime_local_to_timezone(
     tz: datetime.timezone = datetime.timezone.utc
 ) -> datetime.datetime | None:
     """
-    Local datetime to TimeZone datetime (默认转换为 UTC datetime)
+    Local datetime to TimeZone datetime(默认转换为 UTC datetime)
     replace(tzinfo=None) 移除结尾的时区信息
     """
     try:
@@ -960,7 +983,7 @@ def datetime_utc_to_timezone(
     tz: Any = datetime.datetime.now(datetime.timezone.utc).astimezone().tzinfo
 ) -> datetime.datetime | None:
     """
-    UTC datetime to TimeZone datetime (默认转换为 Local datetime)
+    UTC datetime to TimeZone datetime(默认转换为 Local datetime)
     replace(tzinfo=None) 移除结尾的时区信息
     """
     try:
@@ -1173,25 +1196,25 @@ def delete_directory(
     """
     delete directory
 
-    https://docs.python.org/3/library/os.html#os.rmdir
+    https: // docs.python.org / 3 / library / os.html  # os.rmdir
 
         os.rmdir(path, *, dir_fd=None)
 
-    Remove (delete) the directory path.
+    Remove(delete) the directory path.
 
     If the directory does not exist or is not empty, an FileNotFoundError or an OSError is raised respectively.
 
     In order to remove whole directory trees, shutil.rmtree() can be used.
 
-    https://docs.python.org/3/library/shutil.html#shutil.rmtree
+    https: // docs.python.org / 3 / library / shutil.html  # shutil.rmtree
 
         shutil.rmtree(path, ignore_errors=False, onerror=None)
 
-    Delete an entire directory tree; path must point to a directory (but not a symbolic link to a directory).
+    Delete an entire directory tree; path must point to a directory(but not a symbolic link to a directory).
 
     If ignore_errors is true, errors resulting from failed removals will be ignored;
 
-    if false or omitted, such errors are handled by calling a handler specified by onerror or, if that is omitted, they raise an exception.
+    if false or omitted, such errors are handled by calling a handler specified by onerror or , if that is omitted, they raise an exception.
     """
     try:
 

{ezkit-1.9.4 → ezkit-1.9.5/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.9.4 → ezkit-1.9.5}/setup.py

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