pybaseutils 2.2.4__tar.gz → 2.2.5__tar.gz

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.2.4
+Version: 2.2.5
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils/__init__.py

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

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils/converter/build_labelme.py

@@ -12,7 +12,7 @@ from tqdm import tqdm
 from pybaseutils import image_utils, file_utils, json_utils
 
 
-def maker_labelme(json_file, points, labels, image_name, image_size, keypoints=[], image_bs64=None):
+def maker_labelme(json_file, points, labels, image_name, image_size, image_bs64=None, keypoints=[]):
     """
     制作label数据格式
     :param json_file: 保存json文件路径
@@ -21,16 +21,20 @@ def maker_labelme(json_file, points, labels, image_name, image_size, keypoints=[
     :param image_name: 图片名称，如果存在则进行拷贝到json_file同一级目录
     :param image_size: (W,H)
     :param image_bs64: 图片base64编码，可为None
+    :param keypoints: [(N,3),(N,3),...]
     :return:
     """
     assert len(points) == len(labels)
     file_utils.create_file_path(json_file)
     shapes = []
-    for point, label in zip(points, labels):
+    if isinstance(keypoints, np.ndarray): keypoints = keypoints.tolist()
+    for i in range(len(points)):
         # point = [[x1,y1],[x2,y2],...,[xn,yn]]
+        point, label = points[i], labels[i]
         if isinstance(point, np.ndarray): point = point.tolist()
         if not isinstance(point[0], list): point = [point]
-        item = {"label": label, "score": None, "keypoints": keypoints, "line_color": None, "fill_color": None,
+        kpts = keypoints[i] if keypoints else []
+        item = {"label": label, "score": None, "keypoints": kpts, "line_color": None, "fill_color": None,
                 "group_id": None, "points": point, "shape_type": "polygon", "flags": {}, "description": ""}
         shapes.append(item)
     data = {

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils/converter/convert_labelme2cvat.py

@@ -27,7 +27,8 @@ def convert_labelme2cvat(anno_dir, image_dir="", vis=False):
         image_name = os.path.basename(image_file)
         json_file = os.path.join(anno_dir, image_name.split(".")[0] + ".json")
         xml_file = os.path.join(image_dir, image_name.split(".")[0] + ".xml")
-        boxes, labels, points, groups = parser_labelme.parser_labelme(json_file, class_dict={})
+        info = parser_labelme.parser_labelme(json_file, class_dict={})
+        boxes, labels, points = info["boxes"], info["points"], info["labels"]
         image = cv2.imread(image_file)
         h, w = image.shape[:2]
         build_cvat.maker_cvat(xml_file, points, labels, image_name, image_size=[w, h])

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils/dataloader/parser_labelme.py

@@ -114,13 +114,12 @@ class LabelMeDataset(Dataset):
             if not os.path.exists(image_file):
                 continue
             annotation, width, height = self.load_annotations(anno_file)
-            box, label, point, group, names = self.parser_annotation(annotation, self.class_dict,
-                                                                     min_points=self.min_points,
-                                                                     unique=self.unique)
-            if len(label) == 0:
+            info = self.parser_annotation(annotation, self.class_dict, min_points=self.min_points, unique=self.unique)
+            labels = info["labels"]
+            if len(labels) == 0:
                 continue
             dst_ids.append(image_id)
-            class_name += label
+            class_name += labels
         if self.class_name is None:
             class_name = sorted(list(set(class_name)))
             self.class_name, self.class_dict = self.parser_classes(class_name)
@@ -170,11 +169,12 @@ class LabelMeDataset(Dataset):
         annotation, width, height = self.load_annotations(anno_file)
         image = self.read_image(image_file, use_rgb=self.use_rgb)
         shape = image.shape
-        boxes, labels, points, groups, names = self.parser_annotation(annotation, self.class_dict, shape,
-                                                                      min_points=self.min_points, unique=self.unique)
-        data = {"image": image, "points": points, "boxes": boxes, "labels": labels, "groups": groups, "names": names,
-                "image_file": image_file, "anno_file": anno_file, "size": [shape[1], shape[0]]}
-        return data
+        data_info = self.parser_annotation(annotation, self.class_dict, shape, min_points=self.min_points,
+                                           unique=self.unique)
+        # TODO dict(boxes, labels, points, groups, names, keypoints)
+        data_info.update({"image": image, "image_file": image_file, "anno_file": anno_file,
+                          "size": [shape[1], shape[0]]})
+        return data_info
 
     @staticmethod
     def parser_annotation(annotation: dict, class_dict={}, shape=None, min_points=-1, unique=False):
@@ -185,7 +185,7 @@ class LabelMeDataset(Dataset):
         :param min_points: 当标注的轮廓点的个数小于等于min_points，会被剔除；负数不剔除
         :return:
         """
-        bboxes, labels, points, groups, names = [], [], [], [], []
+        bboxes, labels, points, groups, names, keypoints = [], [], [], [], [], []
         for anno in annotation:
             name = "unique" if unique else anno["label"]
             label = name
@@ -198,8 +198,9 @@ class LabelMeDataset(Dataset):
             pts = np.asarray(anno["points"], dtype=np.int32)
             if min_points > 0 and len(pts) <= min_points:
                 continue
-            group_id = json_utils.get_value(anno, key=["group_id"], default=0)
-            group_id = group_id if group_id else 0
+            gid = json_utils.get_value(anno, key=["group_id"], default=0)
+            gid = gid if gid else 0
+            kpt = json_utils.get_value(anno, key=["keypoints"], default=[])
             if shape:
                 h, w = shape[:2]
                 pts[:, 0] = np.clip(pts[:, 0], 0, w - 1)
@@ -209,8 +210,9 @@ class LabelMeDataset(Dataset):
             labels.append(label)
             bboxes.append(box)
             points.append(pts)
-            groups.append(group_id)
-        return bboxes, labels, points, groups, names
+            groups.append(gid)
+            keypoints.append(kpt)
+        return dict(boxes=bboxes, labels=labels, points=points, groups=groups, names=names, keypoints=keypoints)
 
     def index2id(self, index):
         """
@@ -327,7 +329,7 @@ class LabelMeDataset(Dataset):
         return annos, width, height
 
     @staticmethod
-    def get_targets(data_info: dict, targets, keys=['points', 'boxes', 'labels', 'groups', 'names']):
+    def get_targets(data_info: dict, targets, keys=['points', 'boxes', 'labels', 'groups', 'names', 'keypoints']):
         names = data_info["names"]
         out = {}
         for i in range(len(names)):
@@ -439,16 +441,28 @@ def parser_labelme(anno_file, class_dict={}, shape=None):
     :return:
     """
     annotation, width, height = LabelMeDataset.load_annotations(anno_file)
-    bboxes, labels, points, groups, names = LabelMeDataset.parser_annotation(annotation, class_dict, shape)
-    return bboxes, labels, points, groups, names
+    info = LabelMeDataset.parser_annotation(annotation, class_dict, shape)
+    return info
 
 
-def show_target_image(image, bboxes, labels, points, color=(), thickness=1):
-    # image = image_utils.draw_image_bboxes_text(image, bboxes, labels, color=(255, 0, 0),
-    #                                            thickness=2, fontScale=1.2, drawType="chinese")
+def draw_keypoints_image(image, boxes, keypoints):
+    """绘制keypoints"""
     # image = image_utils.draw_landmark(image, points, color=(0, 255, 0))
     # image = image_utils.draw_key_point_in_image(image, points)
+    if len(keypoints) > 0:
+        from pybaseutils.pose import bones_utils
+        target_bones = bones_utils.get_target_bones("coco_person")
+        image = image_utils.draw_key_point_in_image(image, keypoints, pointline=target_bones["skeleton"],
+                                                    colors=target_bones["colors"], thickness=2,
+                                                    boxes=boxes, vis_id=False)
+    return image
+
+
+def show_target_image(image, boxes, labels, points, keypoints=[], color=(), thickness=1):
+    # image = image_utils.draw_image_bboxes_text(image, boxes, labels, color=(255, 0, 0),
+    #                                            thickness=2, fontScale=1.2, drawType="chinese")
     image = image_utils.draw_image_contours(image, points, labels, color=color, thickness=thickness)
+    image = draw_keypoints_image(image, boxes, keypoints)
     image_utils.cv_show_image("det", image)
     return image
 
@@ -456,20 +470,8 @@ def show_target_image(image, bboxes, labels, points, color=(), thickness=1):
 if __name__ == "__main__":
     from pybaseutils.converter import build_labelme
 
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-v1/json"
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-v7/json"
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/使用钳形电流表测量低压线路电流/dataset-v1/json"
-    # anno_dir = [anno_dir, anno_dir]
-    names = ['A相电线', 'B相电线', 'C相电线', 'N相电线']
-
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-v11/json"
-    # anno_dir = "/home/PKing/Downloads/labelme/json"
-    # anno_dir = "/media/PKing/新加卷1/SDK/base-utils/data/coco/json"
-    # # names = ["car", "dog", "person", "unique"]
-    # names = ["BG", "unique"]
-    # # names = ["car", "dog", "person"]
-    # # names = ["dog", "car,person"]
-    # # names = {"car": 1, "person": 0}
+    anno_dir = "/home/PKing/Downloads/sample/images"
+    # anno_dir = "/home/PKing/Downloads/冲击试验/sample/images"
     names = None
     dataset = LabelMeDatasets(filename=None,
                               data_root=None,
@@ -482,9 +484,9 @@ if __name__ == "__main__":
     print("have num:{}".format(len(dataset)))
     for i in range(len(dataset)):
         print(i)  # i=20
-        data = dataset.__getitem__(12)
-        image, points, bboxes, labels = data["image"], data["points"], data["boxes"], data["labels"]
+        data = dataset.__getitem__(i)
+        image, points, boxes, labels = data["image"], data["points"], data["boxes"], data["labels"]
         h, w = image.shape[:2]
         image_file = data["image_file"]
         anno_file = os.path.join("masker", "{}.json".format(os.path.basename(image_file).split(".")[0]))
-        show_target_image(image, bboxes, labels, points)
+        show_target_image(image, boxes, labels, points, keypoints=data["keypoints"])

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils/file_utils.py

@@ -24,7 +24,7 @@ from datetime import datetime
 from tqdm import tqdm
 
 IMG_POSTFIX = ['*.jpg', '*.jpeg', '*.png', '*.tif', "*.JPG", "*.bmp"]
-VIDEO_POSTFIX = ['*.mp4', '*.avi', '*.mov', "*.flv"]
+VIDEO_POSTFIX = ['*.mp4', '*.avi', '*.mov', "*.flv", "*.dav"]
 AUDIO_POSTFIX = ['*.mp3', '*.wav']
 
 
@@ -363,6 +363,18 @@ def get_basename(file_list):
     return dest_list
 
 
+def change_postfix(file: str, postfix: str):
+    """
+    修改后缀名称
+    :param file:
+    :param postfix:
+    :return:
+    """
+    src_pos = file.split(".")[-1]
+    file = file[:-len(f".{src_pos}")] + postfix
+    return file
+
+
 def randam_select_images(image_list, nums, shuffle=True):
     """
     randam select nums images

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils/transforms/augment_utils.py

@@ -3,7 +3,8 @@
     @Author : PKing
     @E-mail :
     @Date   : 2024-07-25 08:33:57
-    @Brief  : https://imgaug.readthedocs.io/en/latest/index.html
+    @Brief  :  https://github.com/aleju/imgaug-doc
+               https://imgaug.readthedocs.io/en/latest/index.html
 """
 import os
 import cv2
@@ -14,8 +15,11 @@ from imgaug import augmenters as iaa
 from imgaug import parameters as iap
 import imgaug.augmenters.meta as meta
 from pybaseutils import file_utils, image_utils
+import imgaug as ia
 from imgaug.augmentables.segmaps import SegmentationMapsOnImage
 from imgaug.augmentables.kps import KeypointsOnImage
+from imgaug.augmentables import Keypoint, KeypointsOnImage
+from imgaug.augmentables.polys import Polygon, PolygonsOnImage
 
 
 class Compose(object):
@@ -70,8 +74,8 @@ class Transpose(meta.Augmenter):
 
 class Normalize(meta.Augmenter):
     def __init__(self, mean, std, p=1, seed=None, name=None, random_state="deprecated", deterministic="deprecated"):
-        self.mean = mean
-        self.std = std
+        self.mean = np.array(mean, dtype=np.float32)
+        self.std = np.array(std, dtype=np.float32)
         super(Normalize, self).__init__(
             seed=seed, name=name,
             random_state=random_state, deterministic=deterministic)
@@ -91,6 +95,40 @@ class Normalize(meta.Augmenter):
         return image
 
 
+def decode_polygons(polygons: List, shape) -> ia.PolygonsOnImage:
+    """
+    :param polygons: [(N,2),(N,2),....,]
+    :param shape:
+    :return:
+    """
+    polygons = [Polygon(c) for c in polygons]
+    P = ia.PolygonsOnImage(polygons, shape=shape)
+    return P
+
+
+def encode_polygons(polygons: ia.PolygonsOnImage) -> List:
+    polygons = [item.coords for item in polygons.polygons]
+    return polygons
+
+
+aug_seq = iaa.Sequential([
+    iaa.MotionBlur(k=15),  # 运动模糊
+    iaa.Clouds(),  # 云雾
+    iaa.imgcorruptlike.Fog(severity=1),  # 多雾/霜
+    iaa.imgcorruptlike.Snow(severity=2),  # 下雨、大雪
+    iaa.Rain(drop_size=(0.10, 0.20), speed=(0.2, 0.3)),  # 雨
+    iaa.Rain(speed=(0.3, 0.5)),  # 雨
+    iaa.Snowflakes(flake_size=(0.6, 0.7), speed=(0.02, 0.03)),  # 雪点
+    iaa.imgcorruptlike.Spatter(severity=2),  # 溅 123水滴、45泥
+    iaa.contrast.LinearContrast((0.5, 2.0), per_channel=0.5),  # 对比度变为原来的一半或者二倍
+    iaa.imgcorruptlike.Brightness(severity=2),  # 亮度增加
+    iaa.imgcorruptlike.Saturate(severity=3),  # 色彩饱和度
+    iaa.FastSnowyLandscape(lightness_threshold=(100, 255), lightness_multiplier=(1.5, 2.0)),
+    # 雪地亮度阈值是从 uniform(100, 255)（每张图像）和来自 uniform(1.5, 2.0)（每张图像）的乘数采样的。
+    iaa.Cartoon(blur_ksize=3, segmentation_size=1.0, saturation=2.0, edge_prevalence=1.0),  # 卡通
+])
+
+
 def augment_example(input_size=(224, 224)):
     transforms = [
         iaa.Resize({"width": int(input_size[0] * 1.2), "height": "keep-aspect-ratio"}),
@@ -158,7 +196,7 @@ def demo_for_keypoint():
         image = image_utils.read_image("../../data/test.png")
         mask = image_utils.read_image("../../data/mask.png")
         mask = image_utils.get_image_mask(mask)
-        contours = image_utils.find_mask_contours(mask)  # [(N,2)]
+        contours = image_utils.find_mask_contours(mask)
         auimg, contours = augment(image=image, keypoints=contours)
         h, w = auimg.shape[:2]
         mask = image_utils.draw_mask_contours(contours, size=(w, h))
@@ -167,7 +205,27 @@ def demo_for_keypoint():
         image_utils.cv_show_image("image", result)
 
 
+def demo_for_polygons():
+    transforms = augment_example()
+    augment = Compose(transforms=transforms, fixed=True)
+    for i in range(100):
+        image = image_utils.read_image("../../data/test.png")
+        mask = image_utils.read_image("../../data/mask.png")
+        mask = image_utils.get_image_mask(mask)
+        contours = image_utils.find_mask_contours(mask)
+        contours = contours * 3
+        polygons = decode_polygons(contours, image.shape)
+        auimg, polygons = augment(image=image, polygons=polygons)
+        contours = encode_polygons(polygons)
+        h, w = auimg.shape[:2]
+        mask = image_utils.draw_mask_contours(contours, size=(w, h))
+        color_image = image_utils.draw_image_contours(auimg, contours)
+        result = image_utils.image_hstack([image, color_image, mask])
+        image_utils.cv_show_image("image", result)
+
+
 if __name__ == "__main__":
     # demo_for_image()
     # demo_for_segment()
-    demo_for_keypoint()
+    # demo_for_keypoint()
+    demo_for_polygons()

{pybaseutils-2.2.4 → pybaseutils-2.2.5}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.2.4
+Version: 2.2.5
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan