pybaseutils 2.2.3__tar.gz → 2.2.4__tar.gz

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

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

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

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

{pybaseutils-2.2.3 → pybaseutils-2.2.4}/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, image_bs64=None):
+def maker_labelme(json_file, points, labels, image_name, image_size, keypoints=[], image_bs64=None):
     """
     制作label数据格式
     :param json_file: 保存json文件路径
@@ -30,8 +30,8 @@ def maker_labelme(json_file, points, labels, image_name, image_size, image_bs64=
         # point = [[x1,y1],[x2,y2],...,[xn,yn]]
         if isinstance(point, np.ndarray): point = point.tolist()
         if not isinstance(point[0], list): point = [point]
-        item = {"label": label, "line_color": None, "fill_color": None,
-                "points": point, "shape_type": "polygon", "flags": {}}
+        item = {"label": label, "score": None, "keypoints": keypoints, "line_color": None, "fill_color": None,
+                "group_id": None, "points": point, "shape_type": "polygon", "flags": {}, "description": ""}
         shapes.append(item)
     data = {
         "version": "3.16.7", "flags": {},

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

@@ -11,10 +11,9 @@ import cv2
 import glob
 import random
 import numbers
-import torch
 import json
 from tqdm import tqdm
-from pybaseutils import image_utils, file_utils, json_utils
+from pybaseutils import image_utils, file_utils, json_utils, text_utils
 from pybaseutils.dataloader.base_dataset import Dataset, ConcatDataset
 
 
@@ -327,6 +326,63 @@ class LabelMeDataset(Dataset):
             height = -1
         return annos, width, height
 
+    @staticmethod
+    def get_targets(data_info: dict, targets, keys=['points', 'boxes', 'labels', 'groups', 'names']):
+        names = data_info["names"]
+        out = {}
+        for i in range(len(names)):
+            matches = text_utils.find_match_texts(texts=[names[i]], pattern=targets, org=True)
+            if len(matches) > 0:
+                for k in keys:
+                    if k in data_info: out[k] = out.get(k, []) + [data_info[k][i]]
+        return out
+
+    @staticmethod
+    def get_sub2superclass(data_info, superclass, subclass, scale=[], square=True, vis=False):
+        """
+        通过IOU的方式，将子类属性分配给父类中
+        :param data_info:
+        :param superclass: 父类
+        :param subclass: 子类
+        :param scale: 对superclass进行缩放
+        :param square: 对superclass
+        :param vis:
+        :return:
+        """
+        image, file = data_info["image"], data_info["image_file"]
+        target_info = LabelMeDataset.get_targets(data_info, targets=superclass)
+        attibu_info = LabelMeDataset.get_targets(data_info, targets=subclass)
+        item_list = []
+        for i in range(len(target_info.get("boxes", []))):
+            tbbox = [target_info["boxes"][i]]
+            tname = [target_info["names"][i]]
+            if square:
+                tbbox = image_utils.get_square_boxes(tbbox, use_max=True, baseline=-1)
+            if scale:
+                tbbox = image_utils.extend_xyxy(tbbox, scale=scale)
+            item = {}  #
+            for j in range(len(attibu_info.get("boxes", []))):
+                abox = attibu_info["boxes"][j]
+                iou = image_utils.get_box_iom(tbbox[0], abox)
+                if iou > 0:
+                    item["ious"] = item.get("ious", []) + [iou]
+                    for k, v in attibu_info.items():
+                        item[k] = item.get(k, []) + [v[j]]
+            item_list.append(dict(file=file, box=tbbox[0], name=tname[0], attribute=item))
+            if vis:
+                image = image_utils.draw_image_boxes_texts(image, tbbox, tname, thickness=2, fontScale=1.0,
+                                                           drawType="ch", color=image_utils.color_table[i + 1])
+                texts = [f"{n} {s:3.2f}" for n, s in zip(item.get("names", []), item.get("ious", []))]
+                image = image_utils.draw_image_boxes_texts(image,
+                                                           item.get("boxes", []),
+                                                           texts,
+                                                           thickness=2,
+                                                           fontScale=1.0,
+                                                           color=image_utils.color_table[i + 1],
+                                                           drawType="ch")
+                image_utils.cv_show_image("instance", image)
+        return item_list
+
 
 def LabelMeDatasets(filename=None,
                     data_root=None,

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

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

{pybaseutils-2.2.3 → pybaseutils-2.2.4}/pybaseutils.egg-info/SOURCES.txt

@@ -177,6 +177,7 @@ test_py/aije/convert_labelme2coco.py
 test_py/aije/convert_labelme2voc.py
 test_py/aije/copy_move.py
 test_py/aije/demo_labelme_crop.py
+test_py/aije/demo_labelme_shock.py
 test_py/aije/demo_video_aije.py
 test_py/aije/demo_voc_crop.py
 test_py/aije/demo_voc_vis.py

pybaseutils-2.2.4/test_py/aije/demo_labelme_shock.py

@@ -0,0 +1,115 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PKing
+    @E-mail : 390737991@qq.com
+    @Date   : 2022-11-29 18:11:47
+    @Brief  :
+"""
+import os
+import cv2
+from tqdm import tqdm
+from pybaseutils.dataloader import parser_labelme
+from pybaseutils import image_utils, file_utils, json_utils
+
+
+def save_object_crops(data_info, item_list, out_dir, class_name=None, scale=[], square=False,
+                      padding=False, min_size=20 * 20 * 3, flag="", vis=False):
+    """
+    对VOC的数据目标进行裁剪
+    :param image:
+    :param out_dir:
+    :param bboxes:
+    :param labels:
+    :param image_id:
+    :param class_name:
+    :param scale:
+    :param square:
+    :param padding:
+    :param flag:
+    :param vis:
+    :return:
+    """
+    image_file, image = data_info["image_file"], data_info["image"]
+    image_id = os.path.basename(image_file).split(".")[0]
+    h, w = image.shape[:2]
+    for i, item in enumerate(item_list):
+        if len(item['box']) == 0: continue
+        bboxes = [item['box']]
+        labels = [item['name']]
+        attrib_name = json_utils.get_value(item, key=['attribute', 'names'], default=[])
+        if square:
+            bboxes = image_utils.get_square_boxes(bboxes, use_max=True, baseline=-1)
+        if scale:
+            bboxes = image_utils.extend_xyxy(bboxes, scale=scale)
+        if padding:
+            crops = image_utils.get_bboxes_crop_padding(image, bboxes)
+        else:
+            crops = image_utils.get_bboxes_crop(image, bboxes)
+        img = crops[0]
+        if img.size < min_size: continue
+        name = "_".join(labels + list(set(attrib_name)))
+        if out_dir:
+            file_name = "{}_{:0=4d}_{}.jpg".format(image_id, i, flag) if flag else "{}_{:0=4d}.jpg".format(image_id,
+                                                                                                           i)
+            img_file = file_utils.create_dir(out_dir, name, file_name)
+            cv2.imwrite(img_file, img)
+        if vis:
+            m = image_utils.draw_image_bboxes_labels(image.copy(), bboxes, labels, class_name=class_name,
+                                                     thickness=2, fontScale=0.8, drawType="chinese")
+            image_utils.cv_show_image("image", m, use_rgb=False, delay=0)
+
+
+if __name__ == "__main__":
+    """
+    对VOC的数据目标进行裁剪
+    室内：['主杆', '从此进出标示牌', '其他鞋', '吊物绳', '在此工作标示牌', '垫子', '安全带', '安全帽', '安全绳',
+          '导线头', '尖嘴钳', '工具袋', '手', '扳手', '抹布', '未穿工作服','柱式绝缘子', '止步高压危险标示牌',
+          '绝缘手套', '绝缘鞋', '脚扣', '螺丝', '身穿工作服', '遮拦杆', '铁架', '铝扎线']
+    室外: []
+    """
+    # TODO 其他试题
+    anno_dir = [
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v21/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v22/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v23/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v24/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v26/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v27/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v29/images",
+        "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v29-test/images",
+    ]
+    out_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-shock/dataset-others/待分类"
+
+    # TODO 更换绝缘子
+    # anno_dir = [
+        # "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v25/images",
+        # "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-v2-det/dataset-v28/images",
+        # "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-shock/dataset-sample/images",
+    # ]
+    # out_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-shock/dataset-v1/待分类"
+
+    superclass = ["主杆"]
+    subclass = ['未穿工作服', '身穿工作服']
+    class_name = superclass + subclass
+    dataset = parser_labelme.LabelMeDatasets(filename=None,
+                                             data_root=None,
+                                             anno_dir=anno_dir,
+                                             image_dir=None,
+                                             class_name=class_name,
+                                             check=False,
+                                             phase="val",
+                                             shuffle=False)
+    print("have num:{}".format(len(dataset)))
+    class_name = dataset.class_name
+    scale = [1.0, 1.0]
+    flag = str(scale[0]).replace(".", "p")
+    flag = None
+    for i in tqdm(range(len(dataset))):
+        data_info = dataset.__getitem__(i)
+        item_list = parser_labelme.LabelMeDataset.get_sub2superclass(data_info,
+                                                                     superclass=superclass,
+                                                                     subclass=subclass,
+                                                                     square=True,
+                                                                     scale=scale,
+                                                                     vis=False)
+        save_object_crops(data_info, item_list, out_dir, flag=flag, vis=False)

pybaseutils-2.2.4/test_py/demo2.py

@@ -0,0 +1,24 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PKing
+    @E-mail : 390737991@qq.com
+    @Date   : 2022-12-31 11:37:30
+    @Brief  : https://blog.csdn.net/qdPython/article/details/121381363
+"""
+import os
+import cv2
+import random
+import types
+import torch
+import numpy as np
+from typing import Callable
+from pybaseutils import image_utils, file_utils, text_utils
+from pybaseutils.cvutils import video_utils
+import cv2
+import re
+
+if __name__ == '__main__':
+    file = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/action-names.txt"
+    outputs = [torch.tensor(1, dtype=torch.int64), torch.tensor(1, dtype=torch.int64)]
+    data = torch.stack(outputs)
+    print(data)

pybaseutils-2.2.3/test_py/demo2.py

@@ -1,37 +0,0 @@
-# -*-coding: utf-8 -*-
-"""
-    @Author : PKing
-    @E-mail : 390737991@qq.com
-    @Date   : 2022-12-31 11:37:30
-    @Brief  : https://blog.csdn.net/qdPython/article/details/121381363
-"""
-import os
-import cv2
-import random
-import types
-import torch
-import numpy as np
-from typing import Callable
-from pybaseutils import image_utils, file_utils, text_utils
-from pybaseutils.cvutils import video_utils
-import cv2
-import re
-
-if __name__ == '__main__':
-    file = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/action-names.txt"
-    files = file_utils.read_data(file, split=None)
-    names = []
-    for file in files:
-        name = os.path.basename(file)
-        names.append(name)
-    names = list(set(names))
-    names = text_utils.find_match_texts(texts=names, pattern=["手拿*"])
-    names = list(set(names))
-    print(names)
-    names = ['手拿钳形电流表', '手拿相序表', '手拿护目镜', '手拿万用表', '手拿尖嘴钳', '手拿螺丝刀', '手拿万能表', '手拿扳手',
-             '手拿安全帽', '手拿安全带', '手拿安全围网', '手拿安全绳', '手拿吊物绳', '手拿抹布', '手拿熔断器熔管', '手拿工具袋',
-             '手拿采集器', '手拿瓷横担绝缘子', '手拿玻璃绝缘子', '手拿棉纱手套', '手拿绝缘手套,手拿橡胶手套,手拿其他手套',
-             '手拿长筒靴', '手拿绝缘垫', '手拿垫子', '手拿熔断器', '手拿卡线器', '手拿紧线器', '手拿验电器', '手拿验电笔', '手拿遮拦杆',
-             '手拿核相器', '手拿钢丝绳', '手拿美工刀', '手拿脚扣', '手拿兆欧表', '手拿绝缘胶布', '手拿绝缘杆', '手拿绝缘棒',
-             '手拿绝缘挡板', '手拿从此进入指示牌,手拿从此进出标示牌,手拿止步高压危险指示牌,手拿止步高压危险表示牌,手拿止步高压危险标示牌,手拿在此工作标示牌,手拿禁止合闸线路有人工作标示牌']
-    print(len(names))