ultralytics 8.2.21__tar.gz → 8.2.22__tar.gz

{ultralytics-8.2.21 → ultralytics-8.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.21
+Version: 8.2.22
 Summary: Ultralytics YOLOv8 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author: Glenn Jocher, Ayush Chaurasia, Jing Qiu
 Maintainer: Glenn Jocher, Ayush Chaurasia, Jing Qiu

{ultralytics-8.2.21 → ultralytics-8.2.22}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics YOLO 🚀, AGPL-3.0 license
 
-__version__ = "8.2.21"
+__version__ = "8.2.22"
 
 from ultralytics.data.explorer.explorer import Explorer
 from ultralytics.models import RTDETR, SAM, YOLO, YOLOWorld

{ultralytics-8.2.21 → ultralytics-8.2.22}/ultralytics/data/augment.py

@@ -874,11 +874,56 @@ class Albumentations:
         self.p = p
         self.transform = None
         prefix = colorstr("albumentations: ")
+
         try:
             import albumentations as A
 
             check_version(A.__version__, "1.0.3", hard=True)  # version requirement
 
+            # List of possible spatial transforms
+            spatial_transforms = {
+                "Affine",
+                "BBoxSafeRandomCrop",
+                "CenterCrop",
+                "CoarseDropout",
+                "Crop",
+                "CropAndPad",
+                "CropNonEmptyMaskIfExists",
+                "D4",
+                "ElasticTransform",
+                "Flip",
+                "GridDistortion",
+                "GridDropout",
+                "HorizontalFlip",
+                "Lambda",
+                "LongestMaxSize",
+                "MaskDropout",
+                "MixUp",
+                "Morphological",
+                "NoOp",
+                "OpticalDistortion",
+                "PadIfNeeded",
+                "Perspective",
+                "PiecewiseAffine",
+                "PixelDropout",
+                "RandomCrop",
+                "RandomCropFromBorders",
+                "RandomGridShuffle",
+                "RandomResizedCrop",
+                "RandomRotate90",
+                "RandomScale",
+                "RandomSizedBBoxSafeCrop",
+                "RandomSizedCrop",
+                "Resize",
+                "Rotate",
+                "SafeRotate",
+                "ShiftScaleRotate",
+                "SmallestMaxSize",
+                "Transpose",
+                "VerticalFlip",
+                "XYMasking",
+            }  # from https://albumentations.ai/docs/getting_started/transforms_and_targets/#spatial-level-transforms
+
             # Transforms
             T = [
                 A.Blur(p=0.01),
@@ -889,8 +934,14 @@ class Albumentations:
                 A.RandomGamma(p=0.0),
                 A.ImageCompression(quality_lower=75, p=0.0),
             ]
-            self.transform = A.Compose(T, bbox_params=A.BboxParams(format="yolo", label_fields=["class_labels"]))
 
+            # Compose transforms
+            self.contains_spatial = any(transform.__class__.__name__ in spatial_transforms for transform in T)
+            self.transform = (
+                A.Compose(T, bbox_params=A.BboxParams(format="yolo", label_fields=["class_labels"]))
+                if self.contains_spatial
+                else A.Compose(T)
+            )
             LOGGER.info(prefix + ", ".join(f"{x}".replace("always_apply=False, ", "") for x in T if x.p))
         except ImportError:  # package not installed, skip
             pass
@@ -899,20 +950,26 @@ class Albumentations:
 
     def __call__(self, labels):
         """Generates object detections and returns a dictionary with detection results."""
-        im = labels["img"]
-        cls = labels["cls"]
-        if len(cls):
-            labels["instances"].convert_bbox("xywh")
-            labels["instances"].normalize(*im.shape[:2][::-1])
-            bboxes = labels["instances"].bboxes
-            # TODO: add supports of segments and keypoints
-            if self.transform and random.random() < self.p:
+        if self.transform is None or random.random() > self.p:
+            return labels
+
+        if self.contains_spatial:
+            cls = labels["cls"]
+            if len(cls):
+                im = labels["img"]
+                labels["instances"].convert_bbox("xywh")
+                labels["instances"].normalize(*im.shape[:2][::-1])
+                bboxes = labels["instances"].bboxes
+                # TODO: add supports of segments and keypoints
                 new = self.transform(image=im, bboxes=bboxes, class_labels=cls)  # transformed
                 if len(new["class_labels"]) > 0:  # skip update if no bbox in new im
                     labels["img"] = new["image"]
                     labels["cls"] = np.array(new["class_labels"])
                     bboxes = np.array(new["bboxes"], dtype=np.float32)
-            labels["instances"].update(bboxes=bboxes)
+                labels["instances"].update(bboxes=bboxes)
+        else:
+            labels["img"] = self.transform(image=labels["img"])["image"]  # transformed
+
         return labels
 
 

{ultralytics-8.2.21 → ultralytics-8.2.22}/ultralytics/solutions/__init__.py

@@ -5,7 +5,7 @@ from .analytics import Analytics
 from .distance_calculation import DistanceCalculation
 from .heatmap import Heatmap
 from .object_counter import ObjectCounter
-from .parking_management import ParkingManagement
+from .parking_management import ParkingManagement, ParkingPtsSelection
 from .queue_management import QueueManager
 from .speed_estimation import SpeedEstimator
 

{ultralytics-8.2.21 → ultralytics-8.2.22}/ultralytics/solutions/analytics.py

@@ -1,3 +1,5 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+
 from itertools import cycle
 
 import cv2

{ultralytics-8.2.21 → ultralytics-8.2.22}/ultralytics/solutions/parking_management.py

@@ -1,3 +1,5 @@
+# Ultralytics YOLO 🚀, AGPL-3.0 license
+
 import json
 from tkinter import filedialog, messagebox
 
@@ -10,32 +12,31 @@ from ultralytics.utils.plotting import Annotator
 
 
 class ParkingPtsSelection:
-    def __init__(self, master):
-        """
-        Initializes the UI for selecting parking zone points in a tkinter window.
-
-        Args:
-            master (tk.Tk): The main tkinter window object.
-        """
+    def __init__(self):
+        """Initializes the UI for selecting parking zone points in a tkinter window."""
         check_requirements("tkinter")
+
         import tkinter as tk
 
-        self.master = master
-        master.title("Ultralytics Parking Zones Points Selector")
+        self.tk = tk
+        self.master = tk.Tk()
+        self.master.title("Ultralytics Parking Zones Points Selector")
 
         # Disable window resizing
-        master.resizable(False, False)
+        self.master.resizable(False, False)
 
         # Setup canvas for image display
-        self.canvas = tk.Canvas(master, bg="white")
+        self.canvas = self.tk.Canvas(self.master, bg="white")
 
         # Setup buttons
-        button_frame = tk.Frame(master)
-        button_frame.pack(side=tk.TOP)
+        button_frame = self.tk.Frame(self.master)
+        button_frame.pack(side=self.tk.TOP)
 
-        tk.Button(button_frame, text="Upload Image", command=self.upload_image).grid(row=0, column=0)
-        tk.Button(button_frame, text="Remove Last BBox", command=self.remove_last_bounding_box).grid(row=0, column=1)
-        tk.Button(button_frame, text="Save", command=self.save_to_json).grid(row=0, column=2)
+        self.tk.Button(button_frame, text="Upload Image", command=self.upload_image).grid(row=0, column=0)
+        self.tk.Button(button_frame, text="Remove Last BBox", command=self.remove_last_bounding_box).grid(
+            row=0, column=1
+        )
+        self.tk.Button(button_frame, text="Save", command=self.save_to_json).grid(row=0, column=2)
 
         # Initialize properties
         self.image_path = None
@@ -50,6 +51,8 @@ class ParkingPtsSelection:
         self.canvas_max_width = 1280
         self.canvas_max_height = 720
 
+        self.master.mainloop()
+
     def upload_image(self):
         """Upload an image and resize it to fit canvas."""
         self.image_path = filedialog.askopenfilename(filetypes=[("Image Files", "*.png;*.jpg;*.jpeg")])
@@ -74,12 +77,12 @@ class ParkingPtsSelection:
         if self.canvas:
             self.canvas.destroy()  # Destroy previous canvas
 
-        self.canvas = tk.Canvas(self.master, bg="white", width=canvas_width, height=canvas_height)
+        self.canvas = self.tk.Canvas(self.master, bg="white", width=canvas_width, height=canvas_height)
         resized_image = self.image.resize((canvas_width, canvas_height), Image.LANCZOS)
         self.canvas_image = ImageTk.PhotoImage(resized_image)
-        self.canvas.create_image(0, 0, anchor=tk.NW, image=self.canvas_image)
+        self.canvas.create_image(0, 0, anchor=self.tk.NW, image=self.canvas_image)
 
-        self.canvas.pack(side=tk.BOTTOM)
+        self.canvas.pack(side=self.tk.BOTTOM)
         self.canvas.bind("<Button-1>", self.on_canvas_click)
 
         # Reset bounding boxes and current box
@@ -115,7 +118,7 @@ class ParkingPtsSelection:
         if self.bounding_boxes:
             self.bounding_boxes.pop()  # Remove the last bounding box
             self.canvas.delete("all")  # Clear the canvas
-            self.canvas.create_image(0, 0, anchor=tk.NW, image=self.canvas_image)  # Redraw the image
+            self.canvas.create_image(0, 0, anchor=self.tk.NW, image=self.canvas_image)  # Redraw the image
 
             # Redraw all bounding boxes
             for box in self.bounding_boxes:
@@ -210,6 +213,7 @@ class ParkingManagement:
             im0 (ndarray): inference image
             boxes (list): bounding boxes data
             clss (list): bounding boxes classes list
+
         Returns:
             filled_slots (int): total slots that are filled in parking lot
             empty_slots (int): total slots that are available in parking lot

{ultralytics-8.2.21 → ultralytics-8.2.22}/ultralytics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ultralytics
-Version: 8.2.21
+Version: 8.2.22
 Summary: Ultralytics YOLOv8 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author: Glenn Jocher, Ayush Chaurasia, Jing Qiu
 Maintainer: Glenn Jocher, Ayush Chaurasia, Jing Qiu