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

ezKit/bottle_extensions.py

@@ -24,7 +24,7 @@ def request_json() -> bottle.DictProperty | None:
     """Bottle Request JSON"""
     try:
         data = bottle.request.json
-        if utils.v_true(data, dict):
+        if utils.isTrue(data, dict):
             return data
         return None
     except Exception as e:

ezKit/cls.py

@@ -14,7 +14,7 @@ def up_down_analysis(
 ) -> list | pd.DataFrame | None:
     """涨停跌停数据"""
 
-    if not utils.v_true(target, str):
+    if not utils.isTrue(target, str):
         logger.error(f"error type: {target}")
         return None
 
@@ -75,7 +75,7 @@ def up_down_analysis(
                     "name": i["secu_name"]
                 })
 
-        if utils.v_true(df, bool) is False:
+        if not utils.isTrue(df, bool):
             logger.success(f"{info} [成功]")
             return result
 
@@ -107,7 +107,7 @@ def latest_data(
         case True if True not in [isinstance(payload, str), isinstance(payload, dict)]:
             logger.error("Incorrect function argument type: payload")
             return None
-        case True if False in [isinstance(data_type, str), utils.v_true(data_type, str)]:
+        case True if False in [isinstance(data_type, str), utils.isTrue(data_type, str)]:
             logger.error("Incorrect function argument type: data_type")
             return None
         case _:
@@ -159,11 +159,11 @@ def latest_data(
         params: dict = {}
 
         # 默认请求参数
-        if isinstance(payload, str) and utils.v_true(payload, str):
+        if isinstance(payload, str) and utils.isTrue(payload, str):
             params = {"secu_code": payload}
 
         # 请求参数
-        if isinstance(payload, dict) and utils.v_true(payload, dict):
+        if isinstance(payload, dict) and utils.isTrue(payload, dict):
             params = payload
 
         # ------------------------------------------------------------------------------------------
@@ -201,7 +201,7 @@ def latest_data(
         response_dict: dict = response.json()
 
         # 判断数据是否正确
-        if True not in [utils.v_true(response_dict["data"], dict), utils.v_true(response_dict["data"], list)]:
+        if True not in [utils.isTrue(response_dict["data"], dict), utils.isTrue(response_dict["data"], list)]:
             logger.error(f"{info} [失败]")
             return None
 
@@ -217,7 +217,7 @@ def latest_data(
                 return None
 
             # pd.DataFrame 数据
-            if utils.v_true(df, bool) is True:
+            if utils.isTrue(df, bool):
                 df_data = {
                     # "date": [pd.to_datetime(date_today)],
                     "open": [float(response_dict["data"]["open_px"])],
@@ -239,7 +239,7 @@ def latest_data(
         # 板块
 
         # 板块数据不能转换为 pd.DataFrame
-        if (data_type == "plate") and (utils.v_true(df, bool) is True):
+        if (data_type == "plate") and utils.isTrue(df, bool):
             logger.error(f"{info} [错误]")
             return None
 
@@ -267,7 +267,7 @@ def latest_data(
 def plate_codes(plate: str) -> list | None:
     """获取板块成分股代码"""
 
-    if utils.v_true(plate, str) is False:
+    if not utils.isTrue(plate, str):
         logger.error("Incorrect function argument type: plate")
         return None
 

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.v_true(engine_url, str):
-            if utils.v_true(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:
@@ -117,11 +118,11 @@ class Database():
 
             logger.info(f"{info} ......")
 
-            if utils.v_true(sql, str):
+            if utils.isTrue(sql, str):
 
                 sql_object = sql
 
-            elif sql_file is not None and utils.v_true(sql_file, str):
+            elif sql_file is not None and utils.isTrue(sql_file, str):
 
                 # 判断文件是否存在
                 if isinstance(sql_file, str) and utils.check_file_type(sql_file, "file") is False:
@@ -129,10 +130,10 @@ class Database():
                     logger.error(f"No such file: {sql_file}")
                     return False
 
-                if isinstance(sql_file, str) and utils.v_true(sql_file, str):
+                if isinstance(sql_file, str) and utils.isTrue(sql_file, str):
 
                     # 读取文件内容
-                    if sql_file_kwargs is not None and utils.v_true(sql_file_kwargs, dict):
+                    if sql_file_kwargs is not None and utils.isTrue(sql_file_kwargs, dict):
                         with open(sql_file, "r", encoding="utf-8", **sql_file_kwargs) as _file:
                             sql_object = _file.read()
                     else:
@@ -179,7 +180,7 @@ class Database():
                 logger.info(f"{info_of_save} .......")
 
                 # 保存结果
-                if isinstance(csv_file_kwargs, dict) and utils.v_true(csv_file_kwargs, dict):
+                if isinstance(csv_file_kwargs, dict) and utils.isTrue(csv_file_kwargs, dict):
                     with open(csv_file, "w", encoding="utf-8", **csv_file_kwargs) as _file:
                         result_of_save = self._result_save(_file, result)
                 else:

ezKit/http.py

@@ -17,23 +17,23 @@ def download(
 ) -> bool:
     """下载文件"""
 
-    if utils.v_true(request, dict):
+    if utils.isTrue(request, dict):
         request_arguments = {"method": "GET", "stream": True, **request}
     else:
         return False
 
-    if utils.v_true(file, dict):
+    if utils.isTrue(file, dict):
         file_arguments = {"mode": "wb", **file}
     else:
         return False
 
-    if iter_content is not None and utils.v_true(iter_content, dict):
+    if iter_content is not None and utils.isTrue(iter_content, dict):
         iter_content_arguments = {"chunk_size": 1024, **iter_content}
     else:
         iter_content_arguments = {"chunk_size": 1024}
 
     info_prefix: str = "Download"
-    if utils.v_true(info, str):
+    if utils.isTrue(info, str):
         info_prefix = f"Download {info}"
 
     try:
@@ -45,7 +45,7 @@ def download(
         # # pylint: disable=W1514
         with open(**file_arguments) as _file:  # type: ignore
 
-            if utils.v_true(chunks, bool):
+            if utils.isTrue(chunks, bool):
                 for _chunk in response.iter_content(**iter_content_arguments):  # type: ignore
                     _file.write(_chunk)
             else:

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:
@@ -45,14 +54,14 @@ class Mongo():
         try:
             logger.info(f"{info} ......")
             # 是否删除 collection
-            if utils.v_true(drop, bool):
+            if utils.isTrue(drop, bool):
                 # 删除 collection
                 db_collection.drop()
             # 插入数据
-            if utils.v_true(data, dict):
+            if utils.isTrue(data, dict):
                 # 插入一条数据
                 result = db_collection.insert_one(data)
-            elif utils.v_true(data, list):
+            elif utils.isTrue(data, list):
                 # 插入多条数据
                 result = db_collection.insert_many(data)
             else:

ezKit/qywx.py

@@ -150,9 +150,9 @@ class QYWX:
             users: list = []
 
             match True:
-                case True if isinstance(mobile, list) and utils.v_true(mobile, list):
+                case True if isinstance(mobile, list) and utils.isTrue(mobile, list):
                     users = mobile
-                case True if isinstance(mobile, str) and utils.v_true(mobile, str):
+                case True if isinstance(mobile, str) and utils.isTrue(mobile, str):
                     users.append(mobile)
                 case _:
                     return False

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.v_true(arguments, str):
-            self.redis = RedisClient.from_url(arguments)
-        elif isinstance(arguments, dict) and utils.v_true(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
 
@@ -40,7 +40,7 @@ class Redis:
     def flush(self, flushall: bool = False) -> bool:
         info = "Redis flush"
         try:
-            if utils.v_true(flushall, bool):
+            if utils.isTrue(flushall, bool):
                 logger.info(f"{info} all ......")
                 self.redis.flushall()
             else:

ezKit/sendemail.py

@@ -94,7 +94,7 @@ def sendemail(
 
         # 邮件主体
 
-        if utils.v_true(body, dict) is False:
+        if not utils.isTrue(body, dict):
             logger.error("body error")
             return False
 
@@ -102,7 +102,7 @@ def sendemail(
 
         body_content = cast(str, body.get("content"))
 
-        if utils.v_true(body_content, str) is False:
+        if not utils.isTrue(body_content, str):
             logger.error(f"body content error: {body_content}")
             return False
 
@@ -127,7 +127,7 @@ def sendemail(
 
         # SMTP
 
-        if utils.v_true(smtp, dict) is False:
+        if not utils.isTrue(smtp, dict):
             logger.error("smtp error")
             return False
 
@@ -135,21 +135,21 @@ def sendemail(
         smtp_port = cast(int, smtp.get("port"))
         smtp_tls = cast(bool, smtp.get("tls"))
 
-        if utils.v_true(smtp_host, str) is False:
+        if not utils.isTrue(smtp_host, str):
             logger.error(f"smtp host error: {smtp_host}")
             return False
 
-        if utils.v_true(smtp_port, int) is False:
+        if not utils.isTrue(smtp_port, int):
             logger.error(f"smtp port error: {smtp_port}")
             return False
 
-        smtp_tls = utils.v_true(smtp_tls, bool)
+        smtp_tls = utils.isTrue(smtp_tls, bool)
 
         # ------------------------------------------------------------------------------------------
 
         # 发件人信息
 
-        if utils.v_true(sender, dict) is False:
+        if not utils.isTrue(sender, dict):
             logger.error("sender error")
             return False
 
@@ -157,15 +157,15 @@ def sendemail(
         sender_address = cast(str, sender.get("address"))
         sender_password = cast(str, sender.get("password"))
 
-        if utils.v_true(sender_name, str) is False:
+        if not utils.isTrue(sender_name, str):
             logger.error(f"sender name error: {sender_name}")
             return False
 
-        if utils.v_true(sender_address, str) is False:
+        if not utils.isTrue(sender_address, str):
             logger.error(f"sender address error: {sender_address}")
             return False
 
-        if utils.v_true(sender_password, str) is False:
+        if not utils.isTrue(sender_password, str):
             logger.error(f"sender password error: {sender_password}")
             return False
 
@@ -175,9 +175,9 @@ def sendemail(
 
         # 收件人(或列表)
 
-        if utils.v_true(recipients, str):
+        if utils.isTrue(recipients, str):
             message["To"] = format_parse(recipients)
-        elif utils.v_true(recipients, list):
+        elif utils.isTrue(recipients, list):
             message["To"] = ", ".join(list(map(format_parse, recipients)))
         else:
             logger.error("recipients error")
@@ -187,7 +187,7 @@ def sendemail(
 
         # 邮件主题
 
-        if utils.v_true(subject, str) is False:
+        if not utils.isTrue(subject, str):
             logger.error("subject error")
             return False
 
@@ -195,7 +195,7 @@ def sendemail(
 
         # ------------------------------------------------------------------------------------------
 
-        if images is not None and utils.v_true(images, list):
+        if images is not None and utils.isTrue(images, list):
 
             for image in images:
 

ezKit/stock.py

@@ -23,9 +23,9 @@ def coderename(target: str | dict, restore: bool = False) -> str | dict | None:
         _code_name: Any = None
 
         # 判断 target 是 string 还是 dictionary
-        if isinstance(target, str) and utils.v_true(target, str):
+        if isinstance(target, str) and utils.isTrue(target, str):
             _code_name = target
-        elif isinstance(target, dict) and utils.v_true(target, dict):
+        elif isinstance(target, dict) and utils.isTrue(target, dict):
             _object = deepcopy(target)
             _code_name = str(deepcopy(target["code"]))
         else:
@@ -46,10 +46,10 @@ def coderename(target: str | dict, restore: bool = False) -> str | dict | None:
                 return None
 
         # 返回结果
-        if utils.v_true(target, str):
+        if utils.isTrue(target, str):
             return _code_name
 
-        if utils.v_true(target, dict):
+        if utils.isTrue(target, dict):
             _object["code"] = _code_name
             return _object
 

ezKit/token.py

@@ -38,7 +38,7 @@ def generate_token(key: str = 'Fc0zXCmGKd7tPu6W', timeout: int = 3600, data: Any
 
 def parsing_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> (dict | None):
     try:
-        if utils.v_true(token_string, str) is False:
+        if not utils.isTrue(token_string, str):
             return None
 
         aes_cipher = cipher.AESCipher(key=key, algorithm='sha256')