pybaseutils 2.0.1__tar.gz → 2.0.4__tar.gz

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/PKG-INFO

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

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/__init__.py

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

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/converter/convert_cvat2labelme.py

@@ -38,7 +38,7 @@ def parser_annotations(xml_file):
     return filename, annos, width, height
 
 
-def convert_cvat2labelme(anno_dir, image_dir="", vis=False):
+def convert_cvat2labelme(anno_dir, image_dir="", thickness=1, fontScale=1.0, vis=False):
     """
     将CVAT标注格式(LabelMe 3.0)转换labelme通用格式
     :param anno_dir: 标注文件目录，输出json文件与anno_dir同目录
@@ -59,7 +59,7 @@ def convert_cvat2labelme(anno_dir, image_dir="", vis=False):
             image = cv2.imread(image_file)
             h, w = image.shape[:2]
             if vis:
-                image = image_utils.draw_image_contours(image, points, texts=labels)
+                image = image_utils.draw_image_contours(image, points, texts=labels, thickness=thickness, fontScale=fontScale)
                 image_utils.cv_show_image("det", image)
         image_id = image_name.split(".")[0]
         json_file = os.path.join(anno_dir, f"{image_id}.json")

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/coords_utils.py

@@ -19,6 +19,7 @@ def clip_xyxy(xyxy: np.ndarray, valid_range):
     :param valid_range:有效范围(xmin,ymin,xmax,ymax)
     :return:
     """
+    if len(xyxy) == 0: return xyxy
     xmin, ymin, xmax, ymax = valid_range
     xyxy[:, [0, 2]] = np.clip(xyxy[:, [0, 2]], xmin, xmax)
     xyxy[:, [1, 3]] = np.clip(xyxy[:, [1, 3]], ymin, ymax)
@@ -33,6 +34,7 @@ def clip_cxcywh_minmax(cxcywh, wh_thresh, use_max=True):
     :param use_max: True：最大值限制, False: 最小值限制
     :return:
     """
+    if len(cxcywh) == 0: return cxcywh
     if isinstance(wh_thresh, numbers.Number): wh_thresh = [wh_thresh, wh_thresh]
     if not isinstance(cxcywh, np.ndarray): cxcywh = np.asarray(cxcywh)
     centers = cxcywh.copy()
@@ -51,6 +53,7 @@ def clip_cxcywh_minmax(cxcywh, wh_thresh, use_max=True):
 
 def xyxy2xywh(xyxy: np.ndarray):
     """(xmin,ymin,xmax,ymax)==>(xmin,ymin,w,h)"""
+    if len(xyxy) == 0: return xyxy
     if not isinstance(xyxy, np.ndarray): xyxy = np.asarray(xyxy)
     xywh = xyxy.copy()
     xywh[:, 2] = xywh[:, 2] - xywh[:, 0]  # w=xmax-xmin
@@ -60,6 +63,7 @@ def xyxy2xywh(xyxy: np.ndarray):
 
 def xywh2xyxy(xywh: np.ndarray):
     """(xmin,ymin,w,h)==>(xmin,ymin,xmax,ymax)"""
+    if len(xywh) == 0: return xywh
     if not isinstance(xywh, np.ndarray): xywh = np.asarray(xywh)
     xyxy = xywh.copy()
     xyxy[:, 2] = xyxy[:, 0] + xyxy[:, 2]  # xmax=xmin+w
@@ -69,6 +73,7 @@ def xywh2xyxy(xywh: np.ndarray):
 
 def xyxy2cxcywh(xyxy: np.ndarray, width=None, height=None, normalized=False):
     """(xmin, ymin, xmax, ymax)==>(cx,cy,w,h)"""
+    if len(xyxy) == 0: return xyxy
     if not isinstance(xyxy, np.ndarray): xyxy = np.asarray(xyxy)
     cxcywh = xyxy.copy()
     cxcywh[:, 0] = (xyxy[:, 2] + xyxy[:, 0]) / 2  # cx
@@ -82,6 +87,7 @@ def xyxy2cxcywh(xyxy: np.ndarray, width=None, height=None, normalized=False):
 
 def cxcywh2xyxy(cxcywh: np.ndarray, width=None, height=None, normalized=False):
     """(cx,cy,w,h)==>xmin, ymin, xmax, ymax)"""
+    if len(cxcywh) == 0: return cxcywh
     if not isinstance(cxcywh, np.ndarray): cxcywh = np.asarray(cxcywh)
     xyxy = cxcywh.copy()
     xyxy[:, 0] = cxcywh[:, 0] - cxcywh[:, 2] / 2  # top left x
@@ -103,6 +109,7 @@ def extend_xyxy(xyxy: np.ndarray, scale=[1.0, 1.0], valid_range=[], fixed=False,
                  使用fixed的长宽会按照相同大小扩展
     :return:
     """
+    if len(xyxy) == 0: return xyxy
     if not isinstance(xyxy, np.ndarray): xyxy = np.asarray(xyxy)
     cxcywh = xyxy.copy()
     if fixed:
@@ -130,6 +137,7 @@ def extend_xywh(xywh: np.ndarray, scale=[1.0, 1.0], valid_range=[], fixed=False,
     :param scale: [sx,sy]==>(W,H)
     :return:
     """
+    if len(xywh) == 0: return xywh
     if not isinstance(xywh, np.ndarray): xywh = np.asarray(xywh)
     xyxy = xywh2xyxy(xywh)
     xyxy = extend_xyxy(xyxy, scale, valid_range=valid_range, fixed=fixed, use_max=use_max)
@@ -148,6 +156,7 @@ def extend_xyxy_similar_square(xyxy, use_max=True, weight=1.0, valid_range=[]):
     :param valid_range:有效范围(xmin,ymin,xmax,ymax)
     :return:
     """
+    if len(xyxy) == 0: return xyxy
     if not isinstance(xyxy, np.ndarray): xyxy = np.asarray(xyxy)
     center = xyxy2cxcywh(xyxy)
     if use_max:
@@ -162,6 +171,7 @@ def extend_xyxy_similar_square(xyxy, use_max=True, weight=1.0, valid_range=[]):
     if valid_range: _boxes = clip_xyxy(_boxes, valid_range=valid_range)
     return _boxes
 
+
 def shrink_polygon_pyclipper(polygon, ratio):
     """
     使用Polygon库计算多边形区域的周长和面积，使用pyclipper库进行shrink
@@ -196,6 +206,7 @@ def get_square_boxes(boxes, use_max=True, baseline=-1):
     :param baseline: 当baseline>0，表示正方形最小边长
     :return:
     """
+    if len(boxes) == 0: return boxes
     if not isinstance(boxes, np.ndarray): boxes = np.asarray(boxes)
     center = xyxy2cxcywh(boxes)
     if use_max:
@@ -222,6 +233,7 @@ def get_square_rects(rects, use_max=True, baseline=-1):
     :param baseline: 当baseline>0，表示正方形最小边长
     :return:
     """
+    if len(rects) == 0: return rects
     boxes = xywh2xyxy(rects)
     boxes = get_square_boxes(boxes, use_max=use_max, baseline=baseline)
     rects = xyxy2xywh(boxes)

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/cvutils/video_utils.py

@@ -177,11 +177,8 @@ def frames2video(image_dir, video_file=None, func=None, size=None, postfix=["*.p
     cv2.destroyAllWindows()
 
 
-def convert_video_format(video_file, save_video, start=0, interval=1):
-    return video2video(video_file, save_video, start=start, interval=interval)
-
-
-def video2video(video_file, save_video, task=None, start=0, interval=1, vis=True, delay=20):
+def video2video(video_file: int or str, save_video: str or int, interval=1, task: Callable = None,
+                vis=True, **kwargs):
     """
     转换视频格式
     :param video_file: *.avi,*.mp4,...
@@ -189,27 +186,10 @@ def video2video(video_file, save_video, task=None, start=0, interval=1, vis=True
     :param interval: 间隔
     :return:
     """
-    video_cap = get_video_capture(video_file)
-    width, height, num_frames, fps = get_video_info(video_cap)
-    # video_writer = get_video_writer(save_video, width, height, fps)
-    video_writer = None
-    # freq = int(fps / detect_freq)
-    count = start
-    while True:
-        # if count % interval == 0:
-        if count % interval == 0 and count > 0:
-            # 设置抽帧的位置
-            video_cap.set(cv2.CAP_PROP_POS_FRAMES, count)
-            isSuccess, frame = video_cap.read()
-            if not isSuccess or 0 < num_frames < count: break
-            if task: frame = task(frame, count=count)
-            height, width = frame.shape[:2]
-            if not video_writer: video_writer = get_video_writer(save_video, width, height, fps)
-            if vis: image_utils.cv_show_image("frame", frame, use_rgb=False, delay=delay)
-            video_writer.write(frame)
-        count += 1
-    video_cap.release()
-    video_writer.release()
+    video_capture(video_file=video_file, save_video=save_video, interval=interval, task=task, vis=vis, **kwargs)
+
+
+convert_video_format = video2video
 
 
 def resize_video(video_file, save_video, size=(), start=0, interval=1, vis=True, delay=20):
@@ -261,7 +241,7 @@ def video_capture(video_file: int or str, save_video: str or int = None, interva
     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)
-    end = int(kwargs.get("end", num_frames / fps) * fps)
+    end = int(kwargs.get("end", num_frames / fps) * fps) if fps > 0 else 0
     end = min(end, num_frames)  # TODO 当num_frames<0时，使用0<end<count继续播放
     interval = fps if interval == -1 else interval  # 当interval=-1，表示interval=fps,即一秒一帧
     save_fps = max(kwargs.get("speed", 1) * fps // interval, 1)
@@ -313,7 +293,7 @@ def video_iterator(video_file: int or str, save_video: str or int = None, interv
     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)
-    end = int(kwargs.get("end", num_frames / fps) * fps)
+    end = int(kwargs.get("end", num_frames / fps) * fps) if fps > 0 else 0
     end = min(end, num_frames)  # TODO 当num_frames<0时，使用0<end<count继续播放
     interval = fps if interval == -1 else interval  # 当interval=-1，表示interval=fps,即一秒一帧
     save_fps = max(kwargs.get("speed", 1) * fps // interval, 1)

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/dataloader/parser_coco_det.py

@@ -53,9 +53,9 @@ class CocoDetection(CocoDataset):
 
     def __getitem__(self, index):
         image_id = self.image_ids[index]
-        anno_info, file_info = self.get_object_annotations(image_id)
+        anns_info, file_info = self.get_object_annotations(image_id)
         image, width, height, image_file = self.get_object_image(file_info)
-        boxes, labels = self.get_object_detection(anno_info)
+        boxes, labels = self.get_object_detection(anns_info)
         if self.transform and len(boxes) > 0:
             image, boxes, labels = self.transform(image, boxes, labels)
         num_boxes = len(boxes)
@@ -65,7 +65,9 @@ class CocoDetection(CocoDataset):
         if num_boxes == 0:
             index = int(random.uniform(0, len(self)))
             return self.__getitem__(index)
-        data = {"image": image, "target": target, "labels": labels, "image_id": image_id,
+        data = {"image": image, "boxes": boxes, "labels": labels,
+                "segs": [], "mask": [], "keypoints": [], "target": target,
+                "image_id": image_id, "annotations": anns_info, "file_info": file_info,
                 "image_file": image_file, "size": [width, height], "class_name": self.class_name}
         return data
 

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/dataloader/parser_coco_ins.py

@@ -40,7 +40,8 @@ class CocoInstance(CocoDataset):
         anns_info, file_info = self.get_object_annotations(image_id)
         image, width, height, image_file = self.get_object_image(file_info)
         boxes, labels, mask, segs = self.get_object_instance(anns_info, h=height, w=width, decode=self.decode)
-        data = {"segs": segs, "mask": mask, "image": image, "boxes": boxes, "labels": labels,
+        data = {"image": image, "boxes": boxes, "labels": labels,
+                "segs": segs, "mask": mask, "keypoints": [], "target": [],
                 "image_id": image_id, "annotations": anns_info, "file_info": file_info,
                 "image_file": image_file, "size": [width, height], "class_name": self.class_name}
         return data
@@ -103,7 +104,7 @@ def show_target_image(image, mask, boxes, labels, points=[], class_name=[], thic
     color_image, color_mask = color_utils.draw_image_mask_color(image, mask)
     color_image = image_utils.draw_image_bboxes_labels(color_image, boxes, labels, class_name=class_name,
                                                        thickness=thickness, fontScale=fontScale, drawType="chinese")
-    if len(points)>0:
+    if len(points) > 0:
         color_mask = image_utils.draw_image_contours(color_mask, contours=points)
         color_image = image_utils.draw_image_contours(color_image, contours=points)
     vis_image = image_utils.image_hstack([image, mask, color_image, color_mask])

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/dataloader/parser_coco_kps.py

@@ -32,6 +32,7 @@ class CocoKeypoint(base_coco.CocoDataset):
                                            target_transform=target_transform, use_rgb=use_rgb,
                                            shuffle=shuffle, decode=decode, **kwargs)
         if not class_name: class_name = [self.class_name[1]]
+        if isinstance(class_name, dict): class_name = list(class_name.keys())
         self.kps_info = self.load_keypoints_info(target=class_name)
         self.num_joints = num_joints
         if class_name[0] in BONES:
@@ -70,9 +71,10 @@ class CocoKeypoint(base_coco.CocoDataset):
         anns_info, file_info = self.get_object_annotations(image_id)
         image, width, height, image_file = self.get_object_image(file_info)
         boxes, labels, keypoints = self.get_keypoint_info(anns_info, self.num_joints)
-        data = {"keypoints": keypoints, "image": image, "boxes": boxes, "labels": labels, "image_id": image_id,
-                "annotations": anns_info, "file_info": file_info, "image_file": image_file,
-                "size": [width, height], "class_name": self.class_name}
+        data = {"image": image, "boxes": boxes, "labels": labels,
+                "segs": [], "mask": [], "keypoints": keypoints, "target": [],
+                "image_id": image_id, "annotations": anns_info, "file_info": file_info,
+                "image_file": image_file, "size": [width, height], "class_name": self.class_name}
         return data
 
 
@@ -116,7 +118,7 @@ def CocoKeypoints(anno_file=None,
     return datasets
 
 
-def show_target_image(image, keypoints, boxes, skeleton, colors=None,thickness=2, vis_id=False, use_rgb=True):
+def show_target_image(image, keypoints, boxes, skeleton, colors=None, thickness=2, vis_id=False, use_rgb=True):
     image = image_utils.draw_key_point_in_image(image,
                                                 keypoints,
                                                 pointline=skeleton,

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/dataloader/parser_yolo.py

@@ -217,13 +217,13 @@ class YOLODataset(Dataset):
         image = self.read_image(image_file, use_rgb=self.use_rgb)
         shape = image.shape
         annotation = self.load_annotations(anno_file)
-        boxes, labels, points = self.parser_annotation(annotation, shape, self.class_dict)
+        boxes, labels, points = self.parser_annotation_segs(annotation, shape, self.class_dict)
         data = {"image": image, "boxes": boxes, "labels": labels, "points": points,
                 "image_file": image_file, "anno_file": anno_file}
         return data
 
     @staticmethod
-    def parser_annotation(annotation: dict, shape, class_dict):
+    def parser_annotation_boxes(annotation: dict, shape, class_dict):
         """
         :param annotation:  labelme标注的数据
         :param class_dict:  label映射
@@ -249,6 +249,28 @@ class YOLODataset(Dataset):
             bboxes = image_utils.points2bbox(points)
         return bboxes, labels, points
 
+    @staticmethod
+    def parser_annotation_segs(annotation: dict, shape, class_dict):
+        """
+        :param annotation:  labelme标注的数据
+        :param class_dict:  label映射
+        :param shape: 图片shape(H,W,C),可进行坐标点的维度检查，避免越界
+        :return:
+        """
+        # dim=5,annotation is [class_index, cx, cy, w,  h]
+        # dim=9,annotation is [class_index, x1, y1, x2, y2, x3, y3, x4, y4],四个角点
+        h, w = shape[:2]
+        bboxes, labels, points = [], [], []
+        for anno in annotation:
+            label = anno[0]
+            polys = np.asarray(anno[1:]).reshape(-1, 2)
+            polys = polys * [w, h]
+            boxes = image_utils.polygons2boxes([polys])[0]
+            labels.append(label)
+            points.append(polys)
+            bboxes.append(boxes)
+        return bboxes, labels, points
+
     def index2id(self, index):
         """
         :param index: int or str
@@ -319,16 +341,17 @@ def show_target_image(image, bboxes, labels, points=[], class_name=None, use_rgb
     :param use_rgb:
     :return:
     """
-    image = image_utils.draw_image_contours(image, contours=points)
-    # image = image_utils.draw_image_bboxes_labels(image, bboxes, labels, class_name=class_name)
-    image_utils.cv_show_image("det", image, use_rgb=use_rgb)
+    dst = image.copy()
+    dst = image_utils.draw_image_contours(dst, contours=points, alpha=0.1, thickness=1)
+    dst = image_utils.image_hstack([image, dst])
+    image_utils.cv_show_image("det", dst, use_rgb=use_rgb)
 
 
 if __name__ == "__main__":
     # filename = "/home/dm/nasdata/dataset/csdn/helmet/helmet-dataset-v2/train.txt"
     # filename = "/home/dm/nasdata/dataset/csdn/helmet/helmet-asian/total.txt"
     # filename = "/home/dm/nasdata/dataset/csdn/helmet/helmet-asian/total.txt"
-    filename = "/home/PKing/Downloads/dota8/dota8/images/train/train.txt"
+    filename = "/home/PKing/nasdata/tmp/tmp/medical/肾结石CT/valid/sample.txt"
     dataset = YOLODataset(filename=filename,
                           data_root=None,
                           anno_dir=None,
@@ -341,8 +364,8 @@ if __name__ == "__main__":
     for i in range(len(dataset)):
         print(i)  # i=20
         data = dataset.__getitem__(i)
-        image, bboxes, labels = data["image"], data["box"], data["label"]
-        points = data["point"]
+        image, bboxes, labels = data["image"], data["boxes"], data["labels"]
+        points = data["points"]
         h, w = image.shape[:2]
         image_file = data["image_file"]
         show_target_image(image, bboxes, labels, points=points)

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/file_utils.py

@@ -550,15 +550,15 @@ def move_dir(src, dst, sub=False):
 
 def move_file(srcfile, dstfile):
     """ 移动文件或重命名"""
-    if not os.path.isfile(srcfile):
-        print("%s not exist!" % (srcfile))
-    else:
+    if os.path.exists(srcfile) and os.path.isfile(srcfile):
         fpath, fname = os.path.split(dstfile)  # 分离文件名和路径
         if not os.path.exists(fpath):
             os.makedirs(fpath)  # 创建路径
         shutil.move(srcfile, dstfile)
         # print("copy %s -> %s"%( srcfile,dstfile))
         # time.sleep(1 / 1000.)
+    else:
+        print("%s not exist!" % (srcfile))
 
 
 def copy_file(srcfile, dstfile):

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils/image_utils.py

@@ -1905,6 +1905,9 @@ def get_box_crop(image, box):
     return roi
 
 
+get_bbox_crop = get_box_crop
+
+
 def get_bboxes_crop(image, bboxes):
     """
     已经废弃，使用get_boxes_crop代替
@@ -2435,7 +2438,8 @@ def pointPolygonTest(point, contour, measureDist=False):
     return dist
 
 
-def draw_image_contours(image, contours: List[np.ndarray], texts=[], color=(), alpha=0.5, thickness=2, drawType="ch"):
+def draw_image_contours(image, contours: List[np.ndarray], texts=[], color=(), alpha=0.5, thickness=1, fontScale=0.8,
+                        drawType="ch"):
     """
     参考：draw_image_mask_color
     :param image:
@@ -2456,13 +2460,28 @@ def draw_image_contours(image, contours: List[np.ndarray], texts=[], color=(), a
         bgimg = image.copy()
         bgimg = cv2.fillPoly(bgimg, p, color=c)
         image = cv2.addWeighted(src1=image, alpha=1 - alpha, src2=bgimg, beta=alpha, gamma=0)
-        if t: image = draw_text(image, point=(b[0], b[1]), color=c, text=t, thickness=thickness, drawType=drawType)
+        if t: image = draw_text(image, point=(b[0], b[1]), color=c, text=t, thickness=thickness,
+                                fontScale=fontScale, drawType=drawType)
     return image
 
 
 draw_image_mask_color = color_utils.draw_image_mask_color
 
 
+def draw_mask_contours(contours: List[np.ndarray], size, value=255):
+    """
+    参考：draw_image_mask_color
+    :param contours: List[np.ndarray],每个列表是一个轮廓(num_points,1,2)
+    :return:
+    """
+    mask = np.zeros(shape=(size[1], size[0]), dtype=np.uint8)
+    for i in range(0, len(contours)):
+        p = np.asarray(contours[i], dtype=np.int32)
+        if len(p.shape) == 2: p = [p]
+        mask[:] = cv2.drawContours(mask, p, contourIdx=-1, color=value, thickness=-1)
+    return mask
+
+
 def get_mask_boundrect_cv(mask, binarize=False, shift=0):
     """
     获得mask的最大外接矩形框(其速度比get_mask_boundrect快2倍左右)
@@ -2900,7 +2919,7 @@ def get_video_capture(video, width=None, height=None, fps=None):
     return video_cap
 
 
-def get_video_info(video_cap: cv2.VideoCapture):
+def get_video_info(video_cap: cv2.VideoCapture, vis=True):
     """
     获得视频的基础信息
     :param video_cap:视频对象
@@ -2910,7 +2929,7 @@ def get_video_info(video_cap: cv2.VideoCapture):
     height = int(video_cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
     num_frames = int(video_cap.get(cv2.CAP_PROP_FRAME_COUNT))
     fps = int(video_cap.get(cv2.CAP_PROP_FPS))
-    print("read video:width:{},height:{},fps:{},num_frames:{}".format(width, height, fps, num_frames))
+    if vis: print("read video:width:{},height:{},fps:{},num_frames:{}".format(width, height, fps, num_frames))
     return width, height, num_frames, fps
 
 

pybaseutils-2.0.4/pybaseutils/transforms/augment_utils.py

@@ -0,0 +1,127 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PKing
+    @E-mail : 
+    @Date   : 2024-07-25 08:33:57
+    @Brief  : https://imgaug.readthedocs.io/en/latest/index.html
+"""
+import os
+import cv2
+import numpy as np
+from typing import List, Tuple
+from imgaug import augmenters as iaa
+from pybaseutils import file_utils, image_utils
+from imgaug.augmentables.segmaps import SegmentationMapsOnImage
+from imgaug.augmentables.kps import KeypointsOnImage
+
+
+class Compose(object):
+    def __init__(self, transforms: List = [], fixed=True):
+        """
+        :param transforms:
+        :param fixed: images的图片是否使用相同的增强方式
+        """
+        self.fixed = fixed
+        self.transforms = transforms if transforms else []
+        self.aug = iaa.Sequential(children=self.transforms, random_order=False, seed=2004)
+
+    def __call__(self, image=None, images=None, **kwargs):
+        """
+        kwargs = ["image","images", "heatmaps", "segmentation_maps",
+                "keypoints", "bounding_boxes", "polygons",
+                "line_strings"]
+        :param kwargs:
+        :return:
+        """
+        if isinstance(images, list) and len(images) > 0:
+            if self.fixed:
+                aug = self.aug.to_deterministic()
+                images = [aug(image=images[i], **kwargs) for i in range(len(images))]
+            else:
+                images = self.aug(images=images, **kwargs)
+            return images
+        if isinstance(image, np.ndarray):
+            image = self.aug(image=image, **kwargs)
+            return image
+
+
+def augment_example(input_size=(224, 224)):
+    transforms = [
+        iaa.Resize({"width": int(input_size[0] * 1.2), "height": "keep-aspect-ratio"}),
+        iaa.Fliplr(0.5),  # 以75%的概率水平翻转图像
+        iaa.LinearContrast((0.75, 1.5)),  # 加强或减弱图像的对比度
+        iaa.ContrastNormalization((0.8, 1.2)),  # 随机调整对比度
+        iaa.Multiply((0.8, 1.2), per_channel=0.2),  # 亮度变化
+        iaa.Affine(scale={"x": (0.8, 1.2), "y": (0.8, 1.2)},
+                   translate_percent={"x": (-0.1, 0.1), "y": (-0.1, 0.1)},
+                   rotate=(-5, 5),
+                   shear=(-8, 8)
+                   ),
+        iaa.Crop(percent=(0, 0.1)),
+        iaa.Resize({"width": input_size[0], "height": input_size[1]}),
+        # 以50%的概率对图像进行小的高斯模糊增强
+        # iaa.Sometimes(0.5, iaa.GaussianBlur(sigma=(0, 0.5))),
+        #
+        # # 添加高斯噪声
+        # iaa.AdditiveGaussianNoise(loc=0, scale=(0.0, 0.05 * 255), per_channel=0.5),
+        # # 使部分图像变亮，部分变暗
+        # # 对图像进行仿射变换
+        # iaa.PadToFixedSize(width=100, height=100),
+        # iaa.CropToFixedSize(width=100, height=100),
+        # iaa.CropToFixedSize(width=size[0], height=size[1]),
+        # iaa.Resize({"width": int(size[0]), "height": "keep-aspect-ratio"}),
+        # iaa.PadToFixedSize(width=size[0], height=size[1]),
+        # iaa.CenterPadToFixedSize(width=size[0], height=size[1]),
+    ]
+    return transforms
+
+
+def demo_for_image():
+    # image = cv2.rotate(image, rotateCode=cv2.ROTATE_90_CLOCKWISE)
+    transforms = augment_example()
+    augment = Compose(transforms=transforms, fixed=True)
+    for i in range(100):
+        image_path = "../../data/test.png"
+        image = image_utils.read_image(image_path)
+        images = [image.copy(), image.copy()]
+        images = augment(images=images)
+        [print(img.shape) for img in images]
+        result = image_utils.image_hstack(images)
+        image_utils.cv_show_image("image", image, delay=5)
+        image_utils.cv_show_image("result", result)
+
+
+def demo_for_segment():
+    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)
+        auimg, segimg = augment(image=image, segmentation_maps=SegmentationMapsOnImage(mask, shape=mask.shape))
+        mask = np.asarray(segimg.arr[:, :, 0], dtype=np.uint8)
+        color_image, color_mask = image_utils.draw_image_mask_color(auimg, mask)
+        result = image_utils.image_hstack([image, color_image, mask])
+        image_utils.cv_show_image("image", result)
+
+
+def demo_for_keypoint():
+    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)
+        auimg, contours = augment(image=image, keypoints=contours)
+        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()

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils.egg-info/PKG-INFO

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

{pybaseutils-2.0.1 → pybaseutils-2.0.4}/pybaseutils.egg-info/SOURCES.txt

@@ -108,6 +108,7 @@ pybaseutils/tracking/motion_filter.py
 pybaseutils/tracking/pose_filter.py
 pybaseutils/transforms/__init__.py
 pybaseutils/transforms/affine_transform.py
+pybaseutils/transforms/augment_utils.py
 pybaseutils/transforms/face_alignment.py
 pybaseutils/transforms/transform_utils.py
 test_py/__init__.py
@@ -154,6 +155,9 @@ test_py/WebCrawler/__init__.py
 test_py/WebCrawler/search_image.py
 test_py/WebCrawler/search_image_for_baidu.py
 test_py/aije/__init__.py
+test_py/aije/build_cython.py
+test_py/aije/build_pyarmor.py
+test_py/aije/build_service.py
 test_py/aije/convert_labelme2coco.py
 test_py/aije/convert_labelme2voc.py
 test_py/aije/copy_move.py
@@ -198,6 +202,7 @@ test_py/converter/handpose2coco.py
 test_py/converter/insects_for_aichallenger.py
 test_py/converter/tt100k_utils.py
 test_py/converter/ua_detrac2voc.py
+test_py/converter/ucf101_dataset.py
 test_py/converter/voc_sbd2labelme.py
 test_py/cython_build/__init__.py
 test_py/cython_build/build_cython.py

pybaseutils-2.0.4/test_py/aije/build_pyarmor.py

@@ -0,0 +1,34 @@
+# -*-coding: utf-8 -*-
+"""
+    @Author : PKing
+    @E-mail :
+    @Date   : 2023-09-20 14:35:22
+    @Brief  : pip install pyarmor==7.7.4
+              https://pyarmor.readthedocs.io/en/v5.4.0/project.html#managing-obfuscated-scripts-with-project
+              https://pyarmor.readthedocs.io/en/v7.3.0/project.html#project-configuration-file
+              https://docs.python.org/2/distutils/sourcedist.html#commands (Commands)
+              https://baijiahao.baidu.com/s?id=1775756280786745996&wfr=spider&for=pc
+              https://www.jianshu.com/p/c1d3d79e3545/
+"""
+
+import os
+from pybaseutils import file_utils
+from pybaseutils.build_utils import pyarmor_utils
+
+IGNORE_DIRS = ['.git', '.idea', 'docs', 'build', 'dist']
+
+if __name__ == '__main__':
+    root = os.path.dirname(__file__)
+    build = os.path.join(root, "build")
+    entry = "app/main.py"
+    manifest = "global-include *.py," \
+               "exclude test/*.py," \
+               "prune app/infercore/human_detector/yolov5/utils," \
+               "prune app/infercore/human_pose/hrnet/yolov5/utils," \
+               "prune app/infercore/equipment_detector/yolov5/utils," \
+               "prune app/infercore/equipment_detector/yolov8/ultralytics," \
+               "prune app/infercore/base," \
+               "prune app/infercore/modules," \
+               "exclude app/infercore/modules/indoor_component.py," \
+               "exclude app/infercore/modules/outdoor_component.py,"
+    pyarmor_utils.build_pyarmor_project(root, entry, build, manifest=manifest, exclude_dirs=IGNORE_DIRS)