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

ezKit/redis.py

@@ -20,9 +20,10 @@ class Redis:
         """Initiation"""
         if isinstance(arguments, str) and utils.v_true(arguments, str):
             self.redis = RedisClient.from_url(arguments)
-
-        if isinstance(arguments, dict) and utils.v_true(arguments, dict):
+        elif isinstance(arguments, dict) and utils.v_true(arguments, dict):
             self.redis = RedisClient.Redis(**arguments)
+        else:
+            pass
 
     def connect_test(self) -> bool:
         info = "Redis connect test"
@@ -32,7 +33,7 @@ class Redis:
             logger.success(f"{info} [success]")
             return True
         except Exception as e:
-            logger.error(f"{info} [failed]")
+            logger.error(f"{info} [failure]")
             logger.exception(e)
             return False
 
@@ -48,6 +49,6 @@ class Redis:
             logger.success(f"{info} [success]")
             return True
         except Exception as e:
-            logger.error(f"{info} [failed]")
+            logger.error(f"{info} [failure]")
             logger.exception(e)
             return False

ezKit/sendemail.py

@@ -1,12 +1,5 @@
 """发送邮件"""
 # https://stackoverflow.com/questions/882712/sending-html-email-using-python
-# pylint: disable=E0611
-# pylint: disable=R0911
-# pylint: disable=R0912
-# pylint: disable=R0913
-# pylint: disable=R0914
-# pylint: disable=R0915
-# pylint: disable=R1710
 import smtplib
 from email.header import Header
 from email.mime.image import MIMEImage

ezKit/utils.py

@@ -1468,8 +1468,8 @@ def create_empty_file(
         # 创建一个空文件
         if v_true(debug, bool):
             logger.info(f"file: {file}")
-        # pylint: disable=R1732,disable=W1514
-        open(file, 'w').close()
+        # pylint: disable=R1732
+        open(file, "w", encoding="utf-8").close()
         # 返回文件路径
         return file
     except Exception as e:

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.7.8
+Version: 1.8.1
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com
 Requires-Python: >=3.11
 License-File: LICENSE
-Requires-Dist: loguru>=0.7.0
+Requires-Dist: loguru>=0.7

ezKit-1.8.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ezKit/bottle.py,sha256=usKK1wVaZw4_D-4VwMYmOIc8jtz4TrpM30nck59HMFw,180178
+ezKit/bottle_extensions.py,sha256=LQikCbbYZBAa4AcihvrTvixWHHMY7OjCBsT02PqWMMM,1129
+ezKit/cipher.py,sha256=uVUzeoYg5ZPJLpqg2wLst-7vfdDGmqWKka9Oyi0WrCA,2883
+ezKit/database.py,sha256=awTEdD4aqevyJg5LPBHmUPrOKweqzJ2Ezqqx0_xgUDA,6859
+ezKit/http.py,sha256=cyS18-TW9f7p1OaiJ4nnVsKZT8Ghy-8OewkfYm8yesw,1790
+ezKit/mongo.py,sha256=P6WTwFRxaaHixJK_PyKlOfPHkeJRxxrNLV77xy5LVBQ,2048
+ezKit/qywx.py,sha256=ra2e3u8IJmNZXr569u1mik3KArAiMdC9x0SgXGXEJes,7003
+ezKit/redis.py,sha256=HVofsLdSBbBHAR-veumsrjTwZQspRDy2FXNR6MDCCXs,1972
+ezKit/sendemail.py,sha256=Qxu4XQkHRPeX6FSJdzj-MXND9NyKcgHljbafNmy34H0,8243
+ezKit/token.py,sha256=9CAZhPdXiRiWoOIeWmP0q6L3j1zQAv4YcVWH95Tjefs,1755
+ezKit/utils.py,sha256=an7joZy_EEpYfN8zBtEWAnhP0YXYfPieabsK_HAxXl4,48921
+ezKit/xftp.py,sha256=7BABr-gjxZxK2UXoW9XxN76i1HdubeaomYlYMqRurHE,7770
+ezKit-1.8.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.8.1.dist-info/METADATA,sha256=hnHRPwzSthfXDscj3YvfPVpNCBe24Z8_xC1vLMY7SR8,190
+ezKit-1.8.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.8.1.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.8.1.dist-info/RECORD,,

ezKit/files.py

@@ -1,348 +0,0 @@
-import re
-from copy import deepcopy
-from socket import inet_aton
-
-from loguru import logger
-
-from . import plots, utils
-
-
-class Files(object):
-    ''' 文件 '''
-
-    ''' Markdown 和 HTML 文件 '''
-    _markdown_file, _html_file = None, None
-
-    def __init__(self, markdown_file=None, html_file=None):
-        ''' Initiation '''
-        self._markdown_file = markdown_file
-        self._html_file = html_file
-
-    '''
-        def multiple_pieces(
-            self,
-            title='',
-            description='',
-            data=[],
-            image={},
-            number_type=None,
-            number_unit=None,
-            number_handling=None,
-            sort_by_ip=False
-        ):
-
-    '''
-
-    def unavailable_hosts(self, hosts=[], **kwargs):
-        ''' 异常服务器处理 '''
-
-        logger.success('unavailable hosts | start')
-
-        try:
-
-            # 如果存在异常服务器, 则写入文件
-            if hosts != []:
-                with open(self._markdown_file, 'a') as _file:
-                    _file.writelines([
-                        '\n',
-                        '**异常服务器:**\n',
-                        '\n',
-                    ])
-                    for _host in hosts:
-                        _file.write('- <span style="color: red">{}</span>\n'.format(_host))
-
-            logger.success('unavailable hosts | end')
-
-            return True
-
-        except Exception as e:
-            logger.exception(e)
-            logger.error('unavailable hosts | end')
-            return False
-
-    def single_piece(
-        self,
-        title='',
-        description='',
-        data=[],
-        image={},
-        number_type=None,
-        number_unit=None,
-        number_handling=None,
-        table_header_title='Host',
-        table_header_data='Data',
-        sort_by_ip=False,
-        **kwargs
-    ):
-        ''' 单条数据 '''
-
-        match True:
-            case True if type(title) != str or title == '':
-                logger.error('ERROR!! title is not string or none')
-                return None
-            case True if type(description) != str or description == '':
-                logger.error('ERROR!! description is not string or none')
-                return None
-            case True if type(data) != list or data == []:
-                logger.error('ERROR!! data is not list or none')
-                return None
-            case True if type(image) != dict or image == 0:
-                logger.error('ERROR!! image is not dictionary or none')
-                return None
-
-        # 拷贝数据
-        _data = deepcopy(data)
-
-        # 根据 IP 排序
-        if sort_by_ip == True:
-            _ips = utils.list_sort([_host['interfaces'][0]['ip'] for _host in _data], key=inet_aton, deduplication=True)
-            _data = [_host for _ip in _ips for _host in _data if _ip == _host['interfaces'][0]['ip']]
-
-        logger.success('{} | start'.format(title))
-
-        try:
-
-            # 初始化变量
-            _data_idx, _data_result = [], []
-
-            for _host in _data:
-                _value = None
-                if _host.get('history') != None:
-                    match True:
-                        case True if number_type == 'int':
-                            _value = int(_host['history']['value'])
-                        case True if number_type == 'float':
-                            _value = float(_host['history']['value'])
-                        case _:
-                            _value = _host['history']['value']
-                _data_idx.append(_host['name'])
-                _data_result.append(number_handling(_value) if callable(number_handling) == True else _value)
-
-            # 判断结果
-            if (len(_data_idx) > 0) and (image != {}):
-
-                with open(self._markdown_file, 'a') as _file:
-
-                    _file.writelines([
-                        '\n',
-                        '## {}\n'.format(title),
-                        '\n',
-                        '{}\n'.format(description),
-                        '\n',
-                        '| {} | {} |\n'.format(table_header_title, table_header_data),
-                        '| --- | --: |\n'
-                    ])
-
-                    for _i, _v in enumerate(_data_idx):
-                        _file.write('| {0} | {1:.2f}{2} |\n'.format(_v, _data_result[_i], number_unit))
-
-                    _plot_image = {
-                        'title': title,
-                        'kind': image['kind'],
-                        'size': (20, (len(_data_idx) / 5) * 2),
-                        'path': image['path'],
-                        'dpi': 300,
-                        'width': 0.8
-                    }
-
-                    _plot_result = plots.bar({image['label']: _data_result}, _data_idx, _plot_image)
-
-                    # '<img src="cid:{}">\n'.format(_image['cid'])
-                    # '![](cid:{})\n'.format(_image['cid'])
-                    # 图片显示大小: 仅设置 width, height 自适应
-                    if _plot_result == True:
-                        _file.writelines([
-                            '\n',
-                            '<img src="cid:{}" width="1000px">\n'.format(image['cid'])
-                        ])
-
-            logger.success('{} | end'.format(title))
-
-            return True
-
-        except Exception as e:
-            logger.exception(e)
-            logger.error('{} | end'.format(title))
-            return False
-
-    def multiple_pieces(
-        self,
-        title='',
-        description='',
-        data=[],
-        image={},
-        number_type=None,
-        number_unit=None,
-        number_handling=None,
-        table_header_title='Host',
-        sort_by_ip=False,
-        **kwargs
-    ):
-        ''' 多条数据 '''
-
-        match True:
-            case True if type(title) != str or title == '':
-                logger.error('ERROR!! title is not string or none')
-                return None
-            case True if type(description) != str or description == '':
-                logger.error('ERROR!! description is not string or none')
-                return None
-            case True if type(data) != list or data == []:
-                logger.error('ERROR!! data is not list or none')
-                return None
-            case True if type(image) != dict or image == 0:
-                logger.error('ERROR!! image is not dictionary or none')
-                return None
-
-        # 拷贝数据
-        _data = deepcopy(data)
-
-        # 根据 IP 排序
-        if sort_by_ip == True:
-            _ips = utils.list_sort([_host['interfaces'][0]['ip'] for _host in _data], key=inet_aton, deduplication=True)
-            _data = [_host for _ip in _ips for _host in _data if _ip == _host['interfaces'][0]['ip']]
-
-        logger.success('{} | start'.format(title))
-
-        try:
-
-            # 初始化变量 (用于 pandas 处理数据)
-            _data_idx, _data_max, _data_avg, _data_min = [], [], [], []
-
-            # 提取数据
-            for _host in _data:
-                _num_max, _num_avg, _num_min = utils.mam_of_numbers([_x['value'] for _x in _host['history']], number_type)
-                if (_num_max != None) and (_num_avg != None) and (_num_min != None):
-                    _data_idx.append(_host['name'])
-                    _data_max.append(number_handling(_num_max) if callable(number_handling) == True else _num_max)
-                    _data_avg.append(number_handling(_num_avg) if callable(number_handling) == True else _num_avg)
-                    _data_min.append(number_handling(_num_min) if callable(number_handling) == True else _num_min)
-
-            # 判断结果
-            if (len(_data_idx) > 0) and (image != None):
-
-                # 写入文件
-                with open(self._markdown_file, 'a') as _file:
-
-                    _file.writelines([
-                        '\n',
-                        '## {}\n'.format(title),
-                        '\n',
-                        '{}\n'.format(description),
-                        '\n',
-                        '| {} | Min | Average | Max |\n'.format(table_header_title),
-                        '| --- | --: | --: | --: |\n'
-                    ])
-
-                    for _i, _v in enumerate(_data_idx):
-                        _file.write('| {0} | {1:.2f}{4} | {2:.2f}{4} | {3:.2f}{4} |\n'.format(_v, _data_min[_i], _data_avg[_i], _data_max[_i], number_unit))
-
-                    _plot_data = [
-                        {'key': 'max', 'label': 'Max', 'kind': 'barh', 'data': _data_max, 'color': '#E74C3C', 'width': 0.8},
-                        {'key': 'avg', 'label': 'Avg', 'kind': 'barh', 'data': _data_avg, 'color': '#3498DB', 'width': 0.8},
-                        {'key': 'min', 'label': 'Min', 'kind': 'barh', 'data': _data_min, 'color': '#2ECC71', 'width': 0.8}
-                    ]
-
-                    _plot_image = {
-                        'title': title,
-                        'size': (20, (len(_data_idx) / 5) * 2),
-                        'path': image['path'],
-                        'dpi': 300
-                    }
-
-                    _plot_result = plots.bar_cover(_plot_data, _data_idx, _plot_image)
-
-                    # '<img src="cid:{}">\n'.format(_image['cid'])
-                    # '![](cid:{})\n'.format(_image['cid'])
-                    # 图片显示大小: 仅设置 width, height 自适应
-                    if _plot_result == True:
-                        _file.writelines([
-                            '\n',
-                            '<img src="cid:{}" width="1000px">\n'.format(image['cid'])
-                        ])
-
-            logger.success('{} | end'.format(title))
-
-            return True
-
-        except Exception as e:
-            logger.exception(e)
-            logger.error('{} | end'.format(title))
-            return False
-
-    def handling_html(self, *args, **kwargs):
-        ''' 处理 HTML '''
-
-        logger.success('handling HTML | start')
-
-        try:
-
-            if utils.check_file_type(self._html_file, 'file'):
-
-                # HTML内容
-                _html_lines = None
-
-                # 移除自带样式
-                with open(self._html_file, "r") as _html_input:
-                    _html_lines = _html_input.readlines()
-                    del _html_lines[7:161]
-
-                # 遍历内容
-                for _i, _v in enumerate(_html_lines):
-
-                    # 移除表格宽度
-                    _table_width = re.compile(r'<table style="width:100%;">')
-                    if len(_table_width.findall(_v)) > 0:
-                        _html_lines[_i] = re.sub(_table_width, '<table>', _v)
-
-                    # 移除 colgroup
-                    _colgroup = re.compile(r'</?colgroup>')
-                    if len(_colgroup.findall(_v)) > 0:
-                        _html_lines[_i] = re.sub(_colgroup, '', _v)
-
-                    # 移除列宽度
-                    _col_width = re.compile(r'<col style="width: .*%" />')
-                    if len(_col_width.findall(_v)) > 0:
-                        _html_lines[_i] = re.sub(_col_width, '', _v)
-
-                # 写入文件
-                with open(self._html_file, "w") as _html_output:
-                    _html_output.writelines(_html_lines)
-
-            logger.success('handling HTML | end')
-            return True
-
-        except Exception as e:
-            logger.exception(e)
-            logger.error('handling HTML | end')
-            return False
-
-    def markdown_to_html(self, dir='.', **kwargs):
-        '''
-        Markdown to HTML
-        使用 MacDown 生成 HTML, 然后提取样式到 markdown.html
-        pandoc 生成的 HTML 默认 max-width: 36em, 如果表格内容很长, 会导致表格样式难看
-        所以在 markdown.html 的 body{...} 中添加配置 max-width: unset, 解决内容过长的样式问题
-        所有 a 标签添加 text-decoration: none; 去除链接下划线
-        pandoc --no-highlight -s --quiet -f markdown -t html -H markdown.html -o history.html history.md
-        '''
-
-        logger.success('markdown to html | start')
-
-        try:
-
-            _result = utils.shell(
-                'pandoc --no-highlight -s --quiet -f markdown -t html -H {}/markdown.html -o {} {}'.format(dir, self._html_file, self._markdown_file)
-            )
-
-            if _result != None and _result.returncode == 0:
-                logger.success('markdown to html | end')
-                return True
-            else:
-                logger.error('markdown to html | end')
-                return False
-
-        except Exception as e:
-            logger.exception(e)
-            logger.error('markdown to html | end')
-            return False

ezKit/plots.py

@@ -1,155 +0,0 @@
-import matplotlib.patches as mpatches
-import matplotlib.pyplot as plt
-import numpy as np
-import pandas as pd
-from loguru import logger
-
-
-def bar(data={}, index=[], image={}, **kwargs):
-    '''
-    标准条形图
-    https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.plot.html
-    https://matplotlib.org/stable/api/pyplot_summary.html
-    '''
-    try:
-        _df = pd.DataFrame(data, index=index)
-        '''
-        title: 标题
-        kind: 类型
-        figsize: 图片大小, 以 100 为基数, 这里输出的图片为 2000 x 2000
-        width: 图形条宽度
-        dpi: 清晰度
-        bbox_inches='tight' 去除图片周边空白
-        '''
-        _ax = _df.plot(title=image.get('title'), kind=image.get('kind', 'bar'), figsize=image.get('size', (10, 10)), width=image.get('width', 0.8))
-        _ax.set_xlim(image.get('xlim'))
-        _ax.set_ylim(image.get('ylim'))
-        _ax.figure.savefig(image.get('path', 'image.png'), dpi=image.get('dpi', 300), bbox_inches='tight')
-        return True
-
-    except Exception as e:
-        logger.exception(e)
-        return False
-
-def bar_cover(data=[], index=[], image={}, **kwargs):
-    '''
-    重叠条形图
-    https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.plot.html
-    https://matplotlib.org/stable/api/pyplot_summary.html
-    df.plot.bar() 和 df.plot.barh() 中 stacked=True 的效果是叠加, 即所有图层堆积拼接在一起
-    这里需要的效果是图层重叠, 即按从大到小的顺序依次重叠
-    但是 pandas 没有好的处理方法, 为了实现重叠效果, 以下使用设置 ax 处理
-    '''
-
-    try:
-
-        # 创建数据实例
-        _df = pd.DataFrame({item['key']: item['data'] for item in data}, index)
-
-        '''
-        设置图形类型、颜色、宽度
-        注意顺序: 从大到小排列
-        因为图层是叠加的, 所以后面的图层会覆盖前面的图层
-        如果后面图层的较大, 就会前面较小的图层, 所以把图层较大的放在前面, 图层较小的放在后面
-        _, ax = plt.subplots()
-        df.MAX.plot(kind='barh', ax=ax, color='#E74C3C', width=0.8)
-        df.MID.plot(kind='barh', ax=ax, color='#3498DB', width=0.8)
-        df.MIN.plot(kind='barh', ax=ax, color='#2ECC71', width=0.8)
-        '''
-        _, _ax = plt.subplots()
-        for i in data:
-            _df[i['key']].plot(kind=i.get('kind', 'bar'), ax=_ax, color=i.get('color'), width=i.get('width', 0.8))
-
-        '''
-        设置 Label
-        即图片右上角的说明信息, 这里也有顺序, 会按照 handles 中的顺序显示
-        https://stackoverflow.com/a/69897921
-        patch_max = mpatches.Patch(color='#E74C3C', label='Max')
-        patch_mid = mpatches.Patch(color='#3498DB', label='Mid')
-        patch_min = mpatches.Patch(color='#2ECC71', label='Min')
-        plt.legend(handles=[patch_max, patch_mid, patch_min])
-        '''
-        plt.legend(handles=[mpatches.Patch(color=i.get('color'), label=i.get('label')) for i in data])
-
-        # 设置标题
-        plt.title(image.get('title'))
-
-        # 设置上下限
-        plt.xlim(image.get('xlim'))
-        plt.ylim(image.get('ylim'))
-
-        # 创建图片实例
-        _fig = plt.gcf()
-
-        # 设置图片大小
-        # https://www.zhihu.com/question/37221233
-        _fig.set_size_inches(image.get('size', (10, 10)))
-
-        # 保存图片
-        # bbox_inches='tight' 去除图片周边空白
-        _fig.savefig(image.get('path', 'image.png'), dpi=image.get('dpi', 300), bbox_inches='tight')
-
-        # Close a figure window
-        plt.close()
-
-        # Return
-        return True
-
-    except Exception as e:
-        logger.exception(e)
-        return False
-
-def bar_extend(data=[], index=[], image={}, **kwargs):
-    '''
-    扩展的条形图
-    https://matplotlib.org/stable/api/_as_gen/matplotlib.axes.Axes.plot.html
-    https://matplotlib.org/stable/api/_as_gen/matplotlib.axes.Axes.bar.html
-    https://matplotlib.org/stable/gallery/lines_bars_and_markers/barchart.html
-    https://stackoverflow.com/a/68107816
-    '''
-    try:
-
-        _x = np.arange(len(index))
-
-        _bar_width = image.get('width', 0.8)
-
-        _fig, _ax = plt.subplots()
-
-        _rects = _ax.bar(_x, data, _bar_width, label=image.get('label'), color=image.get('color'))
-
-        # Set base
-        _ax.set_title(image.get('title'))
-        _ax.set_xlabel(image.get('xlabel'))
-        _ax.set_ylabel(image.get('ylabel'))
-        _ax.set_xticks(_x, index)
-
-        # Set view limits
-        _ax.set_xlim(image.get('xlim'))
-        _ax.set_ylim(image.get('ylim'))
-
-        # 设置图例
-        _ax.legend()
-
-        # bar 顶部显示 value
-        _ax.bar_label(_rects, padding=3)
-
-        # 自动调整参数, 使图形适合图形区域
-        _fig.tight_layout()
-
-        # 图片大小
-        # 默认 300px 为 1 个单位
-        # 默认 1920px * 1440px, 即 6.4 * 4.8
-        _fig.set_size_inches(image.get('size', (6.4, 4.8)))
-
-        # 生成图片文件
-        # bbox_inches='tight' 去除图片周边空白
-        _fig.savefig(image.get('path', 'image.png'), dpi=image.get('dpi', 300), bbox_inches='tight')
-
-        # Close a figure window
-        plt.close()
-
-        return True
-
-    except Exception as e:
-        logger.exception(e)
-        return False