lazysdk 0.1.89__tar.gz → 0.1.122__tar.gz

{lazysdk-0.1.89 → lazysdk-0.1.122}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: lazysdk
-Version: 0.1.89
+Version: 0.1.122
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker
@@ -23,7 +23,16 @@ Requires-Dist: filetype==1.2.0
 Requires-Dist: netifaces==0.11.0
 Requires-Dist: user_agents==2.2.0
 Requires-Dist: rich>=13.5.2
-Requires-Dist: urllib3==1.23
+Requires-Dist: urllib3==1.26.9
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # lazysdk
 ![](https://img.shields.io/badge/Python-3.8.6-green.svg)

lazysdk-0.1.122/lazysdk/lazy_header.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+# coding = utf8
+from lazysdk import showdata
+
+def convert2dict(header_str: str):
+    header_temp = header_str.split('\n')
+    header_dict = dict()
+    for each in header_temp:
+        if len(each) == 0:
+            continue
+        else:
+            each_split = each.split(': ')
+            header_dict[each_split[0]] = each_split[1]
+    return header_dict
+
+
+def get_lines():
+    lines = []
+    print("请输入多行数据，以空行结束：")
+    while True:
+        line = input()
+        if line:
+            lines.append(line)
+        else:
+            break
+
+    print("您输入的多行数据是：")
+    return "\n".join(lines)
+
+
+if __name__ == '__main__':
+    test_lines = get_lines()
+    showdata.show_dict(convert2dict(header_str=test_lines))
+

lazysdk-0.1.122/lazysdk/lazy_input.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+# coding = utf8
+from lazysdk import showdata
+
+
+def convert2dict(header_str: str):
+    header_temp = header_str.split('\n')
+    header_dict = dict()
+    for each in header_temp:
+        if len(each) == 0:
+            continue
+        else:
+            each_split = each.split(': ')
+            header_dict[each_split[0]] = each_split[1]
+    return header_dict
+
+
+def get_lines():
+    lines = []
+    print("请输入多行数据，以空行结束：")
+    while True:
+        line = input()
+        if line:
+            lines.append(line)
+        else:
+            break
+
+    print("您输入的多行数据是：")
+    return "\n".join(lines)
+
+
+if __name__ == '__main__':
+    test_lines = get_lines()
+    showdata.show_dict(convert2dict(header_str=test_lines))
+

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazydict.py

@@ -245,7 +245,7 @@ def list_dict_filter(
     从[{},{}]中按照某个key-value条件筛选出符合条件的记录
     """
     list_out = list(filter(lambda x: x[filter_key] == filter_value, list_in))
-    return list_out
+    return copy.deepcopy(list_out)
 
 
 def key_max_value(
@@ -286,3 +286,51 @@ def key_min_value(
         else:
             continue
     return min_value
+
+
+def get_value_list(
+        list_in: list,
+        key,
+        deepcopy: bool = True,
+        value_type: type = None
+):
+    """
+    提取list嵌套的字典中某个key的值列表
+    :param value_type: 将值格式化为指定的类型，例如str
+    """
+    res = []
+    if list_in:
+        for each in list_in:
+            if isinstance(each, dict):
+                each_value  = each.get(key)
+                if each_value and value_type is None:
+                    res.append(each_value)
+                elif each_value and value_type is not None:
+                    if isinstance(each_value, value_type):
+                        res.append(each_value)
+                    else:
+                        res.append(value_type(each_value))
+                else:
+                    continue
+            else:
+                continue
+        if deepcopy:
+            return copy.deepcopy(res)
+        else:
+            return res
+    else:
+        return []
+
+
+if __name__ == '__main__':
+    res = get_value_list(
+        list_in = [
+            {"a": "1"},
+            {"a": "2"},
+            {"a": None},
+        ],
+        key = "a",
+        value_type = int
+
+    )
+    print(res)

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazyexcel.py

@@ -233,7 +233,10 @@ def save_xlsx(
         datetime_cols: list = None,
         num_cols: list = None,
         col_name_dict: dict = None,
-        col_name_sort: list = None
+        col_name_sort: list = None,
+        cell_number_format: dict = None,
+        rank_col: str = None,
+        rank_asc: bool = True,
 ):
     """
     如果输入的value是乱序，将重新排序
@@ -244,14 +247,23 @@ def save_xlsx(
     :param num_cols: 数字列列表
     :param col_name_dict: 自定义列名的对照关系，规则为：{'旧名称1':'新名称1', '旧名称2':'新名称2'}
     :param col_name_sort: 自定义列名排序，将按照列表顺序排，如果不在列表中，将随机
+    :param cell_number_format: 自定义列数据格式，例如{"a": "0.00", "b": "0.00%"}
+    :param rank_col: 排序列名
+    :param rank_asc: 排序列是否正序排序，True为按正序排序，False为按倒序排序
     将输出保存后的文件绝对路径
     """
+    # 自动检查添加后缀
+    if file.endswith(".xlsx"):
+        pass
+    else:
+        file += ".xlsx"
+
     if os.path.isabs(file):  # 判断是否为绝对路径
         pass
     else:
         file = os.getcwd() + path_separator + file
     if value is None:
-        return
+        return file
     else:
         wb = openpyxl.Workbook()
         sheet_index = 0  # sheet序号
@@ -280,6 +292,19 @@ def save_xlsx(
                     keys_sort=col_name_sort
                 )  # 先对要存储的数据做排序对齐
 
+                # 对值排序
+                if rank_col:
+                    if rank_asc:
+                        sheet_data_f = lazydict.dict_list_ranker(
+                            dict_list=sheet_data_f,
+                            rank_by_list=[[rank_col, 'asc']]
+                        )  # 升序排序
+                    else:
+                        sheet_data_f = lazydict.dict_list_ranker(
+                            dict_list=sheet_data_f,
+                            rank_by_list=[[rank_col,'desc']]
+                        )  # 降序排序
+
                 if date_cols is not None:
                     for each_sheet_data_f in sheet_data_f:
                         # 日期格式化
@@ -339,11 +364,18 @@ def save_xlsx(
                         value = each.get(key)
                         if isinstance(value, dict) or isinstance(value, list):
                             value = json.dumps(value, ensure_ascii=False)
-                        sheet.cell(
+                        cell = sheet.cell(
                             row=row_num,
                             column=col_num,
                             value=value
                         )
+
+                        # 对单元数据格式化
+                        if cell_number_format:
+                            value_cell_number_format = cell_number_format.get(key)
+                            if value_cell_number_format:
+                                cell.number_format = value_cell_number_format  # 设置单元格数据格式
+
                         col_num += 1
                     row_num += 1
             else:

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazyfile.py

@@ -145,7 +145,7 @@ def download(
         proxies=proxies,
         verify=verify
     )
-    total_length = response.headers.get('content-length')  # 文件大小
+    total_length = response.headers.get('content-length', '0')  # 文件大小
     content_type = response.headers.get('content-type')  # 文件类型
     content_disposition = response.headers.get('content-disposition')  # 文件名及类型
     filename_default = 'unknown_' + str(time.time())
@@ -169,7 +169,11 @@ def download(
     if filename is None:
         download_file_name = str(filename_default) + "." + str(suffix_name)
     else:
-        download_file_name = str(filename) + "." + str(suffix_name)
+        if filename.endswith(suffix_name):
+            # 如果文件名中已存在后缀名，则不重复添加
+            download_file_name = filename
+        else:
+            download_file_name = str(filename) + "." + str(suffix_name)
 
     if path is None:
         path_local = download_file_name

lazysdk-0.1.122/lazysdk/lazyhash.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+# coding = utf8
+"""
+@ Author : ZeroSeeker
+@ e-mail : zeroseeker@foxmail.com
+@ GitHub : https://github.com/ZeroSeeker
+@ Gitee : https://gitee.com/ZeroSeeker
+"""
+import requests
+import hashlib
+
+
+def md5_file(
+        file_path: str = None,
+        file_url: str = None
+):
+    """
+    计算文件的md5
+    :param file_path: 本地文件路径
+    :param file_url: 网络文件地址
+    """
+    # 文件名不影响md5
+    d5 = hashlib.md5()
+    if file_path:
+        with open(r'%s' % file_path, 'rb') as f:
+            while True:
+                data = f.read(2048)
+                if not data:
+                    break
+                d5.update(data)  # update添加时会进行计算
+        return d5.hexdigest()
+    elif file_url:
+        resp = requests.get(file_url)
+        d5.update(resp.content)  # update添加时会进行计算
+        return d5.hexdigest()
+    else:
+        return
+
+
+def md5_str(
+        content,
+        encoding='UTF-8'
+):
+    d5 = hashlib.md5()
+    d5.update(content.encode(encoding=encoding))  # update添加时会进行计算
+    return d5.hexdigest()
+
+
+def calculate_sha256(
+        content,
+        encoding: str='UTF-8'
+):
+    """
+        计算文档的SHA-256哈希值
+        :param content:
+        :param encoding:
+        :return: SHA-256哈希字符串
+        """
+    # 使用BSON的JSON工具确保一致的序列化
+    return hashlib.sha256(content.encode(encoding)).hexdigest()

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazyhtml.py

@@ -1,3 +1,4 @@
+from collections import OrderedDict
 
 
 def make_thead(head_list: list):
@@ -25,7 +26,9 @@ def make_tbody(body_list: list):
 def make_tb(
         data: list,
         border: int = 0,
-        beautiful: bool = False
+        beautiful: bool = False,
+        charset: str = "UTF-8",
+        col_name_dict: OrderedDict = None
 ) -> str:
     """
     输入数据为list(dict())，输出生成的html表格代码
@@ -35,7 +38,17 @@ def make_tb(
     for each_data in data:
         key_list.extend(list(each_data.keys()))
     key_list = list(set(key_list))
-    thead_list = make_thead(head_list=key_list)
+    if col_name_dict:
+        key_list_new = list()
+        for each_key in key_list:
+            each_value = col_name_dict.get(each_key)
+            if each_value:
+                key_list_new.append(each_value)
+            else:
+                key_list_new.append(each_key)
+        thead_list = make_thead(head_list=key_list_new)
+    else:
+        thead_list = make_thead(head_list=key_list)
     html_head = f"<tr>{''.join(thead_list)}</tr>"
 
     html_body = ''
@@ -50,7 +63,7 @@ def make_tb(
     if border:
         table_others += f' border={border}'
 
-    html_table = f"<table{table_others}>\n{html_head}\n{html_body}</table>"
+    html_table = f"""<meta http-equiv="Content-Type" content="text/html;charset={charset}"/>\n<table{table_others}>\n{html_head}\n{html_body}</table>"""
 
     if beautiful:
         # 美化输出
@@ -66,3 +79,11 @@ def make_tb(
         html_table = html.tostring(root, pretty_print=True)
 
     return html_table
+
+
+def get_text(content: str):
+    """
+    从html中提取文本
+    """
+    import html2text
+    return html2text.html2text(content)

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazyid.py

@@ -40,3 +40,5 @@ class MakeId:
         self.utcnow_str = utcnow_str
         self.urandom_hex = urandom_hex
         self.id = f"{utcnow_str}{urandom_hex}"
+        self.random_uuid = str(uuid.uuid1(node=uuid_node))
+        self.mac_uuid = str(uuid.uuid1())

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazyip.py

@@ -6,6 +6,8 @@
 @ GitHub : https://github.com/ZeroSeeker
 @ Gitee : https://gitee.com/ZeroSeeker
 """
+import json
+
 import requests
 
 
@@ -55,5 +57,6 @@ def get_ip_addr(ip: str):
     """
     api_url = f'http://whois.pconline.com.cn/ipJson.jsp?ip={ip}&json=true'
     response = requests.get(api_url)
-    addr = response.json()['addr']
+    response_text = response.text.replace("\\", "-")
+    addr = json.loads(response_text)['addr']
     return addr

lazysdk-0.1.122/lazysdk/lazyjson.py

@@ -0,0 +1,54 @@
+import json
+import decimal
+import datetime
+import base64
+
+
+class LazyEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, decimal.Decimal):
+            return float(obj)
+        elif isinstance(obj, datetime.datetime):
+            # # 将datetime对象转换为ISO格式字符串
+            return obj.isoformat()
+        elif isinstance(obj, datetime.date):
+            return obj.isoformat()
+        elif isinstance(obj, bytes):
+            # 将bytes转换为base64编码的字符串
+            try:
+                # 尝试将bytes解码为UTF-8字符串
+                return obj.decode('utf-8')
+            except UnicodeDecodeError:
+                # 如果UTF-8解码失败，回退到Base64编码
+                return base64.b64encode(obj).decode('utf-8')
+        # elif isinstance(obj, bson.timestamp.Timestamp):
+        #     # # 将BSON时间戳转换为其时间表示的ISO格式字符串
+        #     return obj.as_datetime().isoformat()
+        # elif isinstance(obj, bson.objectid.ObjectId):
+        #     # # 将ObjectId转换为字符串
+        #     return str(obj)
+        return super(LazyEncoder, self).default(obj)
+
+
+def json2str(
+        data: json,
+        ensure_ascii: bool = False
+):
+    """
+    在将json数据反序列化为str时，会遇到一些格式无法转换
+    这里使用识别类型转换转为str
+    目前支持类型：
+
+    对于mongodb返回数据的处理：
+        from bson import json_util
+        default=json_util.default
+
+    decimal --> str
+    datetime.datetime --> str(%Y-%m-%d %H:%M:%S)
+    datetime.date --> str(%Y-%m-%d)
+    """
+    return json.dumps(
+        data,
+        cls=LazyEncoder,
+        ensure_ascii=ensure_ascii
+    )

lazysdk-0.1.122/lazysdk/lazylist.py

@@ -0,0 +1,43 @@
+
+
+def split(
+        list_in: list,
+        split_gap: int
+):
+    """
+    将输入的list按照split_gap进行分割
+    """
+    list_out = list()
+    split_num = 0
+    for i in range(len(list_in)):
+        if i % split_gap == 0:
+            list_out.append(list())
+            split_num += 1
+        list_out[split_num-1].append(list_in[i])
+    return list_out
+
+
+def list_difference(
+        list_left: list,
+        list_right: list,
+        keep_sort: bool = False
+):
+    """
+    返回两个list的差集，效果等于list_left-list_right，返回无序；
+
+    在 Python 中，可以使用集合（`set`）的特性来取两个列表的差集。差集是指只在一个集合中出现而在另一个集合中没有的元素。
+    使用集合的 `difference()` 方法可以实现列表的差集操作。
+    需要注意的是，集合是无序的，因此在结果中元素的顺序可能与原始列表不同。如果需要保留原始列表的顺序，可以使用列表推导式来实现差集操作
+    """
+    if keep_sort:
+        return [x for x in list_left if x not in list_right]  # 返回有序
+    else:
+        return list(set(list_left).difference(list_right))  # 返回无序
+
+
+if __name__ == '__main__':
+    print(list_difference(
+        list_left=[4,1,2],
+        list_right=[2,3],
+        keep_sort=True
+    ))

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazypath.py

@@ -185,10 +185,13 @@ def delete(path_or_file):
     """
     删除目录/文件
     """
-    if os.path.isdir(path_or_file):
-        shutil.rmtree(path_or_file)
+    if os.path.exists(path_or_file):
+        if os.path.isdir(path_or_file):
+            shutil.rmtree(path_or_file)
+        else:
+            os.remove(path_or_file)
     else:
-        os.remove(path_or_file)
+        return
 
 
 def get_folder_name(dir_or_path: str):
@@ -219,3 +222,10 @@ def path_rename(
         return new_path
     else:
         return
+
+
+def exe_path():
+    """
+    获取当前脚本的绝对路径
+    """
+    return os.path.dirname(os.path.realpath(sys.argv[0]))

lazysdk-0.1.122/lazysdk/lazyre.py

@@ -0,0 +1,40 @@
+import re
+
+
+def find_between(
+        text: str,
+        left: str,
+        right: str = None,
+        until_line_end: bool = False  # 是否匹配到行尾
+):
+    """
+    找两个之间
+    """
+    if until_line_end:
+        return re.findall(pattern=f'{left}(.*?){right}$', string=text, flags=re.S)
+    else:
+        return re.findall(pattern=f'{left}(.*?){right}', string=text, flags=re.S)
+
+
+def find_all(
+        text: str,
+        left: str,
+        right: str = None,
+        until_line_end: bool = False  # 是否匹配到行尾
+):
+    """
+    找一个之后所有
+    """
+    if until_line_end:
+        return re.findall(pattern=f'{left}(.*){right}$', string=text, flags=re.S)
+    else:
+        return re.findall(pattern=f'{left}(.*){right}', string=text, flags=re.S)
+
+
+def find_chs(
+        text: str
+):
+    """
+    提取中文，目前不能去掉括号
+    """
+    return re.sub(pattern="[A-Za-z0-9\!\%\[\]\,\。\ \']", repl="", string=text)

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazyrequests.py

@@ -23,7 +23,8 @@ def lazy_requests(
         ReadTimeout_retry: bool = True,  # 超时重试
         JSONDecodeError_retry: bool = True,  # 返回非json类型重试
         ConnectionError_retry: bool = True,  # 连接错误重试
-        ChunkedEncodingError: bool = True,
+        ChunkedEncodingError_retry: bool = True,
+        TooManyRedirects_retry: bool = True,
 
         **kwargs
 ):
@@ -53,22 +54,27 @@ def lazy_requests(
         except requests.exceptions.ReadTimeout:
             if ReadTimeout_retry is True:
                 retry_count += 1
-                showlog.warning(f'ReadTimeout_retry，将在{retry_delay}秒后重试第{retry_count}次...')
+                showlog.warning(f'ReadTimeout，将在{retry_delay}秒后重试第{retry_count}次...')
                 time.sleep(retry_delay)
         except requests.exceptions.JSONDecodeError:
             if JSONDecodeError_retry is True:
                 retry_count += 1
-                showlog.warning(f'JSONDecodeError_retry，将在{retry_delay}秒后重试第{retry_count}次...')
+                showlog.warning(f'JSONDecodeError，将在{retry_delay}秒后重试第{retry_count}次...')
                 time.sleep(retry_delay)
         except requests.exceptions.ConnectionError:  # 包含ProxyError
             if ConnectionError_retry is True:
                 retry_count += 1
-                showlog.warning(f'ConnectionError_retry，将在{retry_delay}秒后重试第{retry_count}次...')
+                showlog.warning(f'ConnectionError，将在{retry_delay}秒后重试第{retry_count}次...')
                 time.sleep(retry_delay)
         except requests.exceptions.ChunkedEncodingError:
-            if ChunkedEncodingError is True:
+            if ChunkedEncodingError_retry is True:
                 retry_count += 1
-                showlog.warning(f'ChunkedEncodingError_retry，将在{retry_delay}秒后重试第{retry_count}次...')
+                showlog.warning(f'ChunkedEncodingError，将在{retry_delay}秒后重试第{retry_count}次...')
+                time.sleep(retry_delay)
+        except requests.exceptions.TooManyRedirects:
+            if TooManyRedirects_retry is True:
+                retry_count += 1
+                showlog.warning(f'TooManyRedirects，将在{retry_delay}秒后重试第{retry_count}次...')
                 time.sleep(retry_delay)
         if retry_limit == 0:
             break

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazytext.py

@@ -58,7 +58,9 @@ def path_clean(content):
     """
     清除路径前后可能出现的引号
     """
-    if content[0] == '"' and content[-1] == '"':
+    if not content:
+        return content
+    elif content[0] == '"' and content[-1] == '"':
         content = content[1:-1]
     elif content[0] == '“' and content[-1] == '”':
         content = content[1:-1]

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazytime.py

@@ -163,13 +163,17 @@ def get_time(
 
 
 def get_datetime(
-        f: str = '%Y-%m-%d %H:%M:%S'
+        f: str = '%Y-%m-%d %H:%M:%S',
+        utc: bool = False
 ):
     """
     获取当前系统的当前时间格式的时间，精确到秒
     :return: 2018-08-01 14:18:31
     """
-    inner_now = datetime.datetime.now()
+    if utc:
+        inner_now = datetime.datetime.now(pytz.utc)
+    else:
+        inner_now = datetime.datetime.now()
     data_time = inner_now.strftime(f)
     return data_time
 
@@ -287,20 +291,26 @@ def get_timestamp():
 def get_timestamp2datetime(
         timestamp: int = None,
         f: str = "%Y-%m-%d %H:%M:%S",
-        zero_to_none: bool = True
+        zero_to_none: bool = True,
+        utc: bool = False
 ):
     """
     将时间戳转换为datetime时间
     :param timestamp: 同时支持字符串和数字格式
     :param f:
     :param zero_to_none: 将0转换为空值
+    :param utc: 是否为utc时间
     :return: 2018-08-01 14:19:53
     """
     if timestamp is not None:
         if timestamp == 0 and zero_to_none is True:
             return
         else:
-            time_array = time.localtime(timestamp)
+            if utc:
+                time_array = time.gmtime(timestamp)
+            else:
+                time_array = time.localtime(timestamp)
+
             date_time = time.strftime(f, time_array)
             return date_time
     else:
@@ -310,7 +320,8 @@ def get_timestamp2datetime(
 def get_timestamp2date(
         timestamp: int = None,
         f: str = "%Y-%m-%d",
-        zero_to_none: bool = True
+        zero_to_none: bool = True,
+        utc: bool = False
 ):
     """
     将时间戳转换为datetime时间
@@ -318,13 +329,17 @@ def get_timestamp2date(
     :param timestamp:
     :param f:
     :param zero_to_none: 将0转换为空值
+    :param utc: 是否为utc时间
     :return: 2018-08-01 14:19:53
     """
     if timestamp is not None:
         if timestamp == 0 and zero_to_none is True:
             return
         else:
-            time_array = time.localtime(timestamp)
+            if utc:
+                time_array = time.gmtime(timestamp)
+            else:
+                time_array = time.localtime(timestamp)
             date_time = time.strftime(f, time_array)
             return date_time
     else:
@@ -655,6 +670,20 @@ def date_str_list(
     return date_list
 
 
+def get_date_list(
+        start_date: str = None,
+        end_date: str = None,
+        start_days: int = None,
+        end_days: int = None
+):
+    return date_str_list(
+        start_date=start_date,
+        end_date=end_date,
+        start_days=start_days,
+        end_days=end_days
+    )
+
+
 def date_str_list_form_now(
         day_num: int = 1
 ):
@@ -699,14 +728,20 @@ def get_data_date_string(
 
 def get_date_string(
         days: int = 0,
-        f: str = '%Y-%m-%d'
+        f: str = '%Y-%m-%d',
+        utc: bool = False
 ):
     """
     获取多少天以后的时间字符串
     :param days: 多少天以后，正数向未来计算，负数向历史计算，0是当天
+    :param f:
+    :param utc:
     :return: 时间字符串(xxxx-xx-xx)
     """
-    current_time = datetime.datetime.now()
+    if utc:
+        current_time = datetime.datetime.now(tz=pytz.utc)
+    else:
+        current_time = datetime.datetime.now()
     target_time = current_time + datetime.timedelta(days=days)
     date_str = target_time.strftime(f)
     return date_str
@@ -890,7 +925,8 @@ def get_file_name(
 
 
 def format_seconds(
-        input_seconds
+        input_seconds,
+        output_type: type = str
 ):
     """
     输入秒数，以时间形式输出
@@ -902,7 +938,10 @@ def format_seconds(
         seconds=seconds,  # 秒
         microseconds=microseconds  # 微秒
     )
-    return format_time
+    if output_type:
+        return output_type(format_time)
+    else:
+        return format_time
 
 
 def get_gap_days(
@@ -985,3 +1024,83 @@ def network_timestamp():
     res = requests.get(url=url)
     net_t = res.json()['data']['t']  # 精确到毫秒的时间戳
     return int(net_t)
+
+
+def str2datetime(
+        input_str,
+        input_str_format: str = 'YYYYmmdd',
+        output_str_format: str = '%Y-%m-%d %H:%M:%S.%f',
+):
+    """
+    将输入的字符串按照既定格式格式化后输出
+    :param input_str: 输入的字符串
+    :param input_str_format: 输入的字符串格式，例如：YYmmdd
+    :param output_str_format: 输出的字符串格式，例如：%Y-%m-%d %H:%M:%S.%f
+    """
+    year_str = ""
+    month_str = ""
+    day_str = ""
+    hour_str = ""
+    minute_str = ""
+    second_str = ""
+
+    for index in range(len(input_str_format)):
+        index_str = input_str_format[index]
+        if index_str == 'Y':
+            year_str += input_str[index]
+        elif index_str == 'm':
+            month_str += input_str[index]
+        elif index_str == 'd':
+            day_str += input_str[index]
+        elif index_str == 'H':
+            hour_str += input_str[index]
+        elif index_str == 'M':
+            minute_str += input_str[index]
+        elif index_str == 'S':
+            second_str += input_str[index]
+        else:
+            continue
+
+    if year_str:
+        year_int = int(year_str)
+    else:
+        year_int = None
+
+    if month_str:
+        month_int = int(month_str)
+    else:
+        month_int = None
+
+    if day_str:
+        day_int = int(day_str)
+    else:
+        day_int = None
+
+    if hour_str:
+        hour_int = int(hour_str)
+    else:
+        hour_int = 0
+
+    if minute_str:
+        minute_int = int(minute_str)
+    else:
+        minute_int = 0
+
+    if second_str:
+        second_int = int(second_str)
+    else:
+        second_int = 0
+
+    return datetime.datetime(
+        year=year_int,
+        month=month_int,
+        day=day_int,
+        hour=hour_int,
+        minute=minute_int,
+        second=second_int
+    ).strftime(output_str_format)
+
+
+if __name__ == '__main__':
+    res = str2datetime(input_str="20250101123456", input_str_format="YYYYmmdd")
+    print(res)

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk/lazywebhook.py

@@ -6,6 +6,8 @@
 @ GitHub : https://github.com/ZeroSeeker
 @ Gitee : https://gitee.com/ZeroSeeker
 """
+import time
+
 from lazysdk import lazyrequests
 import showlog
 import json
@@ -202,7 +204,9 @@ def send_text(
         at_ids: list = None,
         at_mobiles: list = None,
         is_at: bool = None,
-        at_all: bool = None
+        at_all: bool = None,
+        ensure_success: bool = False,
+        ensure_success_limit: int = 60
 ):
     """
     在内部实例化，
@@ -233,14 +237,84 @@ def send_text(
     webhook_hostname = urlparse(webhook).hostname
     if webhook_hostname == 'qyapi.weixin.qq.com':
         webhook_basic = WeixinBasics(con_info=con_info)
-        response = webhook_basic.send_text(
-            msg=msg,
-            con_info=con_info,
-            at_ids=at_ids,
-            at_mobiles=at_mobiles,
-            is_at=is_at,
-            at_all=at_all
+        retry_count = 0
+        while True:
+            response = webhook_basic.send_text(
+                msg=msg,
+                con_info=con_info,
+                at_ids=at_ids,
+                at_mobiles=at_mobiles,
+                is_at=is_at,
+                at_all=at_all
+            )
+            if not ensure_success:
+                return response
+            else:
+                if response.get('errcode') == 0:
+                    return response
+                else:
+                    showlog.warning(response)
+                    retry_count += 1
+                    if retry_count > ensure_success_limit:
+                        return response
+                    time.sleep(1)
+    elif webhook_hostname == 'open.feishu.cn':
+        return lazyrequests.lazy_requests(
+            url=webhook,
+            method="POST",
+            headers={"Content-Type": "application/json"},
+            json={"msg_type":"text","content":{"text": msg}}
+        )
+    elif webhook_hostname == 'api.day.app':
+        # 支持简单的Bark推送
+        return lazyrequests.lazy_requests(
+            url=webhook,
+            method="GET"
         )
-        return response
     else:
         return {'errcode': -2, 'errmsg': '暂不支持此webhook'}
+
+
+def send(
+        msg: str = None,
+
+        env_file_name: str = None,
+        webhook: str = None,
+        webhooks: list = None,
+        at_ids: list = None,
+        at_mobiles: list = None,
+        is_at: bool = None,
+        at_all: bool = None,
+        ensure_success: bool = False,
+        ensure_success_limit: int = 60
+):
+    webhooks_all = list()
+    send_res = list()
+    if webhook:
+        webhooks_all.append(webhook)
+    if webhooks:
+        webhooks_all.extend(webhooks)
+
+    if not webhooks_all:
+        showlog.warning("无有效的webhook地址")
+    else:
+        for each_index, each_webhook in enumerate(webhooks_all):
+            showlog.info(f"正在发送第 {each_index+1}/{len(webhooks_all)} 条推送: \n{msg}\n")
+            each_send_res = send_text(
+                msg=msg,
+                env_file_name=env_file_name,
+                webhook=each_webhook,
+                at_ids=at_ids,
+                at_mobiles=at_mobiles,
+                is_at=is_at,
+                at_all=at_all,
+                ensure_success=ensure_success,
+                ensure_success_limit=ensure_success_limit
+            )
+            send_res.append({
+                "webhook": each_webhook,
+                "msg": msg,
+                "send_res": each_send_res,
+            })
+
+    return send_res

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: lazysdk
-Version: 0.1.89
+Version: 0.1.122
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker
@@ -23,7 +23,16 @@ Requires-Dist: filetype==1.2.0
 Requires-Dist: netifaces==0.11.0
 Requires-Dist: user_agents==2.2.0
 Requires-Dist: rich>=13.5.2
-Requires-Dist: urllib3==1.23
+Requires-Dist: urllib3==1.26.9
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # lazysdk
 ![](https://img.shields.io/badge/Python-3.8.6-green.svg)

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk.egg-info/SOURCES.txt

@@ -3,7 +3,9 @@ README.md
 setup.py
 lazysdk/__init__.py
 lazysdk/lazyCrypto.py
+lazysdk/lazy_header.py
 lazysdk/lazy_id_card.py
+lazysdk/lazy_input.py
 lazysdk/lazybase64.py
 lazysdk/lazycache.py
 lazysdk/lazychromedriver.py
@@ -13,17 +15,20 @@ lazysdk/lazyenv.py
 lazysdk/lazyexcel.py
 lazysdk/lazyfile.py
 lazysdk/lazyflask.py
+lazysdk/lazyhash.py
 lazysdk/lazyhtml.py
 lazysdk/lazyid.py
 lazysdk/lazyinfo.py
 lazysdk/lazyip.py
 lazysdk/lazyjson.py
+lazysdk/lazylist.py
 lazysdk/lazym3u8.py
 lazysdk/lazymd5.py
 lazysdk/lazypath.py
 lazysdk/lazyprocess.py
 lazysdk/lazyproxies.py
 lazysdk/lazyrandom.py
+lazysdk/lazyre.py
 lazysdk/lazyredis.py
 lazysdk/lazyrequests.py
 lazysdk/lazytext.py

{lazysdk-0.1.89 → lazysdk-0.1.122}/lazysdk.egg-info/requires.txt

@@ -11,4 +11,4 @@ filetype==1.2.0
 netifaces==0.11.0
 user_agents==2.2.0
 rich>=13.5.2
-urllib3==1.23
+urllib3==1.26.9

{lazysdk-0.1.89 → lazysdk-0.1.122}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.89",
+    version="0.1.122",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -40,6 +40,6 @@ setuptools.setup(
         'netifaces==0.11.0',
         'user_agents==2.2.0',
         'rich>=13.5.2',
-        'urllib3==1.23'
+        'urllib3==1.26.9'  # 之前为urllib3==1.23
     ]
 )

lazysdk-0.1.89/lazysdk/lazyjson.py

@@ -1,33 +0,0 @@
-import json
-import decimal
-import datetime
-
-
-class LazyEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, decimal.Decimal):
-            return float(obj)
-        elif isinstance(obj, datetime.datetime):
-            return obj.strftime('%Y-%m-%d %H:%M:%S')
-        elif isinstance(obj, datetime.date):
-            return obj.strftime('%Y-%m-%d')
-        super(LazyEncoder, self).default(obj)
-
-
-def json2str(
-        data: json,
-        ensure_ascii: bool = False
-):
-    """
-    在将json数据反序列化为str时，会遇到一些格式无法转换
-    这里使用识别类型转换转为str
-    目前支持类型：
-    decimal --> str
-    datetime.datetime --> str(%Y-%m-%d %H:%M:%S)
-    datetime.date --> str(%Y-%m-%d)
-    """
-    return json.dumps(
-        data,
-        cls=LazyEncoder,
-        ensure_ascii=ensure_ascii
-    )