dgenerate-ultralytics-headless 8.3.154__tar.gz → 8.3.156__tar.gz

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.154
+Version: 8.3.156
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.154
+Version: 8.3.156
 Summary: Automatically built Ultralytics package with python-opencv-headless dependency instead of python-opencv
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/__init__.py

@@ -1,6 +1,6 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-__version__ = "8.3.154"
+__version__ = "8.3.156"
 
 import os
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/data/build.py

@@ -154,7 +154,7 @@ def build_grounding(cfg, img_path, json_file, batch, mode="train", rect=False, s
     )
 
 
-def build_dataloader(dataset, batch: int, workers: int, shuffle: bool = True, rank: int = -1):
+def build_dataloader(dataset, batch: int, workers: int, shuffle: bool = True, rank: int = -1, drop_last: bool = False):
     """
     Create and return an InfiniteDataLoader or DataLoader for training or validation.
 
@@ -164,6 +164,7 @@ def build_dataloader(dataset, batch: int, workers: int, shuffle: bool = True, ra
         workers (int): Number of worker threads for loading data.
         shuffle (bool, optional): Whether to shuffle the dataset.
         rank (int, optional): Process rank in distributed training. -1 for single-GPU training.
+        drop_last (bool, optional): Whether to drop the last incomplete batch.
 
     Returns:
         (InfiniteDataLoader): A dataloader that can be used for training or validation.
@@ -189,6 +190,7 @@ def build_dataloader(dataset, batch: int, workers: int, shuffle: bool = True, ra
         collate_fn=getattr(dataset, "collate_fn", None),
         worker_init_fn=seed_worker,
         generator=generator,
+        drop_last=drop_last,
     )
 
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/engine/exporter.py

@@ -62,7 +62,6 @@ import shutil
 import subprocess
 import time
 import warnings
-from contextlib import contextmanager
 from copy import deepcopy
 from datetime import datetime
 from pathlib import Path
@@ -107,6 +106,7 @@ from ultralytics.utils.downloads import attempt_download_asset, get_github_asset
 from ultralytics.utils.export import export_engine, export_onnx
 from ultralytics.utils.files import file_size, spaces_in_path
 from ultralytics.utils.ops import Profile, nms_rotated
+from ultralytics.utils.patches import arange_patch
 from ultralytics.utils.torch_utils import TORCH_1_13, get_cpu_info, get_latest_opset, select_device
 
 
@@ -199,27 +199,6 @@ def try_export(inner_func):
     return outer_func
 
 
-@contextmanager
-def arange_patch(args):
-    """
-    Workaround for ONNX torch.arange incompatibility with FP16.
-
-    https://github.com/pytorch/pytorch/issues/148041.
-    """
-    if args.dynamic and args.half and args.format == "onnx":
-        func = torch.arange
-
-        def arange(*args, dtype=None, **kwargs):
-            """Return a 1-D tensor of size with values from the interval and common difference."""
-            return func(*args, **kwargs).to(dtype)  # cast to dtype instead of passing dtype
-
-        torch.arange = arange  # patch
-        yield
-        torch.arange = func  # unpatch
-    else:
-        yield
-
-
 class Exporter:
     """
     A class for exporting YOLO models to various formats.
@@ -345,8 +324,6 @@ class Exporter:
             LOGGER.warning("half=True only compatible with GPU export, i.e. use device=0")
             self.args.half = False
         self.imgsz = check_imgsz(self.args.imgsz, stride=model.stride, min_dim=2)  # check image size
-        if self.args.int8 and engine:
-            self.args.dynamic = True  # enforce dynamic to export TensorRT INT8
         if self.args.optimize:
             assert not ncnn, "optimize=True not compatible with format='ncnn', i.e. use optimize=False"
             assert self.device.type == "cpu", "optimize=True not compatible with cuda devices, i.e. use device='cpu'"
@@ -555,8 +532,6 @@ class Exporter:
         """Build and return a dataloader for calibration of INT8 models."""
         LOGGER.info(f"{prefix} collecting INT8 calibration images from 'data={self.args.data}'")
         data = (check_cls_dataset if self.model.task == "classify" else check_det_dataset)(self.args.data)
-        # TensorRT INT8 calibration should use 2x batch size
-        batch = self.args.batch * (2 if self.args.format == "engine" else 1)
         dataset = YOLODataset(
             data[self.args.split or "val"],
             data=data,
@@ -564,7 +539,7 @@ class Exporter:
             task=self.model.task,
             imgsz=self.imgsz[0],
             augment=False,
-            batch_size=batch,
+            batch_size=self.args.batch,
         )
         n = len(dataset)
         if n < self.args.batch:
@@ -574,7 +549,7 @@ class Exporter:
             )
         elif n < 300:
             LOGGER.warning(f"{prefix} >300 images recommended for INT8 calibration, found {n} images.")
-        return build_dataloader(dataset, batch=batch, workers=0)  # required for batch loading
+        return build_dataloader(dataset, batch=self.args.batch, workers=0, drop_last=True)  # required for batch loading
 
     @try_export
     def export_torchscript(self, prefix=colorstr("TorchScript:")):

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/models/yolo/classify/train.py

@@ -228,10 +228,9 @@ class ClassificationTrainer(BaseTrainer):
             batch (Dict[str, torch.Tensor]): Batch containing images and class labels.
             ni (int): Number of iterations.
         """
+        batch["batch_idx"] = torch.arange(len(batch["img"]))  # add batch index for plotting
         plot_images(
-            images=batch["img"],
-            batch_idx=torch.arange(len(batch["img"])),
-            cls=batch["cls"].view(-1),  # warning: use .view(), not .squeeze() for Classify models
+            labels=batch,
             fname=self.save_dir / f"train_batch{ni}.jpg",
             on_plot=self.on_plot,
         )

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/models/yolo/detect/train.py

@@ -13,6 +13,7 @@ from ultralytics.engine.trainer import BaseTrainer
 from ultralytics.models import yolo
 from ultralytics.nn.tasks import DetectionModel
 from ultralytics.utils import LOGGER, RANK
+from ultralytics.utils.patches import override_configs
 from ultralytics.utils.plotting import plot_images, plot_labels, plot_results
 from ultralytics.utils.torch_utils import de_parallel, torch_distributed_zero_first
 
@@ -210,6 +211,8 @@ class DetectionTrainer(BaseTrainer):
         Returns:
             (int): Optimal batch size.
         """
-        train_dataset = self.build_dataset(self.data["train"], mode="train", batch=16)
+        with override_configs(self.args, overrides={"cache": False}) as self.args:
+            train_dataset = self.build_dataset(self.data["train"], mode="train", batch=16)
         max_num_obj = max(len(label["cls"]) for label in train_dataset.labels) * 4  # 4 for mosaic augmentation
+        del train_dataset  # free memory
         return super().auto_batch(max_num_obj)

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/nn/tasks.py

@@ -880,7 +880,6 @@ class WorldModel(DetectionModel):
         self.txt_feats = self.get_text_pe(text, batch=batch, cache_clip_model=cache_clip_model)
         self.model[-1].nc = len(text)
 
-    @smart_inference_mode()
     def get_text_pe(self, text, batch=80, cache_clip_model=True):
         """
         Set classes in advance so that model could do offline-inference without clip model.

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/ai_gym.py

@@ -1,6 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
 from collections import defaultdict
+from typing import Any
 
 from ultralytics.solutions.solutions import BaseSolution, SolutionAnnotator, SolutionResults
 
@@ -30,7 +31,7 @@ class AIGym(BaseSolution):
         >>> cv2.waitKey(0)
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """
         Initialize AIGym for workout monitoring using pose estimation and predefined angles.
 
@@ -47,7 +48,7 @@ class AIGym(BaseSolution):
         self.down_angle = float(self.CFG["down_angle"])  # Pose down predefined angle to consider down pose
         self.kpts = self.CFG["kpts"]  # User selected kpts of workouts storage for further usage
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Monitor workouts using Ultralytics YOLO Pose Model.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/analytics.py

@@ -1,7 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
 from itertools import cycle
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
 
 import cv2
 import numpy as np
@@ -45,7 +45,7 @@ class Analytics(BaseSolution):
         >>> cv2.imshow("Analytics", results.plot_im)
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize Analytics class with various chart types for visual data representation."""
         super().__init__(**kwargs)
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/config.py

@@ -1,7 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
 from dataclasses import dataclass, field
-from typing import List, Optional, Tuple
+from typing import Any, List, Optional, Tuple
 
 import cv2
 
@@ -94,7 +94,7 @@ class SolutionConfig:
     verbose: bool = True
     data: str = "images"
 
-    def update(self, **kwargs):
+    def update(self, **kwargs: Any):
         """Update configuration parameters with new values provided as keyword arguments."""
         for key, value in kwargs.items():
             if hasattr(self, key):

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/distance_calculation.py

@@ -33,7 +33,7 @@ class DistanceCalculation(BaseSolution):
         >>> cv2.waitKey(0)
     """
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize the DistanceCalculation class for measuring object distances in video streams."""
         super().__init__(**kwargs)
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/heatmap.py

@@ -1,5 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from typing import Any, List
+
 import cv2
 import numpy as np
 
@@ -31,7 +33,7 @@ class Heatmap(ObjectCounter):
         >>> processed_frame = heatmap.process(frame)
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """
         Initialize the Heatmap class for real-time video stream heatmap generation based on object tracks.
 
@@ -48,7 +50,7 @@ class Heatmap(ObjectCounter):
         self.colormap = self.CFG["colormap"]
         self.heatmap = None
 
-    def heatmap_effect(self, box):
+    def heatmap_effect(self, box: List[float]) -> None:
         """
         Efficiently calculate heatmap area and effect location for applying colormap.
 
@@ -70,7 +72,7 @@ class Heatmap(ObjectCounter):
         # Update only the values within the bounding box in a single vectorized operation
         self.heatmap[y0:y1, x0:x1][within_radius] += 2
 
-    def process(self, im0):
+    def process(self, im0: np.ndarray) -> SolutionResults:
         """
         Generate heatmap for each frame using Ultralytics tracking.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/instance_segmentation.py

@@ -1,5 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from typing import Any
+
 from ultralytics.engine.results import Results
 from ultralytics.solutions.solutions import BaseSolution, SolutionResults
 
@@ -33,7 +35,7 @@ class InstanceSegmentation(BaseSolution):
         >>> print(f"Total segmented instances: {results.total_tracks}")
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """
         Initialize the InstanceSegmentation class for detecting and annotating segmented instances.
 
@@ -48,7 +50,7 @@ class InstanceSegmentation(BaseSolution):
         self.show_labels = self.CFG.get("show_labels", True)
         self.show_boxes = self.CFG.get("show_boxes", True)
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Perform instance segmentation on the input image and annotate the results.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/object_blurrer.py

@@ -1,5 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from typing import Any
+
 import cv2
 
 from ultralytics.solutions.solutions import BaseSolution, SolutionAnnotator, SolutionResults
@@ -31,7 +33,7 @@ class ObjectBlurrer(BaseSolution):
         >>> print(f"Total blurred objects: {processed_results.total_tracks}")
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """
         Initialize the ObjectBlurrer class for applying a blur effect to objects detected in video streams or images.
 
@@ -46,7 +48,7 @@ class ObjectBlurrer(BaseSolution):
             blur_ratio = 0.5
         self.blur_ratio = int(blur_ratio * 100)
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Apply a blurring effect to detected objects in the input image.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/object_counter.py

@@ -1,7 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
 from collections import defaultdict
-from typing import Optional, Tuple
+from typing import Any, Optional, Tuple
 
 from ultralytics.solutions.solutions import BaseSolution, SolutionAnnotator, SolutionResults
 from ultralytics.utils.plotting import colors
@@ -36,7 +36,7 @@ class ObjectCounter(BaseSolution):
         >>> print(f"Inward count: {counter.in_count}, Outward count: {counter.out_count}")
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize the ObjectCounter class for real-time object counting in video streams."""
         super().__init__(**kwargs)
 
@@ -56,7 +56,7 @@ class ObjectCounter(BaseSolution):
         track_id: int,
         prev_position: Optional[Tuple[float, float]],
         cls: int,
-    ):
+    ) -> None:
         """
         Count objects within a polygonal or linear region based on their tracks.
 
@@ -117,7 +117,7 @@ class ObjectCounter(BaseSolution):
                     self.classwise_counts[self.names[cls]]["OUT"] += 1
                 self.counted_ids.append(track_id)
 
-    def display_counts(self, plot_im):
+    def display_counts(self, plot_im) -> None:
         """
         Display object counts on the input image or frame.
 
@@ -138,7 +138,7 @@ class ObjectCounter(BaseSolution):
         if labels_dict:
             self.annotator.display_analytics(plot_im, labels_dict, (104, 31, 17), (255, 255, 255), self.margin)
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Process input data (frames or object tracks) and update object counts.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/object_cropper.py

@@ -2,6 +2,7 @@
 
 import os
 from pathlib import Path
+from typing import Any
 
 from ultralytics.solutions.solutions import BaseSolution, SolutionResults
 from ultralytics.utils.plotting import save_one_box
@@ -30,7 +31,7 @@ class ObjectCropper(BaseSolution):
         >>> print(f"Total cropped objects: {cropper.crop_idx}")
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """
         Initialize the ObjectCropper class for cropping objects from detected bounding boxes.
 
@@ -51,7 +52,7 @@ class ObjectCropper(BaseSolution):
         self.iou = self.CFG["iou"]
         self.conf = self.CFG["conf"]
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Crop detected objects from the input image and save them as separate images.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/parking_management.py

@@ -47,7 +47,7 @@ class ParkingPtsSelection:
         >>> # Use the GUI to upload an image, select parking zones, and save the data
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         """Initialize the ParkingPtsSelection class, setting up UI and properties for parking zone point selection."""
         try:  # Check if tkinter is installed
             import tkinter as tk
@@ -99,14 +99,14 @@ class ParkingPtsSelection:
         self.initialize_properties()
         self.master.mainloop()
 
-    def initialize_properties(self):
+    def initialize_properties(self) -> None:
         """Initialize properties for image, canvas, bounding boxes, and dimensions."""
         self.image = self.canvas_image = None
         self.rg_data, self.current_box = [], []
         self.imgw = self.imgh = 0
         self.canvas_max_width, self.canvas_max_height = 1280, 720
 
-    def upload_image(self):
+    def upload_image(self) -> None:
         """Upload and display an image on the canvas, resizing it to fit within specified dimensions."""
         from PIL import Image, ImageTk  # Scoped import because ImageTk requires tkinter package
 
@@ -132,7 +132,7 @@ class ParkingPtsSelection:
 
         self.rg_data.clear(), self.current_box.clear()
 
-    def on_canvas_click(self, event):
+    def on_canvas_click(self, event) -> None:
         """Handle mouse clicks to add points for bounding boxes on the canvas."""
         self.current_box.append((event.x, event.y))
         self.canvas.create_oval(event.x - 3, event.y - 3, event.x + 3, event.y + 3, fill="red")
@@ -141,12 +141,12 @@ class ParkingPtsSelection:
             self.draw_box(self.current_box)
             self.current_box.clear()
 
-    def draw_box(self, box: List[Tuple[int, int]]):
+    def draw_box(self, box: List[Tuple[int, int]]) -> None:
         """Draw a bounding box on the canvas using the provided coordinates."""
         for i in range(4):
             self.canvas.create_line(box[i], box[(i + 1) % 4], fill="blue", width=2)
 
-    def remove_last_bounding_box(self):
+    def remove_last_bounding_box(self) -> None:
         """Remove the last bounding box from the list and redraw the canvas."""
         if not self.rg_data:
             self.messagebox.showwarning("Warning", "No bounding boxes to remove.")
@@ -154,14 +154,14 @@ class ParkingPtsSelection:
         self.rg_data.pop()
         self.redraw_canvas()
 
-    def redraw_canvas(self):
+    def redraw_canvas(self) -> None:
         """Redraw the canvas with the image and all bounding boxes."""
         self.canvas.delete("all")
         self.canvas.create_image(0, 0, anchor=self.tk.NW, image=self.canvas_image)
         for box in self.rg_data:
             self.draw_box(box)
 
-    def save_to_json(self):
+    def save_to_json(self) -> None:
         """Save the selected parking zone points to a JSON file with scaled coordinates."""
         scale_w, scale_h = self.imgw / self.canvas.winfo_width(), self.imgh / self.canvas.winfo_height()
         data = [{"points": [(int(x * scale_w), int(y * scale_h)) for x, y in box]} for box in self.rg_data]
@@ -200,7 +200,7 @@ class ParkingManagement(BaseSolution):
         >>> print(f"Available spaces: {parking_manager.pr_info['Available']}")
     """
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize the parking management system with a YOLO model and visualization settings."""
         super().__init__(**kwargs)
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/queue_management.py

@@ -1,5 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from typing import Any
+
 from ultralytics.solutions.solutions import BaseSolution, SolutionAnnotator, SolutionResults
 from ultralytics.utils.plotting import colors
 
@@ -35,7 +37,7 @@ class QueueManager(BaseSolution):
         >>>     results = queue_manager.process(im0)
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize the QueueManager with parameters for tracking and counting objects in a video stream."""
         super().__init__(**kwargs)
         self.initialize_region()
@@ -43,7 +45,7 @@ class QueueManager(BaseSolution):
         self.rect_color = (255, 255, 255)  # Rectangle color for visualization
         self.region_length = len(self.region)  # Store region length for further usage
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Process queue management for a single frame of video.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/region_counter.py

@@ -1,5 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from typing import Any, List, Tuple
+
 import numpy as np
 
 from ultralytics.solutions.solutions import BaseSolution, SolutionAnnotator, SolutionResults
@@ -33,7 +35,7 @@ class RegionCounter(BaseSolution):
         >>> print(f"Total tracks: {results.total_tracks}")
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize the RegionCounter for real-time object counting in user-defined regions."""
         super().__init__(**kwargs)
         self.region_template = {
@@ -47,15 +49,21 @@ class RegionCounter(BaseSolution):
         self.region_counts = {}
         self.counting_regions = []
 
-    def add_region(self, name, polygon_points, region_color, text_color):
+    def add_region(
+        self,
+        name: str,
+        polygon_points: List[Tuple],
+        region_color: Tuple[int, int, int],
+        text_color: Tuple[int, int, int],
+    ) -> None:
         """
         Add a new region to the counting list based on the provided template with specific attributes.
 
         Args:
             name (str): Name assigned to the new region.
             polygon_points (List[Tuple]): List of (x, y) coordinates defining the region's polygon.
-            region_color (tuple): BGR color for region visualization.
-            text_color (tuple): BGR color for the text within the region.
+            region_color (Tuple[int, int, int]): BGR color for region visualization.
+            text_color (Tuple[int, int, int]): BGR color for the text within the region.
         """
         region = self.region_template.copy()
         region.update(
@@ -68,7 +76,7 @@ class RegionCounter(BaseSolution):
         )
         self.counting_regions.append(region)
 
-    def process(self, im0):
+    def process(self, im0: np.ndarray) -> SolutionResults:
         """
         Process the input frame to detect and count objects within each defined region.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/security_alarm.py

@@ -1,5 +1,7 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from typing import Any
+
 from ultralytics.solutions.solutions import BaseSolution, SolutionAnnotator, SolutionResults
 from ultralytics.utils import LOGGER
 from ultralytics.utils.plotting import colors
@@ -32,7 +34,7 @@ class SecurityAlarm(BaseSolution):
         >>> results = security.process(frame)
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """
         Initialize the SecurityAlarm class with parameters for real-time object monitoring.
 
@@ -46,7 +48,7 @@ class SecurityAlarm(BaseSolution):
         self.to_email = ""
         self.from_email = ""
 
-    def authenticate(self, from_email: str, password: str, to_email: str):
+    def authenticate(self, from_email: str, password: str, to_email: str) -> None:
         """
         Authenticate the email server for sending alert notifications.
 
@@ -69,7 +71,7 @@ class SecurityAlarm(BaseSolution):
         self.to_email = to_email
         self.from_email = from_email
 
-    def send_email(self, im0, records: int = 5):
+    def send_email(self, im0, records: int = 5) -> None:
         """
         Send an email notification with an image attachment indicating the number of objects detected.
 
@@ -114,7 +116,7 @@ class SecurityAlarm(BaseSolution):
         except Exception as e:
             LOGGER.error(f"Failed to send email: {e}")
 
-    def process(self, im0):
+    def process(self, im0) -> SolutionResults:
         """
         Monitor the frame, process object detections, and trigger alerts if thresholds are exceeded.
 

{dgenerate_ultralytics_headless-8.3.154 → dgenerate_ultralytics_headless-8.3.156}/ultralytics/solutions/similarity_search.py

@@ -2,7 +2,7 @@
 
 import os
 from pathlib import Path
-from typing import List
+from typing import Any, List
 
 import numpy as np
 import torch
@@ -48,7 +48,7 @@ class VisualAISearch(BaseSolution):
         >>> results = searcher.search("a cat sitting on a chair", k=10)
     """
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         """Initialize the VisualAISearch class with FAISS index and CLIP model."""
         super().__init__(**kwargs)
         check_requirements(["git+https://github.com/ultralytics/CLIP.git", "faiss-cpu"])
@@ -90,7 +90,7 @@ class VisualAISearch(BaseSolution):
         with torch.no_grad():
             return self.model.encode_text(tokens).cpu().numpy()
 
-    def load_or_build_index(self):
+    def load_or_build_index(self) -> None:
         """
         Load existing FAISS index or build a new one from image features.
 
@@ -195,7 +195,7 @@ class SearchApp:
         >>> app.run(debug=True)
     """
 
-    def __init__(self, data: str = "images", device: str = None):
+    def __init__(self, data: str = "images", device: str = None) -> None:
         """
         Initialize the SearchApp with VisualAISearch backend.
 
@@ -217,7 +217,7 @@ class SearchApp:
         )
         self.app.add_url_rule("/", view_func=self.index, methods=["GET", "POST"])
 
-    def index(self):
+    def index(self) -> str:
         """Process user query and display search results in the web interface."""
         results = []
         if self.request.method == "POST":
@@ -225,6 +225,6 @@ class SearchApp:
             results = self.searcher(query)
         return self.render_template("similarity-search.html", results=results)
 
-    def run(self, debug: bool = False):
+    def run(self, debug: bool = False) -> None:
         """Start the Flask web application server."""
         self.app.run(debug=debug)