ezKit 1.9.0__tar.gz → 1.9.2__tar.gz

{ezkit-1.9.0/ezKit.egg-info → ezkit-1.9.2}/PKG-INFO

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

{ezkit-1.9.0 → ezkit-1.9.2}/ezKit/database.py

@@ -10,6 +10,7 @@ from typing import Any
 
 from loguru import logger
 from sqlalchemy import CursorResult, Index, create_engine, text
+from sqlalchemy.orm import DeclarativeBase
 
 from . import utils
 
@@ -19,13 +20,13 @@ class Database():
 
     engine = create_engine('sqlite://')
 
-    def __init__(self, engine_url, **engine_options):
+    def __init__(self, target: str, **options):
         """Initiation"""
-        if engine_url is not None and utils.isTrue(engine_url, str):
-            if utils.isTrue(engine_options, dict):
-                self.engine = create_engine(engine_url, **engine_options)
+        if isinstance(target, str) and utils.isTrue(target, str):
+            if utils.isTrue(options, dict):
+                self.engine = create_engine(target, **options)
             else:
-                self.engine = create_engine(engine_url)
+                self.engine = create_engine(target)
         else:
             pass
 
@@ -45,7 +46,7 @@ class Database():
             logger.exception(e)
             return False
 
-    def metadata_init(self, base, **kwargs) -> bool:
+    def metadata_init(self, base: DeclarativeBase, **kwargs) -> bool:
         # https://stackoverflow.com/questions/19175311/how-to-create-only-one-table-with-sqlalchemy
         info = "Database init table"
         try:

{ezkit-1.9.0 → ezkit-1.9.2}/ezKit/mongo.py

@@ -11,6 +11,15 @@ class Mongo():
 
     client = MongoClient()
 
+    def __init__(self, target: str | dict):
+        """Initiation"""
+        if isinstance(target, str) and utils.isTrue(target, str):
+            self.client = MongoClient(target)
+        elif isinstance(target, dict) and utils.isTrue(target, dict):
+            self.client = MongoClient(**target)
+        else:
+            pass
+
     def close(self) -> bool:
         """client close"""
         try:

{ezkit-1.9.0 → ezkit-1.9.2}/ezKit/redis.py

@@ -16,12 +16,12 @@ class Redis:
     # 这里修改以下参数: host, port, socket_timeout, socket_connect_timeout, charset
     redis = RedisClient.Redis()
 
-    def __init__(self, arguments: str | dict):
+    def __init__(self, target: str | dict):
         """Initiation"""
-        if isinstance(arguments, str) and utils.isTrue(arguments, str):
-            self.redis = RedisClient.from_url(arguments)
-        elif isinstance(arguments, dict) and utils.isTrue(arguments, dict):
-            self.redis = RedisClient.Redis(**arguments)
+        if isinstance(target, str) and utils.isTrue(target, str):
+            self.redis = RedisClient.from_url(target)
+        elif isinstance(target, dict) and utils.isTrue(target, dict):
+            self.redis = RedisClient.Redis(**target)
         else:
             pass
 

ezkit-1.9.2/ezKit/stock.py

@@ -0,0 +1,113 @@
+"""股票"""
+import re
+from copy import deepcopy
+
+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': '平安银行'}
+
+    # 判断参数类型
+    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:
+
+        # 初始化
+        code_object: dict = {}
+        code_name: str | dict = ""
+
+        # 判断 target 是 string 还是 dictionary
+        if isinstance(target, str) and utils.isTrue(target, str):
+            code_name = target
+        elif isinstance(target, dict) and utils.isTrue(target, dict):
+            code_object = deepcopy(target)
+            code_name = str(deepcopy(target["code"]))
+        else:
+            return None
+
+        # 是否还原
+        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 = 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
+
+        if utils.isTrue(target, dict):
+            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-1.9.0 → ezkit-1.9.2}/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:
@@ -1340,8 +1337,7 @@ def increment_version(
 
 
 def make_directory(
-    directory: str,
-    debug: bool = False
+    directory: str
 ) -> bool:
     """创建目录"""
     try:

{ezkit-1.9.0 → ezkit-1.9.2/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.9.0 → ezkit-1.9.2}/setup.py

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

ezkit-1.9.0/ezKit/stock.py

@@ -1,60 +0,0 @@
-"""股票"""
-from copy import deepcopy
-from typing import Any
-
-from loguru import logger
-
-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': '平安银行'}
-    """
-
-    try:
-
-        _object: Any = None
-        _code_name: Any = None
-
-        # 判断 target 是 string 还是 dictionary
-        if isinstance(target, str) and utils.isTrue(target, str):
-            _code_name = target
-        elif isinstance(target, dict) and utils.isTrue(target, dict):
-            _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]
-            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
-            else:
-                return None
-
-        # 返回结果
-        if utils.isTrue(target, str):
-            return _code_name
-
-        if utils.isTrue(target, dict):
-            _object["code"] = _code_name
-            return _object
-
-        return None
-
-    except Exception as e:
-        logger.exception(e)
-        return None