pybaseutils 2.4.0__tar.gz → 2.4.2__tar.gz

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/PKG-INFO

@@ -1,13 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.4.0
+Version: 2.4.2
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan
 Author-email: 390737991@qq.com
 License: MIT
-Platform: UNKNOWN
 License-File: LICENCE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 base-utils
 ==========
@@ -37,7 +43,7 @@ pybaseutils是个人开发常用的python库，集成了python等常用的算法
 -  安装方法2：pip install –upgrade -i https://pypi.org/simple
    pybaseutils (从pypi源下载最新版本)
 -  设置默认的镜像源：pip config set global.index-url
-   https://pypi.tuna.tsinghua.edu.cn/simple)
+   https://pypi.tuna.tsinghua.edu.cn/simple
 -  超时异常：pip –default-timeout=1000000000
 
 一些问题修复说明
@@ -142,5 +148,3 @@ base_utils(C++)
        DEBUG_IMSHOW("image", image);
        return 0;
    }
-
-

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/README.md

@@ -20,7 +20,7 @@ pybaseutils是个人开发常用的python库，集成了python等常用的算法
 
 - 安装方法1：pip install --upgrade -i https://pypi.tuna.tsinghua.edu.cn/simple pybaseutils (有延时，可能不是最新版本)
 - 安装方法2：pip install --upgrade -i https://pypi.org/simple pybaseutils (从pypi源下载最新版本)
-- 设置默认的镜像源：pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple)
+- 设置默认的镜像源：pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
 - 超时异常：pip --default-timeout=1000000000 
 
 ## 一些问题修复说明

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/__init__.py

@@ -8,4 +8,4 @@
 # --------------------------------------------------------
 """
 
-__version__ = '2.4.0'
+__version__ = '2.4.2'

pybaseutils-2.4.2/pybaseutils/base/list_queue.py

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+"""
+# --------------------------------------------------------
+# @Author : Pan
+# @E-mail : 
+# @Date   : 2025-07-15 10:56:37
+# @Brief  : 列表队列
+# --------------------------------------------------------
+"""
+import math
+import queue
+
+
+class Queue():
+    """普通队列，多个POD请求时，无法实现同步数据"""
+
+    def __init__(self, name="defaultlist", maxsize=10, **kwargs):
+        """
+        queue是一个列表队列，队列大小由maxsize指定
+        :param name: 队列名称
+        :param maxsize:
+        """
+        self.name = name
+        self.maxsize = maxsize
+        self.queue = queue.Queue(maxsize=maxsize)
+
+    def empty(self, ):
+        return self.queue.empty()
+
+    def __del__(self):
+        if not self.queue.empty(): self.queue.queue.clear()
+
+    def get_queue(self, ):
+        return self.queue.queue
+
+    def set_queue(self, queue):
+        self.queue = queue
+
+    def qsize(self) -> int:
+        return self.queue.qsize()
+
+    def pop(self, block=True, timeout=None):
+        """
+        Remove and return an item from the queue,index=0
+        :param block: 是否阻塞等待
+        :param timeout: 超时时间
+        :return: 弹出的队列数据
+        """
+        out = self.queue.get(block=block, timeout=timeout)
+        return out
+
+    def pop_items(self, nums=1, block=True, timeout=None):
+        """
+        弹出队列的多个项
+        :param nums: 弹出队列的数量
+        :param block: 是否阻塞等待
+        :param timeout: 超时时间
+        :return: 弹出的队列数据
+        """
+        items = [self.pop(block=block, timeout=timeout) for i in range(nums)]
+        return items
+
+    def get(self, index=0):
+        """get an item from the queue,index=0"""
+        return self.queue.queue[index]
+
+    def get_items(self, nums=1, index: list = []):
+        """
+        获取队列的多个项
+        :param nums: 获取队列的数量
+        :param index: 获取队列的索引
+        :return: 获取的队列数据
+        """
+        if index:
+            items = [self.queue.queue[i] for i in index]
+        else:
+            items = [self.queue.queue[i] for i in range(nums)]
+        return items
+
+    def put(self, item, block=False, timeout=None):
+        """
+        Put an item into the queue,index=n
+        :param item: 要放入队列的项
+        :param block: True当队列满了,阻塞等待插入数据; False,不等待,直接弹出队头数据再插入数据
+        :param timeout: 超时时间
+        :return:
+        """
+        while self.qsize() >= self.maxsize and not block: self.pop()
+        return self.queue.put(item, block=block, timeout=timeout)
+
+    def get_window(self, winsize=1, overlap=0.0, block=True, timeout=None):
+        """
+        获取队列的窗口数据
+        :param winsize: 窗口大小
+        :param overlap: 窗口重叠率
+        :return: 队列窗口数据
+        """
+        size = int(winsize * overlap)
+        data1 = self.pop_items(nums=winsize - size, block=block, timeout=timeout)
+        data2 = self.get_items(nums=size)
+        return data1 + data2
+
+
+if __name__ == '__main__':
+    q = Queue(maxsize=3)
+    q.put({"file": "1.jpg"})
+    q.put({"file": "2.jpg"})
+    q.put({"file": "3.jpg"})
+    q.put({"file": "4.jpg"})
+    q.put({"file": "5.jpg"})
+    print(q.get_queue())
+    print(q.get(0))
+    print(q.get_queue())
+    print(q.pop(3))
+    print(q.get_queue())
+    print(1 / 2)

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/base64_utils.py

@@ -14,7 +14,7 @@ import base64
 import numpy as np
 from typing import Any
 
-IMG_PREFIX = "image/png"  # 图片base64字符串前缀
+IMG_PREFIX = "image/jpg"  # 图片base64字符串前缀
 precision = 6  # 小数点精度
 
 
@@ -35,7 +35,7 @@ def base642image(bs64, prefix=IMG_PREFIX, use_rgb=False) -> np.ndarray:
         bs64 = bs64[len(prefix):]
     bs64 = bytes(bs64, 'utf-8')
     image = base64.b64decode(bs64)
-    image = np.fromstring(image, np.uint8)
+    image = np.frombuffer(image, np.uint8)
     image = cv2.imdecode(image, flags=cv2.IMREAD_UNCHANGED)
     # image = cv2.imdecode(image, cv2.IMREAD_COLOR)
     if use_rgb:
@@ -63,7 +63,8 @@ def image2base64(image: np.ndarray, prefix=IMG_PREFIX, use_rgb=False) -> str:
     if len(img.shape) == 3 and use_rgb:
         img = cv2.cvtColor(img, cv2.COLOR_RGB2BGR)
     ext = prefix.split("/")
-    ext = "." + ext[1] if len(ext) == 2 else ".png"
+    # ext = "." + ext[1] if len(ext) == 2 else ".png" # TODO libpng error: bad parameters to zlib
+    ext = "." + ext[1] if len(ext) == 2 else ".jpg"
     img = cv2.imencode(ext, img)[1]
     bs64 = prefix + base64.b64encode(img).decode()
     return bs64
@@ -142,10 +143,17 @@ def base642array(data: Any, prefix=IMG_PREFIX, use_rgb=False) -> Any:
 
 serialization = array2base64  # 序列化
 deserialization = base642array  # 反序列化
-
 if __name__ == "__main__":
-    file = "/home/dm/project/python-learning-notes/utils/test.jpg"
-    bgr1 = cv2.imread(file)
-    image_base64 = image2base64(bgr1)
-    image_base64 = file2base64(file)
-    bgr2 = base642image(image_base64, use_rgb=False)
+    from pybaseutils import file_utils, image_utils
+
+    image_dir = "/home/PKing/Downloads/image"
+    image_dir = "/media/PKing/dev1/SDK/base-utils/data/labelme/JPEGImages"
+    image_list = file_utils.get_images_list(image_dir)
+    for image_file in image_list:
+        print(image_file)
+        src = image_utils.read_image(image_file, use_rgb=True)
+        image_utils.show_image("src", src, delay=10)
+        data = {"image": src, "file": image_file}
+        data = serialization(data)
+        data = deserialization(data)
+        print(data.keys())

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/cvutils/video_utils.py

@@ -222,7 +222,8 @@ def video_capture(video_file: int or str, save_video: str or int = None, interva
                  title: 控制显示窗口名
     :return:
     """
-    assert os.path.exists(video_file), f"video_file={video_file}"
+    video_file = file_utils.str2number(video_file)
+    if isinstance(video_file, str): assert os.path.exists(video_file), f"video_file={video_file}"
     video_cap = image_utils.get_video_capture(video_file)
     w, h, num_frames, fps = image_utils.get_video_info(video_cap)
     start = int(kwargs.get("start", 0) * fps)
@@ -279,6 +280,7 @@ def video_iterator(video_file: int or str, save_video: str or int = None, interv
                  speed: 播放速度
     :return: frame, count, w, h, fps =data_info['frame'],data_info['count'],data_info['w'],data_info['h'],data_info['fps']
     """
+    video_file = file_utils.str2number(video_file)
     if isinstance(video_file, str): assert os.path.exists(video_file), f"video_file={video_file}"
     video_cap = image_utils.get_video_capture(video_file, fps=None)
     w, h, num_frames, fps = image_utils.get_video_info(video_cap)
@@ -291,6 +293,7 @@ def video_iterator(video_file: int or str, save_video: str or int = None, interv
     count = 0
     video_writer = None
     use_fast = kwargs.get("use_fast", False)
+    data_info = {}
     while True:
         ret, frame = (False, None) if use_fast else video_cap.read()
         if count % interval == 0 and count >= start:
@@ -301,7 +304,8 @@ def video_iterator(video_file: int or str, save_video: str or int = None, interv
             if not ret or 0 < end < count or frame is None: break
             if size: frame = image_utils.resize_image(frame, size=size)
             if task: frame = task(frame, **kwargs)
-            data_info = {"frame": frame, "count": count, "w": w, "h": h, "fps": fps}
+            t = round(count / fps, 3)
+            data_info = {"count": count, "time": t, "frame": frame, "w": w, "h": h, "fps": fps, "offset": count}
             # TODO 返回data_info
             yield data_info
             frame = data_info["frame"]
@@ -315,6 +319,7 @@ def video_iterator(video_file: int or str, save_video: str or int = None, interv
     if video_writer:
         print("save video:{}".format(save_video))
         video_writer.release()
+    # yield data_info # TODO FIX 最后一帧数据重复返回
 
 
 def resize_task(frame, **kwargs):

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/dataloader/parser_labelme.py

@@ -152,7 +152,8 @@ class LabelMeDataset(Dataset):
             if not os.path.exists(image_file):
                 continue
             annotation, width, height = self.load_annotations(anno_file)
-            data_info = self.parser_annotation(annotation, self.total_names, min_points=self.min_points,
+            data_info = self.parser_annotation(annotation, self.total_names, size=(width, height),
+                                               min_points=self.min_points,
                                                unique=self.unique)
             if self.use_kpt:
                 data_info = self.get_kpts_info(data_info, anno_file=anno_file, check_kpt=self.check_kpt, disp=True)
@@ -210,12 +211,12 @@ class LabelMeDataset(Dataset):
         annotation, width, height = self.load_annotations(anno_file)
         if self.kwargs.get("read_image", True):  # 是否读取图片
             image = self.read_image(image_file, use_rgb=self.use_rgb)
-            shape = image.shape
-            size = (shape[1], shape[0])
+            height, width = image.shape[:2]
+            size = (width, height)
         else:
-            image, shape, size = None, None, (width, height)
-        data_info = self.parser_annotation(annotation, self.total_names, shape=shape,
-                                           min_points=self.min_points, unique=self.unique)
+            image, size = None, (width, height)
+        data_info = self.parser_annotation(annotation, self.total_names, size=size, min_points=self.min_points,
+                                           unique=self.unique)
         if self.use_kpt:
             data_info = self.get_kpts_info(data_info, anno_file=anno_file, check_kpt=self.check_kpt)
         # TODO dict(boxes, labels, points, groups, names, keypoints)
@@ -319,11 +320,11 @@ class LabelMeDataset(Dataset):
         return image
 
     @staticmethod
-    def parser_annotation(annotation: dict, class_dict={}, shape=None, min_points=-1, unique=False):
+    def parser_annotation(annotation: dict, class_dict={}, size=(), min_points=-1, unique=False):
         """
         :param annotation:  labelme标注的数据
         :param class_dict:  label映射,如{"person":0,"car":1}
-        :param shape: 图片shape(H,W,C),可进行坐标点的维度检查，避免越界
+        :param size: 图片(W,H),可进行坐标点的维度检查，避免越界
         :param min_points: 当标注的轮廓点的个数小于等于min_points，会被剔除；负数不剔除
         :return:
         """
@@ -344,10 +345,9 @@ class LabelMeDataset(Dataset):
                 continue
             gid = anno.get("group_id", gid_index) or gid_index
             kpt = anno.get("keypoints", [])
-            if shape:
-                h, w = shape[:2]
-                pts[:, 0] = np.clip(pts[:, 0], 0, w - 1)
-                pts[:, 1] = np.clip(pts[:, 1], 0, h - 1)
+            if size:
+                pts[:, 0] = np.clip(pts[:, 0], 0, size[0] - 1)
+                pts[:, 1] = np.clip(pts[:, 1], 0, size[1] - 1)
             box = image_utils.polygons2boxes([pts])[0]
             if shape_type == "rectangle":
                 pts = image_utils.boxes2polygons([box])[0]
@@ -533,15 +533,15 @@ def LabelMeDatasets(filename=None,
     return datasets
 
 
-def parser_labelme(anno_file, class_dict={}, shape=None):
+def parser_labelme(anno_file, class_dict={}, size=()):
     """
     :param annotation:  labelme标注的数据
     :param class_dict:  label映射
-    :param shape: 图片shape(H,W,C),可进行坐标点的维度检查，避免越界
+    :param size: 图片shape(W,H),可进行坐标点的维度检查，避免越界
     :return:
     """
     annotation, width, height = LabelMeDataset.load_annotations(anno_file)
-    data_info = LabelMeDataset.parser_annotation(annotation, class_dict, shape)
+    data_info = LabelMeDataset.parser_annotation(annotation, class_dict, size=size)
     return data_info
 
 

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/file_utils.py

@@ -31,6 +31,32 @@ VIDEO_POSTFIX = ['*.mp4', '*.avi', '*.mov', "*.flv", "*.dav"]
 AUDIO_POSTFIX = ['*.mp3', '*.wav']
 
 
+def check_postfix(file, postfix=IMG_POSTFIX):
+    """
+    判断文件是否是指定的后缀名
+    :param file:
+    :param postfix:
+    :return:
+    """
+    if not isinstance(file, str): return False
+    return any(file.endswith(p[1:]) for p in postfix)
+
+
+def is_image(file):
+    """判断文件是否是图片"""
+    return check_postfix(file, postfix=IMG_POSTFIX)
+
+
+def is_video(file):
+    """判断文件是否是视频"""
+    return check_postfix(file, postfix=VIDEO_POSTFIX)
+
+
+def is_audio(file):
+    """判断文件是否是音频"""
+    return check_postfix(file, postfix=AUDIO_POSTFIX)
+
+
 def str2bool(v):
     if v.lower() in ('yes', 'true', 't', 'y', '1'):
         return True
@@ -47,7 +73,7 @@ def get_time(format="p"):
     """
     if format.lower() == "s":  # 精确到秒
         # time = datetime.strftime(datetime.now(), '%Y%m%d%H%M%S')
-        time = datetime.now().strftime("%Y%m%d%H%M%S")
+        time = datetime.now().strftime("%Y%m%d%H%M%S")  # 20200508143059
     elif format.lower() == "p":  # 精确到微妙
         # time = datetime.strftime(datetime.now(), '%Y%m%d_%H%M%S_%f')  # 20200508_143059_379116
         time = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
@@ -55,6 +81,9 @@ def get_time(format="p"):
     elif format.lower() == "y":  # 2025-06-18 11:02:05
         # time = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S")  #
         time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    elif format.lower() == "id":  #
+        # time = datetime.strftime(datetime.now(), '%Y%m%d_%H%M%S_%f')  # 20200508-14-30-59-379116
+        time = datetime.now().strftime("%Y%m%d-%H-%M-%S-%f")
     else:
         time = (str(datetime.now())[:-10]).replace(' ', '-').replace(':', '-')
     return time
@@ -277,15 +306,17 @@ class WriterTXT(object):
             self.f.close()
 
 
-def write_file(file, data, mode='wb'):
-    """写二进制数据"""
+def write_file(file, data, mode='w'):
+    """写数据"""
     with open(file, mode) as f: f.write(data)
 
 
-def read_file(file, mode='rb'):
-    """读取二进制数据"""
-    with open(file, mode) as f: key = f.read()
-    return key
+def read_file(file, mode='r'):
+    """读取数据"""
+    with open(file, mode) as f: data = f.read()
+    if mode == 'r':
+        data = data.strip().strip('\ufeff').strip('\xef\xbb\xbf')
+    return data
 
 
 def write_data(file, data, split=",", mode='w'):
@@ -323,13 +354,11 @@ def read_data(filename, split=",", convertNum=True):
     with open(filename, mode="r", encoding='utf-8') as f:
         lines = f.readlines()
     lines = [line.strip().strip('\ufeff').strip('\xef\xbb\xbf') for line in lines]
-    if split is None:
-        return lines
-    else:
+    if split:
         lines = [line.split(split) for line in lines]
     if convertNum:
         for i, line in enumerate(lines):
-            line = [str2number(l) for l in line]
+            line = [str2number(l) for l in line] if isinstance(line, list) else str2number(line)
             lines[i] = line
     return lines
 
@@ -337,7 +366,7 @@ def read_data(filename, split=",", convertNum=True):
 def str2number(x):
     """
     :param x:
-    :return:
+    :return: 数值类型(int, float)或原始字符串
     """
     # 如果已经是数值类型，直接处理
     if isinstance(x, (int, float)):
@@ -1534,8 +1563,5 @@ def zip_file(src, dst=None, s=None):
 if __name__ == '__main__':
     from pybaseutils import time_utils
 
-    path = ["/home/PKing/Downloads/image_2022_00001.jpg",
-            "/home/PKing/Downloads/image_2022_00002.jpg"]
-    dirname = "/home/PKing"
-    p = get_files_name(path, dirname=None)
-    print(p)
+    path = '/tmp/gradio/b988f43f2c87669461bbb6c831c5b3801017bc02cf6076c57ad1f4d581f76b35/image01.j'
+    print(is_image(path))

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/http_utils.py

@@ -21,7 +21,7 @@ extensions = {"application/json": "json",
               }
 
 
-def post(url, params=None, headers=None, timeout=6, max_retries=1, **kwargs):
+def post(url, params=None, headers=None, timeout=None, max_retries=1, **kwargs):
     """
     :param url: 请求URL
     :param params: 请求参数
@@ -52,7 +52,7 @@ def post(url, params=None, headers=None, timeout=6, max_retries=1, **kwargs):
     return result
 
 
-def get(url, params=None, headers=None, timeout=6, max_retries=1, **kwargs):
+def get(url, params=None, headers=None, timeout=None, max_retries=1, **kwargs):
     """
     type = r.headers.get('Content-Type', '').lower() # 数据类型
     :param url: 请求URL

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/image_utils.py

@@ -1916,7 +1916,8 @@ def image2base64(image: np.ndarray, prefix="", use_rgb=False) -> str:
     if len(img.shape) == 3 and use_rgb:
         img = cv2.cvtColor(img, cv2.COLOR_RGB2BGR)
     ext = prefix.split("/")
-    ext = "." + ext[1] if len(ext) == 2 else ".png"
+    # ext = "." + ext[1] if len(ext) == 2 else ".png" # TODO libpng error: bad parameters to zlib
+    ext = "." + ext[1] if len(ext) == 2 else ".jpg"
     img = cv2.imencode(ext, img)[1]
     bs64 = prefix + base64.b64encode(img).decode()
     return bs64
@@ -1931,21 +1932,26 @@ def base642image(image_bs64, use_rgb=False) -> np.ndarray:
     """
     image_bs64 = bytes(image_bs64, 'utf-8')
     image = base64.b64decode(image_bs64)
-    image = np.fromstring(image, np.uint8)
+    image = np.frombuffer(image, np.uint8)
     image = cv2.imdecode(image, cv2.IMREAD_COLOR)
     if use_rgb:
         image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
     return image
 
 
-def read_image_base64(image_file, size=None):
-    if not size:
-        with open(image_file, 'rb') as f_in:
-            image_base64 = base64.b64encode(f_in.read())
-            image_base64 = str(image_base64, encoding='utf-8')
+def read_image_base64(image_file: str, size=None):
+    """
+    读取图片并转换为base64编码
+    :param image_file: 图片文件路径
+    :param size: 图片大小, (width,height)
+    :return: base64编码字符串
+    """
+    if size:
+        bgr = read_image(image_file, size=size, use_rgb=False)
+        image_base64 = image2base64(bgr)
     else:
-        bgr_image = read_image(image_file, size=size, use_rgb=False)
-        image_base64 = image2base64(bgr_image)
+        with open(image_file, 'rb') as f:
+            image_base64 = base64.b64encode(f.read()).decode('utf-8')
     return image_base64
 
 
@@ -2871,7 +2877,7 @@ def fig2data(fig):
 
     # Get the RGBA buffer from the figure
     w, h = fig.canvas.get_width_height()
-    buf = np.fromstring(fig.canvas.tostring_argb(), dtype=np.uint8)
+    buf = np.frombuffer(fig.canvas.tostring_argb(), dtype=np.uint8)
     buf.shape = (w, h, 4)
 
     # canvas.tostring_argb give pixmap in ARGB mode. Roll the ALPHA channel to have it in RGBA mode
@@ -3132,7 +3138,7 @@ def get_video_info(video_cap: cv2.VideoCapture, vis=True):
     :param video_cap:视频对象 或者视频文件路径
     :return:
     """
-    isfile = isinstance(video_cap, str)
+    isfile = isinstance(video_cap, str) or isinstance(video_cap, int)
     if isfile: video_cap = get_video_capture(video_cap)
     width = int(video_cap.get(cv2.CAP_PROP_FRAME_WIDTH))
     height = int(video_cap.get(cv2.CAP_PROP_FRAME_HEIGHT))

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils/time_utils.py

@@ -13,6 +13,25 @@ import numpy as np
 from typing import Dict, List
 
 
+def get_time(format="p"):
+    """
+    :param format:
+    :return:
+    """
+    if format.lower() == "s":  # 精确到秒
+        # time = datetime.strftime(datetime.now(), '%Y%m%d%H%M%S')
+        time = datetime.now().strftime("%Y%m%d%H%M%S")
+    elif format.lower() == "p":  # 精确到微妙
+        # time = datetime.strftime(datetime.now(), '%Y%m%d_%H%M%S_%f')  # 20200508_143059_379116
+        time = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
+        time = time[:-2]
+    elif format.lower() == "y":  # 2025-06-18 11:02:05
+        # time = datetime.strftime(datetime.now(), "%Y-%m-%d %H:%M:%S")  #
+        time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    else:
+        time = (str(datetime.now())[:-10]).replace(' ', '-').replace(':', '-')
+    return time
+
 def date2stamp(date, format='%Y-%m-%d %H:%M:%S') -> float:
     """
     将日期格式转换为时间戳

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/pybaseutils.egg-info/PKG-INFO

@@ -1,13 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.4.0
+Version: 2.4.2
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan
 Author-email: 390737991@qq.com
 License: MIT
-Platform: UNKNOWN
 License-File: LICENCE
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 base-utils
 ==========
@@ -37,7 +43,7 @@ pybaseutils是个人开发常用的python库，集成了python等常用的算法
 -  安装方法2：pip install –upgrade -i https://pypi.org/simple
    pybaseutils (从pypi源下载最新版本)
 -  设置默认的镜像源：pip config set global.index-url
-   https://pypi.tuna.tsinghua.edu.cn/simple)
+   https://pypi.tuna.tsinghua.edu.cn/simple
 -  超时异常：pip –default-timeout=1000000000
 
 一些问题修复说明
@@ -142,5 +148,3 @@ base_utils(C++)
        DEBUG_IMSHOW("image", image);
        return 0;
    }
-
-

pybaseutils-2.4.2/test_py/demo1.py

@@ -0,0 +1,9 @@
+import numpy as np
+from pybaseutils import file_utils, image_utils, yaml_utils
+from collections import defaultdict
+
+if __name__ == "__main__":
+    data={"content": "123"}
+    print(data.pop("content"))
+    print(data.pop("content","DAta"))
+

pybaseutils-2.4.2/test_py/demo4.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+"""
+# --------------------------------------------------------
+# @Author : Pan
+# @E-mail :
+# @Date   : 2025-07-08 14:10:15
+# @Brief  : 转换labelme标注数据为voc格式
+# --------------------------------------------------------
+"""
+import os
+import numpy as np
+import cv2
+from pybaseutils.converter import convert_labelme2voc
+from pybaseutils import time_utils, image_utils, file_utils
+
+if __name__ == "__main__":
+    image_dir = "/home/PKing/Downloads/image/摄像头ID.txt"
+    lines = file_utils.read_file(image_dir)
+    print(lines)

{pybaseutils-2.4.0 → pybaseutils-2.4.2}/test_py/demo_lableme_vis.py

@@ -37,16 +37,16 @@ if __name__ == "__main__":
     names = None
     # names = ['person,身穿工作服,未穿工作服']
     # names = ['身穿工作服,未穿工作服', '手,手穿绝缘手套,手穿棉纱手套,手穿其他手套']
-    anno_dir = ["/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/01-东莞-投退重合闸操作/dataset-v01/images"]
+    anno_dir = ["/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/23-更换绝缘子/dataset-v14-special/images"]
 
-    anno_dir = ["/media/PKing/新加卷/project/smart-dinner/dataset/smart-dinner-01/images"]
-    names = [ '人体', '转盘' ]
+    # anno_dir = ["/media/PKing/新加卷/project/smart-dinner/dataset/smart-dinner-01/images"]
+    # names = [ '人体', '转盘' ]
     dataset = parser_labelme.LabelMeDatasets(filename=None,
                                              data_root=None,
                                              anno_dir=anno_dir,
                                              image_dir=None,
                                              class_name=names,
-                                             check=False,
+                                             check=True ,
                                              phase="val",
                                              shuffle=False)
     class_name = dataset.class_name