pybaseutils 2.4.1__tar.gz → 2.4.3__tar.gz

{pybaseutils-2.4.1 → pybaseutils-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.4.1
+Version: 2.4.3
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.4.1 → pybaseutils-2.4.3}/pybaseutils/__init__.py

@@ -8,4 +8,4 @@
 # --------------------------------------------------------
 """
 
-__version__ = '2.4.1'
+__version__ = '2.4.3'

{pybaseutils-2.4.1 → pybaseutils-2.4.3}/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,7 +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']
     """
-    if isinstance(video_file, str) and len(video_file) == 1: video_file = int(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, fps=None)
     w, h, num_frames, fps = image_utils.get_video_info(video_cap)
@@ -292,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:
@@ -302,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"]
@@ -316,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.1 → pybaseutils-2.4.3}/pybaseutils/dataloader/parser_labelme.py

@@ -14,8 +14,6 @@ import glob
 import random
 import numbers
 import json
-
-from shapely.predicates import is_valid
 from tqdm import tqdm
 from pybaseutils import image_utils, file_utils, json_utils, text_utils
 from pybaseutils.dataloader.base_dataset import Dataset, ConcatDataset
@@ -152,7 +150,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 +209,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 +318,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 +343,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 +531,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.1 → pybaseutils-2.4.3}/pybaseutils/file_utils.py

@@ -38,6 +38,7 @@ def check_postfix(file, postfix=IMG_POSTFIX):
     :param postfix:
     :return:
     """
+    if not isinstance(file, str): return False
     return any(file.endswith(p[1:]) for p in postfix)
 
 
@@ -72,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")
@@ -80,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
@@ -302,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'):
@@ -348,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
 
@@ -362,7 +366,7 @@ def read_data(filename, split=",", convertNum=True):
 def str2number(x):
     """
     :param x:
-    :return:
+    :return: 数值类型(int, float)或原始字符串
     """
     # 如果已经是数值类型，直接处理
     if isinstance(x, (int, float)):
@@ -1561,4 +1565,3 @@ if __name__ == '__main__':
 
     path = '/tmp/gradio/b988f43f2c87669461bbb6c831c5b3801017bc02cf6076c57ad1f4d581f76b35/image01.j'
     print(is_image(path))
-

{pybaseutils-2.4.1 → pybaseutils-2.4.3}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.4.1
+Version: 2.4.3
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

pybaseutils-2.4.3/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.1 → pybaseutils-2.4.3}/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/bugs/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

pybaseutils-2.4.1/test_py/demo4.py

@@ -1,25 +0,0 @@
-# -*- 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"
-    image_list = file_utils.get_images_list(image_dir)
-    for image_file in image_list:
-        src = image_utils.read_image(image_file, use_rgb=True)
-        image_utils.show_image("src", src, delay=10)
-        src = cv2.cvtColor(src, cv2.COLOR_BGR2RGB)  # 将BGR转为RGB
-        bs6 = image_utils.image2base64(src, use_rgb=True)
-        out = image_utils.base642image(bs6, use_rgb=True)
-        image_utils.show_image("out", out)