ezKit 1.7.7__py3-none-any.whl → 1.7.8__py3-none-any.whl

ezKit/__init__.py

@@ -1 +0,0 @@
-# from . import bottle, database, files, plots, utils, weixin, zabbix

ezKit/cipher.py

@@ -1,9 +1,9 @@
-'''
+"""
 https://docs.python.org/3.10/library/hashlib.html
 https://www.pycrypto.org/
 https://stackoverflow.com/a/21928790
 pip install pycryptodome
-'''
+"""
 import base64
 import hashlib
 
@@ -12,7 +12,8 @@ from Crypto.Cipher import AES
 from loguru import logger
 
 
-class AESCipher(object):
+class AESCipher:
+    """AESCipher"""
 
     def __init__(self, key: str = 'vB7DoRm9C2Kd', algorithm: str = 'sha256'):
 
@@ -40,10 +41,10 @@ class AESCipher(object):
                 self.key = hashlib.sha3_384(key.encode()).digest()
             case True if algorithm == 'sha3_512':
                 self.key = hashlib.sha3_512(key.encode()).digest()
-            case True if algorithm == 'shake_128':
-                self.key = hashlib.shake_128(key.encode()).digest()
-            case True if algorithm == 'shake_256':
-                self.key = hashlib.shake_256(key.encode()).digest()
+            # case True if algorithm == 'shake_128':
+            #     self.key = hashlib.shake_128(key.encode()).digest()
+            # case True if algorithm == 'shake_256':
+            #     self.key = hashlib.shake_256(key.encode()).digest()
             case _:
                 self.key = hashlib.sha256(key.encode()).digest()
 
@@ -59,10 +60,10 @@ class AESCipher(object):
 
     def decrypt(self, enc: str) -> str | None:
         try:
-            enc = base64.b64decode(enc)
-            iv = enc[:AES.block_size]
+            enc_bytes = base64.b64decode(enc)
+            iv = enc_bytes[:AES.block_size]
             cipher = AES.new(self.key, AES.MODE_CBC, iv)
-            return self._unpad(cipher.decrypt(enc[AES.block_size:])).decode('utf-8')
+            return self._unpad(cipher.decrypt(enc_bytes[AES.block_size:])).decode('utf-8')
         except Exception as e:
             logger.exception(e)
             return None

ezKit/database.py

@@ -14,13 +14,14 @@ from sqlalchemy import Index, create_engine, text
 from . import utils
 
 
-class Database(object):
+class Database():
+    """Database"""
 
     engine = create_engine('sqlite://')
 
-    def __init__(self, engine_url=None, engine_options=None):
+    def __init__(self, engine_url, **engine_options):
         '''Initiation'''
-        if engine_url != None:
+        if engine_url is not None:
             if utils.v_true(engine_options, dict):
                 self.engine = create_engine(engine_url, **engine_options)
             else:
@@ -68,8 +69,8 @@ class Database(object):
             idx = Index(index_name, table_field)
             try:
                 idx.drop(bind=self.engine)
-            except:
-                pass
+            except Exception as e:
+                logger.exception(e)
             idx.create(bind=self.engine)
             logger.success(f'{info}[成功]')
             return True
@@ -86,7 +87,8 @@ class Database(object):
             outcsv.writerows(data)
             return True
         except Exception as e:
-            logger.exception(e) if echo == True else next
+            if echo is True:
+                logger.exception(e)
             return False
 
     def execute(self, sql=None, sql_file=None, sql_file_kwargs=None, csv_file=None, csv_file_kwargs=None, echo=True):
@@ -104,12 +106,13 @@ class Database(object):
         sql_object = None
         info = f'{info_prefix}提取SQL'
         try:
-            logger.info(f'{info}......') if echo == True else next
+            if echo is True:
+                logger.info(f'{info}......')
             if utils.v_true(sql, str):
                 sql_object = sql
             elif utils.v_true(sql_file, str):
                 # 判断文件是否存在
-                if utils.check_file_type(sql_file, 'file') == False:
+                if utils.check_file_type(sql_file, 'file') is False:
                     logger.error(f'文件不存在: {sql_file}') if echo == True else next
                     return False
                 # 读取文件内容

ezKit/mongo.py

@@ -1,6 +1,7 @@
 """MongoDB"""
 from loguru import logger
 from pymongo import MongoClient
+from pymongo.collection import Collection
 
 from . import utils
 
@@ -10,39 +11,41 @@ class Mongo():
 
     client = MongoClient()
 
-    def close(self):
+    def close(self) -> bool:
         """client close"""
         try:
             self.client.close()
+            return True
         except Exception as e:
             logger.exception(e)
+            return False
 
-    def connect_test(self, debug: bool = False):
-        """client connect test"""
-        info = 'MongoDB连接测试'
+    def connect_test(self) -> bool:
+        info = "MongoDB connect test"
         try:
-            logger.info(f'{info}[执行]')
+            logger.info(f"{info} ......")
             self.client.server_info()
-            logger.success(f'{info}[成功]')
+            logger.success(f"{info} [success]")
             return True
         except Exception as e:
-            logger.error(f'{info}[失败]')
-            if utils.v_true(debug, bool):
-                logger.exception(e)
+            logger.error(f"{info} [failed]")
+            logger.exception(e)
             return False
 
-    def collection(self, database, name):
-        """client collection"""
-        return self.client[database][name]
+    def collection(self, database: str, name: str) -> Collection | None:
+        try:
+            return self.client[database][name]
+        except Exception as e:
+            logger.exception(e)
+            return None
 
-    def collection_insert(self, database, collection, data, drop=None):
-        """client collection insert"""
+    def collection_insert(self, database, collection, data, drop: bool = False):
         db_collection = self.client[database][collection]
-        info = '插入数据'
+        info = "MongoDB collection insert"
         try:
-            logger.info(f'{info}[执行]')
+            logger.info(f"{info} ......")
             # 是否删除 collection
-            if drop is True:
+            if utils.v_true(drop, bool):
                 # 删除 collection
                 db_collection.drop()
             # 插入数据
@@ -53,12 +56,12 @@ class Mongo():
                 # 插入多条数据
                 result = db_collection.insert_many(data)
             else:
-                logger.error(f'{info}[失败]')
-                logger.error('数据类型错误')
+                logger.error(f"{info} [failed]")
+                logger.error("Data type error")
                 return False
-            logger.success(f'{info}[成功]')
+            logger.success(f"{info} [success]")
             return result
         except Exception as e:
-            logger.error(f'{info}[失败]')
+            logger.error(f"{info} [failed]")
             logger.exception(e)
             return False

ezKit/qywx.py

@@ -1,3 +1,14 @@
+"""
+企业微信开发者中心
+
+    https://developer.work.weixin.qq.com/
+    https://developer.work.weixin.qq.com/document/path/90313 (全局错误码)
+
+参考文档:
+
+    https://www.gaoyuanqi.cn/python-yingyong-qiyewx/
+    https://www.jianshu.com/p/020709b130d3
+"""
 import json
 import time
 
@@ -7,21 +18,9 @@ from loguru import logger
 from . import utils
 
 
-class QYWX(object):
+class QYWX:
     """企业微信"""
 
-    """
-    企业微信开发者中心
-
-        https://developer.work.weixin.qq.com/
-        https://developer.work.weixin.qq.com/document/path/90313 (全局错误码)
-
-    参考文档:
-
-        https://www.gaoyuanqi.cn/python-yingyong-qiyewx/
-        https://www.jianshu.com/p/020709b130d3
-    """
-
     url_prefix = 'https://qyapi.weixin.qq.com'
     work_id: str | None = None
     agent_id: str | None = None

ezKit/redis.py

@@ -1,10 +1,12 @@
+"""Redis"""
 import redis as RedisClient
 from loguru import logger
 
 from . import utils
 
 
-class Redis(object):
+class Redis:
+    """Redis"""
 
     # https://redis.readthedocs.io/en/stable/_modules/redis/client.html#Redis
     # https://github.com/redis/redis-py#client-classes-redis-and-strictredis
@@ -14,38 +16,38 @@ class Redis(object):
     # 这里修改以下参数: host, port, socket_timeout, socket_connect_timeout, charset
     redis = RedisClient.Redis()
 
-    def __init__(self, arguments=None):
-        '''Initiation'''
-        if utils.v_true(arguments, str):
+    def __init__(self, arguments: str | dict):
+        """Initiation"""
+        if isinstance(arguments, str) and utils.v_true(arguments, str):
             self.redis = RedisClient.from_url(arguments)
-        elif utils.v_true(arguments, dict):
+
+        if isinstance(arguments, dict) and utils.v_true(arguments, dict):
             self.redis = RedisClient.Redis(**arguments)
-        else:
-            pass
 
-    def connect_test(self):
-        info = 'Redis连接测试'
+    def connect_test(self) -> bool:
+        info = "Redis connect test"
         try:
-            logger.info(f'{info}......')
+            logger.info(f"{info} ......")
             self.redis.ping()
-            logger.success(f'{info}[成功]')
+            logger.success(f"{info} [success]")
             return True
         except Exception as e:
-            logger.error(f'{info}[失败]')
+            logger.error(f"{info} [failed]")
             logger.exception(e)
             return False
 
-    def flush(self, all=None):
-        info = 'Redis数据清理'
+    def flush(self, flushall: bool = False) -> bool:
+        info = "Redis flush"
         try:
-            logger.info(f'{info}......')
-            if all == True:
+            if utils.v_true(flushall, bool):
+                logger.info(f"{info} all ......")
                 self.redis.flushall()
             else:
+                logger.info(f"{info} db ......")
                 self.redis.flushdb()
-            logger.success(f'{info}[成功]')
+            logger.success(f"{info} [success]")
             return True
         except Exception as e:
-            logger.error(f'{info}[失败]')
+            logger.error(f"{info} [failed]")
             logger.exception(e)
             return False

ezKit/sendemail.py

@@ -1,6 +1,4 @@
-"""
-发送邮件
-"""
+"""发送邮件"""
 # https://stackoverflow.com/questions/882712/sending-html-email-using-python
 # pylint: disable=E0611
 # pylint: disable=R0911

ezKit/token.py

@@ -4,33 +4,32 @@ from typing import Any
 
 from loguru import logger
 
-from .cipher import AESCipher
-from .utils import datetime_now, datetime_offset, datetime_string_to_datetime, datetime_to_string, v_true
+from . import cipher, utils
 
 
 def generate_token(key: str = 'Fc0zXCmGKd7tPu6W', timeout: int = 3600, data: Any = None) -> (str | None):
     try:
-        now = datetime_now()
+        now = utils.datetime_now()
 
         if now is None:
             return None
 
-        offset = datetime_offset(now, seconds=+timeout)
+        offset = utils.datetime_offset(now, seconds=+timeout)
 
         if offset is None:
             return None
 
         source = json.dumps(
             obj={
-                "datetime": datetime_to_string(offset),
+                "datetime": utils.datetime_to_string(offset),
                 "data": data
             },
             default=str
         )
 
-        cipher = AESCipher(key=key, algorithm='sha256')
+        aes_cipher = cipher.AESCipher(key=key, algorithm='sha256')
 
-        return cipher.encrypt(source)
+        return aes_cipher.encrypt(source)
 
     except Exception as e:
         logger.exception(e)
@@ -39,19 +38,19 @@ def generate_token(key: str = 'Fc0zXCmGKd7tPu6W', timeout: int = 3600, data: Any
 
 def parsing_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> (dict | None):
     try:
-        if v_true(token_string, str) is False:
+        if utils.v_true(token_string, str) is False:
             return None
 
-        cipher = AESCipher(key=key, algorithm='sha256')
+        aes_cipher = cipher.AESCipher(key=key, algorithm='sha256')
 
-        target = cipher.decrypt(token_string)
+        target = aes_cipher.decrypt(token_string)
 
         if target is None:
             return None
 
         source: dict = json.loads(target)
 
-        source['datetime'] = datetime_string_to_datetime(source['datetime'])
+        source['datetime'] = utils.datetime_string_to_datetime(source['datetime'])
 
         return source
 
@@ -68,7 +67,7 @@ def certify_token(token_string: str, key: str = 'Fc0zXCmGKd7tPu6W') -> bool:
         if result is None:
             return False
 
-        if result.get('datetime') < datetime_now():  # type: ignore
+        if result.get('datetime') < utils.datetime_now():  # type: ignore
             return False
 
         return True

ezKit/utils.py

@@ -1,6 +1,4 @@
-"""
-Python Utils
-"""
+"""Utils"""
 import csv
 import datetime
 import hashlib
@@ -49,6 +47,10 @@ def v_true(
         List        list/tuple/set  []/()/{}
         Dictionary  dict            {}
 
+    查看变量类型: type(x)
+
+    判断变量类型: isinstance(x, str)
+
     函数使用 callable(func) 判断
     """
 
@@ -623,7 +625,7 @@ def dict_remove_key(
     data: dict,
     key: str,
     debug: bool = False
-) -> None | dict:
+) -> dict | None:
     """dict remove key"""
     try:
         data_copy: dict = deepcopy(data)

ezKit/xftp.py

@@ -54,7 +54,7 @@ class XFTP:
         logger.success("FTP connect closed")
         return True
 
-    def get_file_list(self, target='/') -> (list[str] | None):
+    def get_file_list(self, target='/') -> list[str] | None:
         """Get file list"""
         try:
             self.chdir_to_remote(target)
@@ -63,7 +63,7 @@ class XFTP:
             logger.exception(e)
             return None
 
-    def get_file_size(self, file, target="/") -> (int | None):
+    def get_file_size(self, file, target="/") -> int | None:
         """Get file size"""
         try:
             self.chdir_to_remote(target)

{ezKit-1.7.7.dist-info → ezKit-1.7.8.dist-info}/METADATA

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

ezKit-1.7.8.dist-info/RECORD

@@ -0,0 +1,22 @@
+ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ezKit/bottle.py,sha256=0lLLrzgAWhPj47KOdyITIsPRNUFGuwovA3vRW47SpUs,180117
+ezKit/bottle_extensions.py,sha256=OQUwHNg4cbZ0UZXwT6FJjwl4uAg00_Q-Zpogt_xHElk,1088
+ezKit/cipher.py,sha256=uVUzeoYg5ZPJLpqg2wLst-7vfdDGmqWKka9Oyi0WrCA,2883
+ezKit/database.py,sha256=DNwjWzaJ3kLWVnwe3-zU0fJa-_IsKk6jeyGWdiyF94Q,6794
+ezKit/files.py,sha256=GoNdai3Ul0lg4wTkJAQm5kys1Sv3NCTNLIZlzHQKuZQ,12714
+ezKit/http.py,sha256=LTeyPVBm8deL_m-YRVW2O5w83-k3b1I1hU4cqkxS_B0,1845
+ezKit/mongo.py,sha256=ueTFKJuorvtkchoItmH7dbwzJ-V0YUxfHdeqHPv6DGc,2045
+ezKit/plots.py,sha256=QUtoVfZ49ZSNcY8gcQ2TYVkMjDDzoW-myMtqTi5WN2U,5322
+ezKit/qywx.py,sha256=AQaJUIthnB1nHrtnjn2YEW-cBdlR_5xMaHDweiiUsK0,6490
+ezKit/redis.py,sha256=KdvoSyFiAZSzsV_GowSUsL-TI0o6GXK8yw4YgyO4Rm0,1938
+ezKit/reports.py,sha256=dBBggggCCLuk5YD6SjdUPuxTr3wiJojP3lA7dQfg6Pk,8898
+ezKit/sendemail.py,sha256=Hypoy9zEIcq28BH-5ydiYq2ysoajTSWhtz8yVMpyOAU,8411
+ezKit/token.py,sha256=9CAZhPdXiRiWoOIeWmP0q6L3j1zQAv4YcVWH95Tjefs,1755
+ezKit/utils.py,sha256=fBGRdrX23JN9zJ_gj7CIgcf9-S0wq961O_pKyLYU9Ds,48917
+ezKit/xftp.py,sha256=7BABr-gjxZxK2UXoW9XxN76i1HdubeaomYlYMqRurHE,7770
+ezKit/zabbix.py,sha256=soM5UEeYMfm7NczbPOVLirmHm3G20dECQ0aCBttZfhQ,28350
+ezKit-1.7.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.7.8.dist-info/METADATA,sha256=UywFjIMYxcbNAldtcIVgkoT4Zf6oF0KgR3oEHxTgMhQ,192
+ezKit-1.7.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.7.8.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.7.8.dist-info/RECORD,,

ezKit-1.7.7.dist-info/RECORD

@@ -1,22 +0,0 @@
-ezKit/__init__.py,sha256=v6kh1vyXewSi_0PE0CMXrGz0aME4tISx_7BPXIKtZ9E,70
-ezKit/bottle.py,sha256=0lLLrzgAWhPj47KOdyITIsPRNUFGuwovA3vRW47SpUs,180117
-ezKit/bottle_extensions.py,sha256=OQUwHNg4cbZ0UZXwT6FJjwl4uAg00_Q-Zpogt_xHElk,1088
-ezKit/cipher.py,sha256=SIQ1xDHMHudXSg_5vJ06_wDc6kFldLryezO8t_eaFqg,2845
-ezKit/database.py,sha256=imOeBSU6kCIrVHei485HEROnmsr5UZtCcqwHk0vDzwY,6741
-ezKit/files.py,sha256=GoNdai3Ul0lg4wTkJAQm5kys1Sv3NCTNLIZlzHQKuZQ,12714
-ezKit/http.py,sha256=LTeyPVBm8deL_m-YRVW2O5w83-k3b1I1hU4cqkxS_B0,1845
-ezKit/mongo.py,sha256=FkxD7P7fUI9gPFR8D9t-TzthuxHyscMVJxNRK5gAd_A,1938
-ezKit/plots.py,sha256=QUtoVfZ49ZSNcY8gcQ2TYVkMjDDzoW-myMtqTi5WN2U,5322
-ezKit/qywx.py,sha256=7eWrlTLrUj6U6cViEGbT6_LQxFGVqkhGAefBSS6T_-0,6531
-ezKit/redis.py,sha256=pY4SPlcgQ7S8IeY2xoDpxy-xCZxzZQrQJNAoWRsC1dI,1773
-ezKit/reports.py,sha256=dBBggggCCLuk5YD6SjdUPuxTr3wiJojP3lA7dQfg6Pk,8898
-ezKit/sendemail.py,sha256=AAdxBvEYN_AJVvBkSAvXzhXC5jkbRsD_8P51h2SdTRw,8413
-ezKit/token.py,sha256=Q7z2ImQWs6NRxMtpsgNo9mhBeSs8nRCHCaWPf4031qg,1797
-ezKit/utils.py,sha256=UBAeybjLAB0tBLPD2M2QXfpI_smtkmPP4t7dX-Pcsu4,48849
-ezKit/xftp.py,sha256=BlxDctgJaCNeQNsVMwW6BcP3sL21SMVs-nPMjU_6rVg,7774
-ezKit/zabbix.py,sha256=soM5UEeYMfm7NczbPOVLirmHm3G20dECQ0aCBttZfhQ,28350
-ezKit-1.7.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.7.7.dist-info/METADATA,sha256=7DiaRRyo1lystQf8VPWxpqkKHUK60DeKXgT2wmGSXbw,192
-ezKit-1.7.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.7.7.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.7.7.dist-info/RECORD,,