pybaseutils 2.2.12__tar.gz → 2.2.16__tar.gz

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/PKG-INFO

@@ -1,12 +1,18 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pybaseutils
-Version: 2.2.12
+Version: 2.2.16
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan
 Author-email: 390737991@qq.com
 License: MIT
 License-File: LICENCE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
 
 base-utils
 ==========
@@ -30,8 +36,8 @@ pybaseutils(Python)
 
 pybaseutils是个人开发常用的python库，集成了python等常用的算法
 
--  安装方法1：pip install -i https://pypi.tuna.tsinghua.edu.cn/simple
-   pybaseutils (有延时，可能不是最新版本)
+-  安装方法1：pip install
+-  pybaseutils (有延时，可能不是最新版本)
 -  安装方法2：pip install –upgrade -i https://pypi.org/simple
    pybaseutils (从pypi源下载最新版本)
 

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/README.md

@@ -6,6 +6,7 @@
 
 ## base_utils(C++)
 
+
 base_util是个人开发常用的C++库，集成了C/C++ OpenCV等常用的算法
 
 - 增加了debug测试宏定义，如时间测试，LOG信息等
@@ -17,7 +18,8 @@ base_util是个人开发常用的C++库，集成了C/C++ OpenCV等常用的算
 
 pybaseutils是个人开发常用的python库，集成了python等常用的算法
 
-- 安装方法1：pip install -i https://pypi.tuna.tsinghua.edu.cn/simple  pybaseutils (有延时，可能不是最新版本)
+- 安装方法1：pip install 
+- pybaseutils (有延时，可能不是最新版本)
 - 安装方法2：pip install --upgrade  -i https://pypi.org/simple pybaseutils (从pypi源下载最新版本)
 
 

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/__init__.py

@@ -5,4 +5,4 @@
     @Date   : 2019-05-07 17:40:27
 """
 
-__version__ = '2.2.12'
+__version__ = '2.2.16'

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/file_utils.py

@@ -240,7 +240,7 @@ def read_data(filename, split=",", convertNum=True):
     return lines
 
 
-def str2number(x: str | int | float):
+def str2number(x):
     """
     :param x:
     :return:

pybaseutils-2.2.16/pybaseutils/font_style/__init__.py

@@ -0,0 +1,73 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : Pan
+    @E-mail : 390737991@qq.com
+    @Date   : 2019-05-07 17:40:27
+"""
+import os
+
+# TODO 如果字体缺失，可以把字体拷贝到系统字体目录：cp -r fonts/* ~/.local/share/fonts/
+# windows: C:\Windows\Fonts可查看系统支持的字体
+# Linux  : /usr/share/fonts/truetype 或者~/.local/share/fonts中 可查看系统支持的字体
+
+BASE_FONT = os.path.dirname(__file__)
+
+# 可能的字体路径列表
+FONT_ROOT = [
+    os.path.expanduser("~/.local/share/fonts"),
+    os.path.expanduser("~/.local/share/truetype"),
+    os.path.expanduser("~/.fonts"),  # 用户字体目录
+    BASE_FONT,  # 用户字体目录
+    "/usr/share/fonts",
+    "/usr/share/fonts/truetype",
+    "/usr/share/fonts/opentype",
+]
+
+
+def get_all_files(file_dir, postfix=[]):
+    """获取file_dir目录下，所有文本路径，包括子目录文件"""
+    file_list = []
+    for walk in os.walk(file_dir):
+        # paths = [os.path.join(walk[0], file).replace("\\", "/") for file in walk[2]]
+        paths = [os.path.join(walk[0], file) for file in walk[2]]
+        file_list.extend(paths)
+    if not file_list: return file_list
+    out_list = []
+    for file in file_list:
+        p = f"*.{os.path.basename(file).split('.')[-1]}"
+        if p in postfix: out_list.append(file)
+    return out_list
+
+
+def get_system_fonts(root=[]):
+    """
+    获得字体路径
+    默认字体：ImageFont.load_default()
+    :param root: 字体路径
+    :return:
+    """
+    if root and isinstance(root, str): root = [root]
+    font_root = root if root else FONT_ROOT
+    font_tables = {
+        "楷体": os.path.join(BASE_FONT, "simkai.ttf"),
+        "simkai": os.path.join(BASE_FONT, "simkai.ttf"),
+        "宋体": os.path.join(BASE_FONT, "simsun.ttc"),
+        "simsun": os.path.join(BASE_FONT, "simsun.ttc"),
+        "仿宋": os.path.join(BASE_FONT, "simfang.ttf"),
+        "simfang": os.path.join(BASE_FONT, "simfang.ttf"),
+        "黑体": os.path.join(BASE_FONT, "simhei.ttf"),
+        "simhei": os.path.join(BASE_FONT, "simhei.ttf"),
+        "方正": os.path.join(BASE_FONT, "方正粗黑宋简体.ttf"),
+        # "等线": os.path.join(FONT_ROOT, "Deng.ttf"),
+    }
+    for dir in font_root:
+        files = get_all_files(dir, postfix=['*.ttf', '*.ttc', '*.otf'])
+        for file in files:
+            name = os.path.basename(file).split(".")[0]
+            font_tables[name] = file
+    for name in list(font_tables.keys()):
+        if not os.path.exists(font_tables[name]): font_tables.pop(name)
+    return font_tables
+
+
+FONT_TABLES = get_system_fonts()

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/font_utils.py

@@ -9,20 +9,22 @@
 import os
 import cv2
 import re
+import glob
 import PIL
 import platform
 import numpy as np
 from PIL import Image, ImageDraw, ImageFont
-from pybaseutils import image_utils, file_utils
-from pybaseutils.font_style import FONT_TYPE, FONT_ROOT
+from pybaseutils import image_utils
+from pybaseutils.font_style import FONT_TABLES, get_system_fonts
 from fontTools.ttLib import TTFont
 
 ROOT = os.path.dirname(__file__)
 
 
 class FontType(object):
-    def __init__(self, root=FONT_ROOT, style="宋体", size=20):
+    def __init__(self, root=[], style="DejaVuSans", size=20):
         """
+        Linux ~/.local/share/fonts
         :param root: 安装字体的路径
         :param style: 选择字体风格
         :param size: 旋转字体大小
@@ -30,10 +32,13 @@ class FontType(object):
         self.font_root = root
         self.font_style = style
         self.font_size = size
-        self.font_file = os.path.join(self.font_root, FONT_TYPE[style])
-        self.font_type = None
-        if os.path.exists(self.font_file):
+        self.font_table = get_system_fonts(root=root)
+        self.font_file = self.font_table.get(style, "")
+        try:
             self.font_type = ImageFont.truetype(self.font_file, size=self.font_size, encoding="utf-8")
+        except:
+            print(f"字体{style}{self.font_file}加载失败，使用系统默认字体")
+            self.font_type = ImageFont.load_default()
 
     def set_root(self, root):
         """设置字体的路径"""
@@ -53,7 +58,7 @@ class FontType(object):
         return self.font_type
 
 
-font_type = FontType()
+# font_type = FontType()
 
 
 def get_font_type(size, font=""):
@@ -72,10 +77,9 @@ def get_font_type(size, font=""):
     elif platform.system().lower() == 'windows':
         font = ImageFont.truetype("simhei.ttf", size, encoding="utf-8")  # simsun.ttc 宋体
     elif platform.system().lower() == 'linux':
-        # font = ImageFont.truetype("uming.ttc", size, encoding="utf-8")
-        font = ImageFont.truetype("NotoSansCJK-Regular.ttc", size, encoding="utf-8")
+        font = ImageFont.truetype(FONT_TABLES['simhei'], size, encoding="utf-8")  # simsun.ttc 宋体
     else:
-        font = ImageFont.truetype(os.path.join(ROOT, "font_style/simhei.ttf"), size, encoding="utf-8")
+        font = ImageFont.load_default()
     return font
 
 
@@ -104,32 +108,32 @@ def draw_image_text(image, point, text, style="楷体", size=20, color=(255, 255
     return image
 
 
-def draw_font(text, style="楷体", scale=1.0, size=20, c1=(255, 255, 255), c2=(0, 0, 0), center=True):
+def draw_font(text, style="楷体", scale=1.0, size=20, fg=(255, 255, 255), bg=(0, 0, 0), center=True):
     """
     绘制汉字
     :param text:
     :param style: 字体风格
     :param scale: 缩放因子
     :param size: 字体大小
-    :param c1:字体颜色
-    :param c2:背景颜色
+    :param fg:字体颜色
+    :param bg:背景颜色
     :param center: 是否居中显示
     :return:
     """
     if center:
-        image = image_utils.create_image(shape=(size * 2, size * 2, 3), color=c2)
-        image = draw_image_text(image, (0, 0), text, style=style, size=size, color=c1)
+        image = image_utils.create_image(shape=(size * 2, size * 2, 3), color=bg)
+        image = draw_image_text(image, (0, 0), text, style=style, size=size, color=fg)
         if np.sum(image) < 1: return None
         mask = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
         box = image_utils.get_mask_boundrect_cv(mask, binarize=True, shift=10)
         image = image_utils.get_box_crop(image, box)
-        image = image_utils.resize_image_padding(image, size=(size, size), color=(0, 0, 0))
+        image = image_utils.resize_image_padding(image, size=(size, size), color=bg)
     else:
-        image = image_utils.create_image(shape=(size, size, 3), color=c2)
-        image = draw_image_text(image, (0, 0), text, style=style, size=size, color=c1)
+        image = image_utils.create_image(shape=(size, size, 3), color=bg)
+        image = draw_image_text(image, (0, 0), text, style=style, size=size, color=fg)
         if np.sum(image) < 1: return None
     if scale < 1.0:
-        image = image_utils.get_scale_image(image, scale=scale, offset=(0, 0), color=c2)
+        image = image_utils.get_scale_image(image, scale=scale, offset=(0, 0), color=bg)
     return image
 
 
@@ -210,10 +214,11 @@ def get_font_char(font_file, only_chinese=False):
 def draw_font_example():
     size = 512
     string = "我"
-    for style, path in FONT_TYPE.items():
-        style = "/home/dm/nasdata/dataset-dmai/ziku/1200款精品字体/书法字体库 37款/国祥手写体.ttf"
-        image = draw_font(string, style=style, size=size, scale=0.8, c2=(100, 0, 255))
+    for style, path in FONT_TABLES.items():
+        print(style, path)
+        image = draw_font(string, style=style, size=size, scale=0.8, fg=(255, 255, 255), bg=(128, 128, 128))
         image_utils.cv_show_image("style", image, use_rgb=False)
+        # cv2.imwrite("./style.png", image)
 
 
 def re_example():
@@ -225,5 +230,6 @@ def re_example():
 
 
 if __name__ == "__main__":
-    # draw_font_example()
-    re_example()
+    draw_font_example()
+    # get_system_fonts()
+    # re_example()

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/image_utils.py

@@ -22,6 +22,7 @@ from typing import List, Dict, Tuple
 from PIL import ImageDraw, ImageFont
 from math import cos, sin
 from pybaseutils import file_utils, color_utils
+from pybaseutils import font_style
 from pybaseutils.coords_utils import *
 from pybaseutils.cvutils import corner_utils
 
@@ -46,29 +47,6 @@ mpii_skeleton = [[0, 1], [1, 2], [3, 4], [4, 5], [2, 6], [6, 3], [12, 11], [7, 1
                  [11, 10], [13, 14], [14, 15], [8, 9], [8, 7], [6, 7], [7, 13]]
 
 
-def get_font_type(size, font=""):
-    """
-    Windows字体路径      : /usr/share/fonts/楷体.ttf
-    Linux(Ubuntu)字体路径：/usr/share/fonts/楷体.ttf
-     >> fc-list             查看所有的字体
-     >> fc-list :lang=zh    查看所有的中文字体
-    :param size: 字体大小
-    :param font:  simsun.ttc 宋体;simhei.ttf 黑体
-    :return:
-    """
-    # 参数1：字体文件路径，参数2：字体大小；Windows系统“simhei.ttf”默认存储在路径：
-    if font:
-        font = ImageFont.truetype(font, size, encoding="utf-8")
-    elif platform.system().lower() == 'windows':
-        font = ImageFont.truetype("simhei.ttf", size, encoding="utf-8")  # simsun.ttc 宋体
-    elif platform.system().lower() == 'linux':
-        # font = ImageFont.truetype("uming.ttc", size, encoding="utf-8")
-        font = ImageFont.truetype("NotoSansCJK-Regular.ttc", size, encoding="utf-8")
-    else:
-        font = ImageFont.truetype(os.path.join(root, "font_style/simhei.ttf"), size, encoding="utf-8")
-    return font
-
-
 def create_image(shape, color=(255, 255, 255), dtype=np.uint8, use_rgb=False):
     """
     生成一张图片
@@ -697,16 +675,17 @@ def resize_image(image, size: Tuple, interpolation=cv2.INTER_LINEAR):
 def image_boxes_resize_padding(image, input_size, boxes=None, points=None, color=(0, 0, 0)):
     """
     等比例图像resize,保持原始图像内容比，避免失真,短边会0填充
-    input_size = [300, 300]
-    image_path = "test.jpg"
-    src_boxes = [[8.20251, 1, 242.2412, 699.2236],
-                 [201.14865, 204.18265, 468.605, 696.36163]]
-    src_boxes = np.asarray(src_boxes)
-    image = read_image(image_path)
-    image1, boxes1 = image_boxes_resize_padding(image, input_size, src_boxes)
-    image1 = show_image_boxes("Det", image1, boxes1, color=(255, 0, 0), delay=3)
-    boxes = image_boxes_resize_padding_inverse(image.shape, input_size, boxes1)
-    show_image_boxes("image", image, boxes)
+    >> example:
+        input_size = [300, 300]
+        image_path = "../data/test_image/grid1.png"
+        boxes = [[120, 50, 250, 180]]
+        boxes = np.asarray(boxes)
+        image0 = read_image(image_path)
+        show_image_boxes("image0", image0, boxes, color=(255, 0, 0), delay=3)
+        image1 = image_boxes_resize_padding(image0, input_size, boxes)
+        show_image_boxes("image1", image1, boxes, color=(0, 255, 0), delay=3)
+        boxes = image_boxes_resize_padding_inverse((image0.shape[1], image0.shape[0]), input_size, boxes)
+        show_image_boxes("image2", image0, boxes, color=(0, 0, 255))
     :param size:
     """
     height, width = image.shape[:2]
@@ -1417,9 +1396,16 @@ def draw_image_box_text(image, bbox, color, text, thickness=2, fontScale=0.8, dr
     :return:
     """
     thickness, fontScale = get_linesize(max(image.shape), thickness=thickness, fontScale=fontScale)
-    text_loc = (bbox[0], bbox[1]) if top else (bbox[0], bbox[3])
+    # text_loc = (bbox[0], bbox[1]) if top else (bbox[0], bbox[3])
     if not text: drawType = "simple"
+    text_size, baseline = cv2.getTextSize(str(text), cv2.FONT_HERSHEY_SIMPLEX, fontScale, thickness)
+    if top:
+        # text_loc = (bbox[0], bbox[1] + text_size[1])  # 在左上角下方绘制文字
+        text_loc = (bbox[0], bbox[1] - baseline // 2)  # 在左上角上方绘制文字
+    else:
+        text_loc = (bbox[0], bbox[3] + text_size[1] + baseline // 2)
     if drawType == "chinese" or drawType == "ch":
+        if not top: text_loc = (text_loc[0], text_loc[1] - baseline)
         cv2.rectangle(image, (bbox[0], bbox[1]), (bbox[2], bbox[3]), color, thickness)
         cv2_putText(image, str(text), text_loc, color=color, fontScale=fontScale, thickness=thickness)
     elif drawType == "simple" or drawType == "en":
@@ -1427,13 +1413,7 @@ def draw_image_box_text(image, bbox, color, text, thickness=2, fontScale=0.8, dr
         cv2.putText(image, str(text), text_loc, cv2.FONT_HERSHEY_SIMPLEX, fontScale, color, thickness)
     elif drawType == "custom":
         cv2.rectangle(image, (bbox[0], bbox[1]), (bbox[2], bbox[3]), color, thickness)
-        text_size, baseline = cv2.getTextSize(str(text), cv2.FONT_HERSHEY_SIMPLEX, fontScale, thickness)
-        if top:
-            # text_loc = (bbox[0], bbox[1] + text_size[1])  # 在左上角下方绘制文字
-            text_loc = (bbox[0], bbox[1] - baseline // 2)  # 在左上角上方绘制文字
-        else:
-            text_loc = (bbox[0], bbox[3])
-        bg1 = (text_loc[0], text_loc[1] - text_size[1])
+        bg1 = (text_loc[0], text_loc[1] - text_size[1] - baseline // 2)
         bg2 = (text_loc[0] + text_size[0], text_loc[1] + baseline // 2)  # 底纹等于字体的宽度
         # bg2 = (max(bbox[2], text_loc[0] + text_size[0]), text_loc[1] + baseline // 2) # 底纹等于box的宽度
         cv2.rectangle(image, bg1, bg2, color, thickness)  # 先绘制框，再填充
@@ -1484,12 +1464,36 @@ def draw_text_pil(image, point, text, size=10, color_color=(255, 0, 0)):
     return image
 
 
+def get_font_type(size, font=""):
+    """
+    Windows字体路径      : /usr/share/fonts/楷体.ttf
+    Linux(Ubuntu)字体路径：/usr/share/fonts/楷体.ttf
+     >> fc-list             查看所有的字体
+     >> fc-list :lang=zh    查看所有的中文字体
+    :param size: 字体大小
+    :param font:  simsun.ttc 宋体;simhei.ttf 黑体
+    :return:
+    """
+    # 参数1：字体文件路径，参数2：字体大小；Windows系统“simhei.ttf”默认存储在路径：
+    if font:
+        font = ImageFont.truetype(font, size, encoding="utf-8")
+    elif platform.system().lower() == 'windows':
+        font = ImageFont.truetype("simhei.ttf", size, encoding="utf-8")  # simsun.ttc 宋体
+    elif platform.system().lower() == 'linux':
+        font = ImageFont.truetype(font_style.FONT_TABLES['simhei'], size, encoding="utf-8")  # simsun.ttc 宋体
+        # font = ImageFont.load_default()
+    else:
+        font = ImageFont.load_default()
+    return font
+
+
 def cv2_putText(img, text, point, fontFace=None, fontScale=0.8, color=(255, 0, 0), thickness=None):
     # cv2.putText(img, str(text), point, fontFace, fontScale, color=color, thickness=thickness)
+    text_size, baseline = cv2.getTextSize(str(text), cv2.FONT_HERSHEY_SIMPLEX, fontScale, thickness)
     pilimg = Image.fromarray(img)  # Image.fromarray()将数组类型转成图片格式，与np.array()相反
     draw = ImageDraw.Draw(pilimg)  # PIL图片上打印汉字
-    size = int(fontScale * 10 * thickness)
-    point = (point[0], point[1] - int(size * 1.3))
+    size = text_size[1]  # 字体大小
+    point = (point[0], point[1] - text_size[1] + baseline // 2)
     font = get_font_type(size=size)
     draw.text(point, text, color, font)
     img[:] = np.asarray(pilimg)
@@ -1841,7 +1845,8 @@ def softmax(x, axis=1):
     # 计算每行的最大值
     row_max = x.max(axis=axis)
     # 每行元素都需要减去对应的最大值，否则求exp(x)会溢出，导致inf情况
-    row_max = row_max.reshape(-1, 1)
+    # row_max = row_max.reshape(-1, 1)
+    row_max = row_max[:, :, np.newaxis]
     x = x - row_max
     # 计算e的指数次幂
     x_exp = np.exp(x)
@@ -1850,6 +1855,10 @@ def softmax(x, axis=1):
     return s
 
 
+def sigmoid(x):
+    return 1 / (1 + np.exp(-x))
+
+
 def convert_anchor(anchors, height, width):
     """
     height, width, _ = image.shape
@@ -2996,13 +3005,13 @@ def get_video_writer(video_file, width, height, fps):
 if __name__ == "__main__":
     # from utils import image_utils
 
-    input_size = [int(490 / 2), int(800 / 2)]
-    image_path = "test.jpg"
-    src_boxes = [[8.20251, 1, 242.2412, 699.2236],
-                 [201.14865, 204.18265, 468.605, 696.36163]]
-    src_boxes = np.asarray(src_boxes)
-    image = read_image(image_path)  # (800, 490, 3)
-    image1, boxes1 = image_boxes_resize_padding(image, input_size, src_boxes)
-    image1 = show_image_boxes("Det", image1, boxes1, color=(255, 0, 0), delay=3)
-    boxes = image_boxes_resize_padding_inverse((image.shape[1], image.shape[0]), input_size, boxes1)
-    show_image_boxes("image", image, boxes)
+    input_size = [300, 300]
+    image_path = "../data/test_image/grid1.png"
+    boxes = [[120, 50, 250, 180]]
+    boxes = np.asarray(boxes)
+    image0 = read_image(image_path)  # (800, 490, 3)
+    show_image_boxes("image0", image0, boxes, color=(255, 0, 0), delay=3)
+    image1 = image_boxes_resize_padding(image0, input_size, boxes)
+    show_image_boxes("image1", image1, boxes, color=(0, 255, 0), delay=3)
+    boxes = image_boxes_resize_padding_inverse((image0.shape[1], image0.shape[0]), input_size, boxes)
+    show_image_boxes("image2", image0, boxes, color=(0, 0, 255))

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/numpy_utils.py

@@ -11,6 +11,41 @@ from sklearn import metrics, preprocessing
 import heapq
 
 
+def softmax(x, axis=1):
+    # 计算每行的最大值
+    row_max = x.max(axis=axis)
+    # 每行元素都需要减去对应的最大值，否则求exp(x)会溢出，导致inf情况
+    # row_max = row_max.reshape(-1, 1)
+    row_max = row_max[:, :, np.newaxis]
+    x = x - row_max
+    # 计算e的指数次幂
+    x_exp = np.exp(x)
+    x_sum = np.sum(x_exp, axis=axis, keepdims=True)
+    s = x_exp / x_sum
+    return s
+
+def sigmoid(x):
+    return 1 / (1 + np.exp(-x))
+
+
+def gaussian_impulse(x, c=0, sigma=0.1):
+    """
+    高斯脉冲
+    :param x: 输入数据x
+    :param c: 脉冲中心点
+    :param sigma:标准差，越小脉冲越尖锐
+    :return: 生成高斯脉冲
+    """
+    y = np.exp(-((x - c) ** 2) / (2 * sigma ** 2))
+    return y
+
+
+def power(x, n=1):
+    """幂函数"""
+    y = np.power(x, n)
+    return y
+
+
 def feature_norm(x, axis=-1):
     """
     特征归一化,会使得特征L2之和为1, 即||y||=L2(y,axis=-1)

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/plot_utils.py

@@ -7,12 +7,15 @@
     @Date   : 2019-07-13 16:30:10
 """
 import os
+import matplotlib
 import numpy as np
 import matplotlib.pyplot as plt
 import PIL.Image as Image
 import platform
 from matplotlib.font_manager import FontProperties
 
+matplotlib.use('TkAgg')
+
 ROOT = os.path.dirname(__file__)
 
 
@@ -91,7 +94,7 @@ def plot_bar(x, y, xlabel="X", ylabel="Y", title="bar", bin_width=1, vis=True, s
     font = get_font_type(size=14)
     # 准备数据
     # 用 Matplotlib 画条形图
-    plt.bar(x=x, height=y, width=bin_width, align="center", yerr=0.000001,)
+    plt.bar(x=x, height=y, width=bin_width, align="center", yerr=0.000001, )
     # plt.xlim([0.0, 1.0])
     # plt.ylim([0.0, 1.05])
     # 设置横纵坐标的名称以及对应字体格式

{pybaseutils-2.2.12 → pybaseutils-2.2.16}/pybaseutils/time_utils.py

@@ -6,10 +6,21 @@
     @Brief  :
 """
 import time
+from datetime import datetime
 import numpy as np
 from typing import Dict, List
 
 
+def date2stamp(date, format='%Y-%m-%d %H:%M:%S'):
+    """将日期格式转换为时间戳"""
+    return time.mktime(time.strptime(date, format))
+
+
+def stamp2date(stamp, format='%Y-%m-%d %H:%M:%S'):
+    """将时间戳转换为日期格式"""
+    return datetime.fromtimestamp(stamp).strftime(format)
+
+
 class Recorder(object):
     def __init__(self):
         self.content: Dict = {}
@@ -51,8 +62,10 @@ def performance(tag=""):
                                                                                            content["avg"],
                                                                                            content["total"],
                                                                                            content["count"])
-            tag_ = f"{tag} " if tag else ""
-            print("{:20s}{:20s} elapsed: {}".format(tag_, func.__name__, elapsed))
+            if tag:
+                print("{:20s}{:20s} elapsed: {}".format(tag, func.__name__, elapsed))
+            else:
+                print("{:20s} elapsed: {}".format(func.__name__, elapsed))
             return result
 
         return wrapper

pybaseutils-2.2.16/pybaseutils/web/__init__.py

@@ -0,0 +1,7 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PanJinquan
+    @E-mail : 
+    @Date   : 2025-02-17 10:17:17
+    @Brief  :
+"""