pybaseutils 2.0.5__tar.gz → 2.0.6__tar.gz

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/PKG-INFO

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

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils/__init__.py

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

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils/converter/convert_cvat2labelme.py

@@ -43,6 +43,7 @@ def convert_cvat2labelme(anno_dir, image_dir="", out_dir="", thickness=1, fontSc
     将CVAT标注格式(LabelMe 3.0)转换labelme通用格式
     :param anno_dir: 标注文件目录，默认输出json文件与anno_dir同目录
     :param image_dir: 图片文件目录
+    :param out_dir: 输出labelme *.json文件目录
     :param vis:
     :return:
     """
@@ -50,6 +51,8 @@ def convert_cvat2labelme(anno_dir, image_dir="", out_dir="", thickness=1, fontSc
     xml_list = file_utils.get_files_lists(anno_dir, postfix=["*.xml"])
     for xml_file in tqdm(xml_list):
         image_name, annos, w, h = parser_annotations(xml_file)
+        image_id = os.path.basename(xml_file).split(".")[0]
+        image_name = "{}.{}".format(image_id, image_name.split(".")[1])
         points = [an['points'] for an in annos if len(an['points']) > 0]
         labels = [an['label'] for an in annos if an['label']]
         if len(points) == 0 or len(labels) == 0:
@@ -57,10 +60,10 @@ def convert_cvat2labelme(anno_dir, image_dir="", out_dir="", thickness=1, fontSc
             continue
         if image_dir or vis:
             image_file = os.path.join(image_dir, image_name)
-            print(image_file, "labels:{}".format(labels))
             image = cv2.imread(image_file)
             h, w = image.shape[:2]
             if vis:
+                print(image_file, "labels:{}".format(labels))
                 image = image_utils.draw_image_contours(image, points, texts=labels, thickness=thickness,
                                                         fontScale=fontScale)
                 image_utils.cv_show_image("det", image)
@@ -70,6 +73,8 @@ def convert_cvat2labelme(anno_dir, image_dir="", out_dir="", thickness=1, fontSc
 
 
 if __name__ == "__main__":
-    image_dir = "/home/PKing/Downloads/default"
-    anno_dir = image_dir
-    convert_cvat2labelme(image_dir=image_dir, anno_dir=anno_dir, vis=False)
+    image_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/aije-action-train-v02/JPEGImages"
+    anno_dir = os.path.join(os.path.dirname(image_dir), "xml")
+    json_dir = os.path.join(os.path.dirname(image_dir), "json")
+    convert_cvat2labelme.convert_cvat2labelme(image_dir=image_dir, anno_dir=anno_dir, out_dir=json_dir,
+                                              thickness=1, fontScale=2.0, vis=True)

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils/dataloader/parser_labelme.py

@@ -107,8 +107,7 @@ class LabelMeDataset(Dataset):
         """
         print("Please wait, it's in checking")
         dst_ids = []
-        # image_ids = image_ids[:100]
-        # image_ids = image_ids[100:]
+        class_name = []
         for image_id in tqdm(image_ids):
             image_file, anno_file, image_id = self.get_image_anno_file(image_id)
             if not os.path.exists(anno_file):
@@ -122,6 +121,10 @@ class LabelMeDataset(Dataset):
             if len(label) == 0:
                 continue
             dst_ids.append(image_id)
+            class_name += label
+        if self.class_name is None:
+            class_name = sorted(list(set(class_name)))
+            self.class_name, self.class_dict = self.parser_classes(class_name)
         print("have nums image:{},legal image:{}".format(len(image_ids), len(dst_ids)))
         return dst_ids
 
@@ -381,12 +384,12 @@ def parser_labelme(anno_file, class_dict={}, shape=None):
     return bboxes, labels, points, groups
 
 
-def show_target_image(image, bboxes, labels, points, color=()):
+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")
     # image = image_utils.draw_landmark(image, points, color=(0, 255, 0))
     # image = image_utils.draw_key_point_in_image(image, points)
-    image = image_utils.draw_image_contours(image, points, labels, color=color, thickness=1)
+    image = image_utils.draw_image_contours(image, points, labels, color=color, thickness=thickness)
     image_utils.cv_show_image("det", image)
 
 

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils/image_utils.py

@@ -2452,7 +2452,7 @@ def draw_image_contours(image, contours: List[np.ndarray], texts=[], color=(), a
     """
     for i in range(0, len(contours)):
         c = color if color else color_table[i + 1]
-        t = texts[i] if texts else ""
+        t = str(texts[i]) if texts else ""
         p = np.asarray(contours[i], dtype=np.int32)
         b = (min(p[:, 0]), min(p[:, 1]), max(p[:, 0]), max(p[:, 1]))
         if len(p.shape) == 2: p = [p]

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils/metrics/plot_roc.py

@@ -155,29 +155,30 @@ def get_best_accuracy(true_labels, pred_scores, threshold=(0, 1.0, 0.05), vis=Fa
     if vis:
         print("best threshold           :{}".format(best_th))
         print("best Accuracy            :{}".format(best_acc))
-        plt_curve(X=threshold, Y=acc_list, xtitle="threshold", ytitle="Accuracy", title="", grid=True)
+        plt_curve(x=threshold, y=acc_list, xlabel="threshold", ylabel="Accuracy",
+                  line=f"Acc={best_acc:1.3f}", title="", grid=True)
     return best_acc, best_th
 
 
-def plt_curve(X, Y, xtitle="", ytitle="", title="", grid=True):
+def plt_curve(x, y, line="", xlabel="", ylabel="", title="", grid=True):
     """
     绘制PR-threshold曲线
-    :param X: Precision
+    :param x: Precision
     :param recall: Recall
-    :param Y
+    :param y
     :param title:曲线名称
     :return:
     """
     lw = 2
     plt.figure(figsize=(10, 10))
     colors = ["b", "r", "c", "m", "g", "y", "k", "w"]
-    plt.plot(X, Y, color=colors[0], lw=lw, label=ytitle)
+    plt.plot(x, y, color=colors[0], lw=lw, label=line)
     plt.xlim([0.0, 1.05])
     plt.ylim([0.0, 1.05])
     # 设置横纵坐标的名称以及对应字体格式
     font = {'weight': 'normal', 'size': 20}
-    plt.xlabel(xtitle, font)
-    plt.ylabel('', font)
+    plt.xlabel(xlabel, font)
+    plt.ylabel(ylabel, font)
     plt.title(title, font)
     plt.legend(loc="lower right")  # "upper right"
     # plt.legend(loc="upper right")#"upper right"

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils.egg-info/PKG-INFO

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

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/pybaseutils.egg-info/SOURCES.txt

@@ -130,6 +130,7 @@ test_py/demo_get_file_list.py
 test_py/demo_gif.py
 test_py/demo_gif_video.py
 test_py/demo_image_crop.py
+test_py/demo_kpts.py
 test_py/demo_labelme.py
 test_py/demo_labelme_crop.py
 test_py/demo_lableme_vis.py
@@ -159,6 +160,7 @@ test_py/aije/action_dataset.py
 test_py/aije/build_cython.py
 test_py/aije/build_pyarmor.py
 test_py/aije/build_service.py
+test_py/aije/convert_cvat2labelme.py
 test_py/aije/convert_labelme2coco.py
 test_py/aije/convert_labelme2voc.py
 test_py/aije/copy_move.py

pybaseutils-2.0.6/test_py/aije/convert_cvat2labelme.py

@@ -0,0 +1,21 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : Pan
+    @E-mail : 390737991@qq.com
+    @Date   : 2022-10-12 16:21:55
+    @Brief  :
+"""
+import os
+import numpy as np
+import cv2
+from tqdm import tqdm
+from pybaseutils.dataloader import parser_voc
+from pybaseutils.converter import build_voc, build_labelme, convert_cvat2labelme
+from pybaseutils import file_utils, image_utils, json_utils
+
+if __name__ == "__main__":
+    image_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/aije-action-train-v01/JPEGImages"
+    anno_dir = os.path.join(os.path.dirname(image_dir), "xml")
+    json_dir = os.path.join(os.path.dirname(image_dir), "json")
+    convert_cvat2labelme.convert_cvat2labelme(image_dir=image_dir, anno_dir=anno_dir, out_dir=json_dir,
+                                              thickness=1, fontScale=2.0, vis=False)

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/test_py/aije/demo_labelme_crop.py

@@ -67,10 +67,11 @@ if __name__ == "__main__":
     # anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-v9/json"
     anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-v0/json"
     anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det-fix/dataset-v12/json"
+    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-det/aije-action-train-v20/json"
     # anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-v10/json"
     # anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-person-coco/json"
-    class_name = ['手', '绝缘手套', '手穿绝缘手套', '棉纱手套', '手穿棉纱手套']
-    # class_name = None  # 室内
+    # class_name = ['手', '绝缘手套', '手穿绝缘手套', '棉纱手套', '手穿棉纱手套']
+    class_name = None  # 室内
     out_dir = os.path.join(os.path.dirname(anno_dir), "crops")
     dataset = parser_labelme.LabelMeDatasets(filename=None,
                                              data_root=None,

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/test_py/converter/convert_cvat2labelme.py

@@ -14,7 +14,8 @@ from pybaseutils.converter import build_voc, build_labelme, convert_cvat2labelme
 from pybaseutils import file_utils, image_utils, json_utils
 
 if __name__ == "__main__":
-    image_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-det/aije-action-train-v20/JPEGImages"
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-det/aije-action-train-v20/xml"
-    convert_cvat2labelme.convert_cvat2labelme(anno_dir=anno_dir, image_dir=image_dir,
-                                              thickness=2, fontScale=1.2, vis=False)
+    image_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/aije-action-train-v02/JPEGImages"
+    anno_dir = os.path.join(os.path.dirname(image_dir), "xml")
+    json_dir = os.path.join(os.path.dirname(image_dir), "json")
+    convert_cvat2labelme.convert_cvat2labelme(image_dir=image_dir, anno_dir=anno_dir, out_dir=json_dir,
+                                              thickness=1, fontScale=2.0, vis=True)

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/test_py/converter/get_pair_data.py

@@ -13,6 +13,7 @@ from pybaseutils import file_utils, image_utils
 
 def get_combinations_pair_data(image_dir, pair_num=0):
     """
+    获得图片对数据
     :param image_dir:
     :param pair_num:
     :return:
@@ -45,14 +46,12 @@ def get_combinations_pair_data(image_dir, pair_num=0):
     pair0 = pair0[index_0, :]  # 获取打乱后的训练数据
     pair1 = pair1[index_1, :]  # 获取打乱后的训练数据
     pairs = np.concatenate([pair0, pair1], axis=0).tolist()
-    print("pair0 nums:{}".format(len(pair0)))
-    print("pair1 nums:{}".format(len(pair1)))
-    print("have {} pairs".format(len(pairs)))
+    print("have {} pairs，pair0 nums:{}，pair1 nums:{}".format(len(pairs), len(pair0), len(pair1)))
     return pairs
 
 
 if __name__ == '__main__':
-    image_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm/test/images"
-    pairs_file = os.path.join(image_dir,"pairs.txt")
+    image_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm/test-v2/images"
+    pairs_file = os.path.join(image_dir, "pairs.txt")
     pairs = get_combinations_pair_data(image_dir, pair_num=10000)
     file_utils.write_data(pairs_file, pairs)

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/test_py/demo1.py

@@ -9,6 +9,7 @@ import os
 import cv2
 import numpy as np
 import random
+import json
 from typing import Dict
 from tqdm import tqdm
 from pybaseutils import image_utils, file_utils, json_utils, base64_utils, time_utils
@@ -41,14 +42,14 @@ class Promote():
         return len(self.promote)
 
     def __getitem__(self, index):
-        data: str = self.promote[random.randint(0, len(self.promote)-1)]
+        data: str = self.promote[random.randint(0, len(self.promote) - 1)]
         data = data.format("ddd")
         return data
 
 
 if __name__ == '__main__':
-    file = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm/promote.txt"
-    p = Promote(promote=file)
-    for index in range(len(p)):
-        data = p.__getitem__(index)
-        print(data)
+    file = "/home/PKing/nasdata/tmp/tmp/Natural/图片描述.json"
+    data = json_utils.read_json_data(file)
+    for i in range(len(data)):
+        data[i]["result"] = json.loads(data[i]["result"])
+    print(data)

pybaseutils-2.0.6/test_py/demo_kpts.py

@@ -0,0 +1,68 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PKing
+    @E-mail : 
+    @Date   : 2024-09-02 16:31:38
+    @Brief  :
+"""
+
+import cv2
+import numbers
+import numpy as np
+from pybaseutils import image_utils, file_utils
+
+# skeleton连接线，keypoint关键点名称，num_joints关键点个数
+BONES = {
+    "coco_person": {
+        "skeleton": [[15, 13], [13, 11], [16, 14], [14, 12], [11, 12], [5, 11], [6, 12], [5, 6], [5, 7],
+                     [6, 8], [7, 9], [8, 10], [1, 2], [0, 1], [0, 2], [1, 3], [2, 4], [3, 5], [4, 6]],
+        "keypoint": [],
+        "num_joints": 17,
+    },
+    "hand": {
+        "skeleton": [[0, 1], [1, 2], [2, 3], [3, 4], [0, 5], [5, 6], [6, 7], [7, 8],
+                     [5, 9], [9, 10], [10, 11], [11, 12], [9, 13], [13, 14], [14, 15], [15, 16],
+                     [13, 17], [17, 18], [18, 19], [19, 20], [0, 17]],
+        "keypoint": [],
+        "num_joints": 21,
+    }
+}
+
+
+def example():
+    kpts = [[405.20834, 71.875, 0.9536487],
+            [415.625, 61.458332, 0.96337986],
+            [384.375, 61.458332, 0.9244619],
+            [436.45834, 61.458332, 0.99999976],
+            [363.54166, 71.875, 0.98517716],
+            [488.54166, 165.625, 0.9580497],
+            [321.875, 165.625, 0.87711847],
+            [551.0417, 248.95833, 0.88645184],
+            [248.95833, 259.375, 0.8369312],
+            [561.4583, 342.70834, 0.8438214],
+            [238.54167, 342.70834, 0.8260272],
+            [457.29166, 394.79166, 0.8504467],
+            [363.54166, 394.79166, 0.85016763],
+            [467.70834, 571.875, 0.9571377],
+            [363.54166, 561.4583, 0.929651],
+            [467.70834, 738.5417, 0.9448692],
+            [363.54166, 738.5417, 0.9097275]]
+    kpts = np.asarray(kpts)
+    conf = kpts[:, 2]
+    kpt = kpts[:, 0:2]
+    box = [0, 0, 800, 800]
+    image_file = "pose.jpg"
+    image = cv2.imread(image_file)
+    image = np.zeros_like(image)+255
+    skeleton = BONES["coco_person"]["skeleton"]
+    image = image_utils.draw_key_point_in_image(image,
+                                                key_points=[kpt],
+                                                pointline=skeleton,
+                                                boxes=[box],
+                                                thickness=2,
+                                                vis_id=True)
+    image_utils.cv_show_image("image", image)
+
+
+if __name__ == "__main__":
+    example()

{pybaseutils-2.0.5 → pybaseutils-2.0.6}/test_py/demo_lableme_vis.py

@@ -6,6 +6,7 @@
     @Brief  :
 """
 import os
+from pybaseutils import file_utils
 from pybaseutils.dataloader import parser_labelme
 from pybaseutils.converter import build_labelme
 
@@ -20,22 +21,30 @@ if __name__ == "__main__":
     # anno_dir = "/home/PKing/nasdata/tmp/tmp/WaterMeter/水表数据集/Water-Meter-Det3/train/json"
     # names = ["BG", "unique"]
     anno_dir = "/home/PKing/nasdata/tmp/tmp/WaterMeter/水表数据集/Water-Meter-Det1/val/json"
-    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-outdoor-det-fix/dataset-v20/json"
+    # anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-outdoor-det-fix/dataset-v01/json"
+    # anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-outdoor-det-fix/dataset-v20/json"
+    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-indoor-det/dataset-test/json"
+    anno_dir = "/home/PKing/nasdata/dataset-dmai/AIJE/dataset/aije-action-cvlm-v2/aije-action-train-v01/json"
     names = None
+    # 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=True)
+    class_name = dataset.class_name
+    class_file = os.path.join(os.path.dirname(anno_dir), "class_name.txt")
+    file_utils.write_list_data(class_file, class_name)
     print("have num:{}".format(len(dataset)))
     for i in range(len(dataset)):
         print(i)  # i=20
         data = dataset.__getitem__(i)
         image, points, bboxes, labels = data["image"], data["points"], data["boxes"], data["labels"]
         h, w = image.shape[:2]
+        if class_name: labels = [class_name[l] for l in labels]
         image_file = data["image_file"]
         anno_file = os.path.join("masker", "{}.json".format(os.path.basename(image_file).split(".")[0]))
-        parser_labelme.show_target_image(image, bboxes, labels, points)
+        parser_labelme.show_target_image(image, bboxes, labels, points, thickness=2)