ultralytics 8.3.122__tar.gz → 8.3.124__tar.gz

{ultralytics-8.3.122/ultralytics.egg-info → ultralytics-8.3.124}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultralytics
-Version: 8.3.122
+Version: 8.3.124
 Summary: Ultralytics YOLO 🚀 for SOTA object detection, multi-object tracking, instance segmentation, pose estimation and image classification.
 Author-email: Glenn Jocher <glenn.jocher@ultralytics.com>, Jing Qiu <jing.qiu@ultralytics.com>
 Maintainer-email: Ultralytics <hello@ultralytics.com>

{ultralytics-8.3.122 → ultralytics-8.3.124}/tests/test_cuda.py

@@ -115,7 +115,7 @@ def test_utils_benchmarks():
 
     # Pre-export a dynamic engine model to use dynamic inference
     YOLO(MODEL).export(format="engine", imgsz=32, dynamic=True, batch=1)
-    ProfileModels([MODEL], imgsz=32, half=False, min_time=1, num_timed_runs=3, num_warmup_runs=1).profile()
+    ProfileModels([MODEL], imgsz=32, half=False, min_time=1, num_timed_runs=3, num_warmup_runs=1).run()
 
 
 @pytest.mark.skipif(not CUDA_IS_AVAILABLE, reason="CUDA is not available")

{ultralytics-8.3.122 → ultralytics-8.3.124}/tests/test_python.py

@@ -399,18 +399,18 @@ def test_utils_benchmarks():
     """Benchmark model performance using 'ProfileModels' from 'ultralytics.utils.benchmarks'."""
     from ultralytics.utils.benchmarks import ProfileModels
 
-    ProfileModels(["yolo11n.yaml"], imgsz=32, min_time=1, num_timed_runs=3, num_warmup_runs=1).profile()
+    ProfileModels(["yolo11n.yaml"], imgsz=32, min_time=1, num_timed_runs=3, num_warmup_runs=1).run()
 
 
 def test_utils_torchutils():
     """Test Torch utility functions including profiling and FLOP calculations."""
     from ultralytics.nn.modules.conv import Conv
-    from ultralytics.utils.torch_utils import get_flops_with_torch_profiler, profile, time_sync
+    from ultralytics.utils.torch_utils import get_flops_with_torch_profiler, profile_ops, time_sync
 
     x = torch.randn(1, 64, 20, 20)
     m = Conv(64, 64, k=1, s=2)
 
-    profile(x, [m], n=3)
+    profile_ops(x, [m], n=3)
     get_flops_with_torch_profiler(m)
     time_sync()
 

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/__init__.py

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

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/cfg/__init__.py

@@ -15,7 +15,6 @@ from ultralytics.utils import (
     DEFAULT_CFG,
     DEFAULT_CFG_DICT,
     DEFAULT_CFG_PATH,
-    DEFAULT_SOL_DICT,
     IS_VSCODE,
     LOGGER,
     RANK,
@@ -650,7 +649,6 @@ def handle_yolo_solutions(args: List[str]) -> None:
         >>> handle_yolo_solutions(["inference", "model=yolo11n.pt"])
 
     Notes:
-        - Default configurations are merged from DEFAULT_SOL_DICT and DEFAULT_CFG_DICT
         - Arguments can be provided in the format 'key=value' or as boolean flags
         - Available solutions are defined in SOLUTION_MAP with their respective classes and methods
         - If an invalid solution is provided, defaults to 'count' solution
@@ -662,13 +660,9 @@ def handle_yolo_solutions(args: List[str]) -> None:
         - The inference solution will be launched using the 'streamlit run' command.
         - The Streamlit app file is located in the Ultralytics package directory.
     """
-    full_args_dict = {
-        **DEFAULT_SOL_DICT,
-        **DEFAULT_CFG_DICT,
-        "blur_ratio": 0.5,
-        "vision_point": (20, 20),
-        "crop_dir": "cropped-detections",
-    }  # arguments dictionary
+    from ultralytics.solutions.config import SolutionConfig
+
+    full_args_dict = vars(SolutionConfig())  # arguments dictionary
     overrides = {}
 
     # check dictionary alignment

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/data/base.py

@@ -11,7 +11,6 @@ from typing import Optional
 
 import cv2
 import numpy as np
-import psutil
 from torch.utils.data import Dataset
 
 from ultralytics.data.utils import FORMATS_HELP_MSG, HELP_URL, IMG_FORMATS, check_file_speeds
@@ -336,7 +335,7 @@ class BaseDataset(Dataset):
             ratio = self.imgsz / max(im.shape[0], im.shape[1])  # max(h, w)  # ratio
             b += im.nbytes * ratio**2
         mem_required = b * self.ni / n * (1 + safety_margin)  # GB required to cache dataset into RAM
-        mem = psutil.virtual_memory()
+        mem = __import__("psutil").virtual_memory()
         if mem_required > mem.available:
             self.cache = None
             LOGGER.warning(

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/data/loaders.py

@@ -4,14 +4,13 @@ import glob
 import math
 import os
 import time
+import urllib
 from dataclasses import dataclass
 from pathlib import Path
 from threading import Thread
-from urllib.parse import urlparse
 
 import cv2
 import numpy as np
-import requests
 import torch
 from PIL import Image
 
@@ -111,7 +110,7 @@ class LoadStreams:
         for i, s in enumerate(sources):  # index, source
             # Start thread to read frames from video stream
             st = f"{i + 1}/{n}: {s}... "
-            if urlparse(s).hostname in {"www.youtube.com", "youtube.com", "youtu.be"}:  # if source is YouTube video
+            if urllib.parse.urlparse(s).hostname in {"www.youtube.com", "youtube.com", "youtu.be"}:  # YouTube video
                 # YouTube format i.e. 'https://www.youtube.com/watch?v=Jsn8D3aC840' or 'https://youtu.be/Jsn8D3aC840'
                 s = get_best_youtube_url(s)
             s = eval(s) if s.isnumeric() else s  # i.e. s = '0' local webcam
@@ -589,7 +588,7 @@ def autocast_list(source):
     files = []
     for im in source:
         if isinstance(im, (str, Path)):  # filename or uri
-            files.append(Image.open(requests.get(im, stream=True).raw if str(im).startswith("http") else im))
+            files.append(Image.open(urllib.request.urlopen(im) if str(im).startswith("http") else im))
         elif isinstance(im, (Image.Image, np.ndarray)):  # PIL or np Image
             files.append(im)
         else:

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/data/utils.py

@@ -1,6 +1,5 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
-import hashlib
 import json
 import os
 import random
@@ -131,7 +130,7 @@ def get_hash(paths):
             size += os.stat(p).st_size
         except OSError:
             continue
-    h = hashlib.sha256(str(size).encode())  # hash sizes
+    h = __import__("hashlib").sha256(str(size).encode())  # hash sizes
     h.update("".join(paths).encode())  # hash paths
     return h.hexdigest()  # return hash
 

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/engine/exporter.py

@@ -140,7 +140,7 @@ def export_formats():
         ["MNN", "mnn", ".mnn", True, True, ["batch", "half", "int8"]],
         ["NCNN", "ncnn", "_ncnn_model", True, True, ["batch", "half"]],
         ["IMX", "imx", "_imx_model", True, True, ["int8", "fraction"]],
-        ["RKNN", "rknn", "_rknn_model", False, False, ["batch", "name"]],
+        ["RKNN", "rknn", "_rknn_model", False, False, ["batch", "name", "int8"]],
     ]
     return dict(zip(["Format", "Argument", "Suffix", "CPU", "GPU", "Arguments"], zip(*x)))
 
@@ -970,8 +970,9 @@ class Exporter:
             output_integer_quantized_tflite=self.args.int8,
             quant_type="per-tensor",  # "per-tensor" (faster) or "per-channel" (slower but more accurate)
             custom_input_op_name_np_data_path=np_data,
-            disable_group_convolution=True,  # for end-to-end model compatibility
-            enable_batchmatmul_unfold=True,  # for end-to-end model compatibility
+            enable_batchmatmul_unfold=True,  # fix lower no. of detected objects on GPU delegate
+            output_signaturedefs=True,  # fix error with Attention block group convolution
+            optimization_for_gpu_delegate=True,
         )
         yaml_save(f / "metadata.yaml", self.metadata)  # add metadata.yaml
 
@@ -1110,8 +1111,8 @@ class Exporter:
         rknn = RKNN(verbose=False)
         rknn.config(mean_values=[[0, 0, 0]], std_values=[[255, 255, 255]], target_platform=self.args.name)
         rknn.load_onnx(model=f)
-        rknn.build(do_quantization=False)  # TODO: Add quantization support
-        f = f.replace(".onnx", f"-{self.args.name}.rknn")
+        rknn.build(do_quantization=self.args.int8)
+        f = f.replace(".onnx", f"-{self.args.name}-int8.rknn" if self.args.int8 else f"-{self.args.name}-fp16.rknn")
         rknn.export_rknn(f"{export_path / f}")
         yaml_save(export_path / "metadata.yaml", self.metadata)
         return export_path, None

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/engine/model.py

@@ -10,7 +10,6 @@ from PIL import Image
 
 from ultralytics.cfg import TASK2DATA, get_cfg, get_save_dir
 from ultralytics.engine.results import Results
-from ultralytics.hub import HUB_WEB_ROOT, HUBTrainingSession
 from ultralytics.nn.tasks import attempt_load_one_weight, guess_model_task, yaml_model_load
 from ultralytics.utils import (
     ARGV,
@@ -126,6 +125,8 @@ class Model(torch.nn.Module):
 
         # Check if Ultralytics HUB model from https://hub.ultralytics.com
         if self.is_hub_model(model):
+            from ultralytics.hub import HUBTrainingSession
+
             # Fetch model from HUB
             checks.check_requirements("hub-sdk>=0.0.12")
             session = HUBTrainingSession.create_session(model)
@@ -225,6 +226,8 @@ class Model(torch.nn.Module):
             >>> Model.is_hub_model("yolo11n.pt")
             False
         """
+        from ultralytics.hub import HUB_WEB_ROOT
+
         return model.startswith(f"{HUB_WEB_ROOT}/models/")
 
     def _new(self, cfg: str, task=None, model=None, verbose=False) -> None:

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/engine/results.py

@@ -662,17 +662,14 @@ class Results(SimpleClass):
             - For classification tasks, it returns the top 5 class probabilities and their corresponding class names.
             - The returned string is comma-separated and ends with a comma and a space.
         """
-        log_string = ""
         probs = self.probs
         if len(self) == 0:
-            return log_string if probs is not None else f"{log_string}(no detections), "
+            return "" if probs is not None else "(no detections), "
         if probs is not None:
-            log_string += f"{', '.join(f'{self.names[j]} {probs.data[j]:.2f}' for j in probs.top5)}, "
+            return f"{', '.join(f'{self.names[j]} {probs.data[j]:.2f}' for j in probs.top5)}, "
         if boxes := self.boxes:
-            for c in boxes.cls.unique():
-                n = (boxes.cls == c).sum()  # detections per class
-                log_string += f"{n} {self.names[int(c)]}{'s' * (n > 1)}, "
-        return log_string
+            counts = boxes.cls.int().bincount()
+            return "".join(f"{n} {self.names[i]}{'s' * (n > 1)}, " for i, n in enumerate(counts) if n > 0)
 
     def save_txt(self, txt_file, save_conf=False):
         """

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/models/sam/model.py

@@ -19,7 +19,6 @@ from pathlib import Path
 from ultralytics.engine.model import Model
 from ultralytics.utils.torch_utils import model_info
 
-from .build import build_sam
 from .predict import Predictor, SAM2Predictor
 
 
@@ -78,6 +77,8 @@ class SAM(Model):
             >>> sam = SAM("sam_b.pt")
             >>> sam._load("path/to/custom_weights.pt")
         """
+        from .build import build_sam  # slow import
+
         self.model = build_sam(weights)
 
     def predict(self, source, stream=False, bboxes=None, points=None, labels=None, **kwargs):

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/models/sam/modules/tiny_encoder.py

@@ -15,7 +15,6 @@ from typing import Tuple
 import torch
 import torch.nn as nn
 import torch.nn.functional as F
-import torch.utils.checkpoint as checkpoint
 
 from ultralytics.nn.modules import LayerNorm2d
 from ultralytics.utils.instance import to_2tuple
@@ -308,7 +307,7 @@ class ConvLayer(nn.Module):
     def forward(self, x):
         """Processes input through convolutional layers, applying MBConv blocks and optional downsampling."""
         for blk in self.blocks:
-            x = checkpoint.checkpoint(blk, x) if self.use_checkpoint else blk(x)
+            x = torch.utils.checkpoint(blk, x) if self.use_checkpoint else blk(x)  # warn: checkpoint is slow import
         return x if self.downsample is None else self.downsample(x)
 
 
@@ -751,7 +750,7 @@ class BasicLayer(nn.Module):
     def forward(self, x):
         """Processes input through TinyViT blocks and optional downsampling."""
         for blk in self.blocks:
-            x = checkpoint.checkpoint(blk, x) if self.use_checkpoint else blk(x)
+            x = torch.utils.checkpoint(blk, x) if self.use_checkpoint else blk(x)  # warn: checkpoint is slow import
         return x if self.downsample is None else self.downsample(x)
 
     def extra_repr(self) -> str:

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/models/sam/predict.py

@@ -31,7 +31,6 @@ from .amg import (
     uncrop_boxes_xyxy,
     uncrop_masks,
 )
-from .build import build_sam
 
 
 class Predictor(BasePredictor):
@@ -439,6 +438,8 @@ class Predictor(BasePredictor):
 
     def get_model(self):
         """Retrieves or builds the Segment Anything Model (SAM) for image segmentation tasks."""
+        from .build import build_sam  # slow import
+
         return build_sam(self.args.model)
 
     def postprocess(self, preds, img, orig_imgs):
@@ -658,6 +659,8 @@ class SAM2Predictor(Predictor):
 
     def get_model(self):
         """Retrieves and initializes the Segment Anything Model 2 (SAM2) for image segmentation tasks."""
+        from .build import build_sam  # slow import
+
         return build_sam(self.args.model)
 
     def prompt_inference(

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/models/yolo/detect/predict.py

@@ -90,7 +90,7 @@ class DetectionPredictor(BasePredictor):
         obj_feats = torch.cat(
             [x.permute(0, 2, 3, 1).reshape(x.shape[0], -1, s, x.shape[1] // s).mean(dim=-1) for x in feat_maps], dim=1
         )  # mean reduce all vectors to same length
-        return [feats[idx] for feats, idx in zip(obj_feats, idxs)]  # for each image in batch, indexed separately
+        return [feats[idx] if len(idx) else [] for feats, idx in zip(obj_feats, idxs)]  # for each img in batch
 
     def construct_results(self, preds, img, orig_imgs):
         """

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/nn/autobackend.py

@@ -725,7 +725,7 @@ class AutoBackend(nn.Module):
         else:
             im = im.cpu().numpy()
             if self.saved_model:  # SavedModel
-                y = self.model(im, training=False) if self.keras else self.model(im)
+                y = self.model(im, training=False) if self.keras else self.model.serving_default(im)
                 if not isinstance(y, list):
                     y = [y]
             elif self.pb:  # GraphDef

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/nn/tasks.py

@@ -92,11 +92,6 @@ from ultralytics.utils.torch_utils import (
     time_sync,
 )
 
-try:
-    import thop
-except ImportError:
-    thop = None  # conda support without 'ultralytics-thop' installed
-
 
 class BaseModel(torch.nn.Module):
     """The BaseModel class serves as a base class for all the models in the Ultralytics YOLO family."""
@@ -183,6 +178,11 @@ class BaseModel(torch.nn.Module):
             x (torch.Tensor): The input data to the layer.
             dt (list): A list to store the computation time of the layer.
         """
+        try:
+            import thop
+        except ImportError:
+            thop = None  # conda support without 'ultralytics-thop' installed
+
         c = m == self.model[-1] and isinstance(x, list)  # is final layer list, copy input as inplace fix
         flops = thop.profile(m, inputs=[x.copy() if c else x], verbose=False)[0] / 1e9 * 2 if thop else 0  # GFLOPs
         t = time_sync()

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/analytics.py

@@ -51,7 +51,7 @@ class Analytics(BaseSolution):
         """Initialize Analytics class with various chart types for visual data representation."""
         super().__init__(**kwargs)
 
-        self.type = self.CFG["analytics_type"]  # extract type of analytics
+        self.type = self.CFG["analytics_type"]  # type of analytics i.e "line", "pie", "bar" or "area" charts.
         self.x_label = "Classes" if self.type in {"bar", "pie"} else "Frame#"
         self.y_label = "Total Counts"
 
@@ -61,7 +61,7 @@ class Analytics(BaseSolution):
         self.title = "Ultralytics Solutions"  # window name
         self.max_points = 45  # maximum points to be drawn on window
         self.fontsize = 25  # text font size for display
-        figsize = (12.8, 7.2)  # Set output image size 1280 * 720
+        figsize = self.CFG["figsize"]  # set output image size i.e (12.8, 7.2) -> w = 1280, h = 720
         self.color_cycle = cycle(["#DD00BA", "#042AFF", "#FF4447", "#7D24FF", "#BD00FF"])
 
         self.total_counts = 0  # count variable for storing total counts i.e. for line

ultralytics-8.3.124/ultralytics/solutions/config.py

@@ -0,0 +1,104 @@
+# Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
+
+from dataclasses import dataclass, field
+from typing import List, Optional, Tuple
+
+import cv2
+
+
+@dataclass
+class SolutionConfig:
+    """
+    Manages configuration parameters for Ultralytics Vision AI solutions.
+
+    The SolutionConfig class serves as a centralized configuration container for all the
+    Ultralytics solution modules: https://docs.ultralytics.com/solutions/#solutions.
+    It leverages Python `dataclass` for clear, type-safe, and maintainable parameter definitions.
+
+    Attributes:
+        source (Optional[str]): Path to the input source (video, RTSP, etc.). Only usable with Solutions CLI.
+        model (Optional[str]): Path to the Ultralytics YOLO model to be used for inference.
+        classes (Optional[List[int]]): List of class indices to filter detections.
+        show_conf (bool): Whether to show confidence scores on the visual output.
+        show_labels (bool): Whether to display class labels on visual output.
+        region (Optional[List[Tuple[int, int]]]): Polygonal region or line for object counting.
+        colormap (Optional[int]): OpenCV colormap constant for visual overlays (e.g., cv2.COLORMAP_JET).
+        show_in (bool): Whether to display count number for objects entering the region.
+        show_out (bool): Whether to display count number for objects leaving the region.
+        up_angle (float): Upper angle threshold used in pose-based workouts monitoring.
+        down_angle (int): Lower angle threshold used in pose-based workouts monitoring.
+        kpts (List[int]): Keypoint indices to monitor, e.g., for pose analytics.
+        analytics_type (str): Type of analytics to perform ("line", "area", "bar", "pie", etc.).
+        figsize (Optional[Tuple[int, int]]): Size of the matplotlib figure used for analytical plots (width, height).
+        blur_ratio (float): Ratio used to blur objects in the video frames (0.0 to 1.0).
+        vision_point (Tuple[int, int]): Reference point for directional tracking or perspective drawing.
+        crop_dir (str): Directory path to save cropped detection images.
+        json_file (str): Path to a JSON file containing data for parking areas.
+        line_width (int): Width for visual display i.e. bounding boxes, keypoints, counts.
+        records (int): Number of detection records to send email alerts.
+        fps (float): Frame rate (Frames Per Second) for speed estimation calculation.
+        max_hist (int): Maximum number of historical points or states stored per tracked object for speed estimation.
+        meter_per_pixel (float): Scale for real-world measurement, used in speed or distance calculations.
+        max_speed (int): Maximum speed limit (e.g., km/h or mph) used in visual alerts or constraints.
+        show (bool): Whether to display the visual output on screen.
+        iou (float): Intersection-over-Union threshold for detection filtering.
+        conf (float): Confidence threshold for keeping predictions.
+        device (Optional[str]): Device to run inference on (e.g., 'cpu', '0' for CUDA GPU).
+        max_det (int): Maximum number of detections allowed per video frame.
+        half (bool): Whether to use FP16 precision (requires a supported CUDA device).
+        tracker (str): Path to tracking configuration YAML file (e.g., 'botsort.yaml').
+        verbose (bool): Enable verbose logging output for debugging or diagnostics.
+
+    Methods:
+        update: Update the configuration with user-defined keyword arguments and raise error on invalid keys.
+
+    Examples:
+        >>> from ultralytics.solutions.config import SolutionConfig
+        >>> cfg = SolutionConfig(model="yolo11n.pt", region=[(0, 0), (100, 0), (100, 100), (0, 100)])
+        >>> cfg.update(show=False, conf=0.3)
+        >>> print(cfg.model)
+    """
+
+    source: Optional[str] = None
+    model: Optional[str] = None
+    classes: Optional[List[int]] = None
+    show_conf: bool = True
+    show_labels: bool = True
+    region: Optional[List[Tuple[int, int]]] = None
+    colormap: Optional[int] = cv2.COLORMAP_DEEPGREEN
+    show_in: bool = True
+    show_out: bool = True
+    up_angle: float = 145.0
+    down_angle: int = 90
+    kpts: List[int] = field(default_factory=lambda: [6, 8, 10])
+    analytics_type: str = "line"
+    figsize: Optional[Tuple[int, int]] = (12.8, 7.2)
+    blur_ratio: float = 0.5
+    vision_point: Tuple[int, int] = (20, 20)
+    crop_dir: str = "cropped-detections"
+    json_file: str = None
+    line_width: int = 2
+    records: int = 5
+    fps: float = 30.0
+    max_hist: int = 5
+    meter_per_pixel: float = 0.05
+    max_speed: int = 120
+    show: bool = False
+    iou: float = 0.7
+    conf: float = 0.25
+    device: Optional[str] = None
+    max_det: int = 300
+    half: bool = False
+    tracker: str = "botsort.yaml"
+    verbose: bool = True
+
+    def update(self, **kwargs):
+        """Update configuration parameters with new values provided as keyword arguments."""
+        for key, value in kwargs.items():
+            if hasattr(self, key):
+                setattr(self, key, value)
+            else:
+                raise ValueError(
+                    f"❌ {key} is not a valid solution argument, available arguments here: https://docs.ultralytics.com/solutions/#solutions-arguments"
+                )
+        return self

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/heatmap.py

@@ -45,7 +45,7 @@ class Heatmap(ObjectCounter):
             self.initialize_region()
 
         # Store colormap
-        self.colormap = cv2.COLORMAP_PARULA if self.CFG["colormap"] is None else self.CFG["colormap"]
+        self.colormap = self.CFG["colormap"]
         self.heatmap = None
 
     def heatmap_effect(self, box):

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/object_blurrer.py

@@ -41,7 +41,7 @@ class ObjectBlurrer(BaseSolution):
                 blur_ratio (float): Intensity of the blur effect (0.1-1.0, default=0.5).
         """
         super().__init__(**kwargs)
-        blur_ratio = kwargs.get("blur_ratio", 0.5)
+        blur_ratio = self.CFG["blur_ratio"]
         if blur_ratio < 0.1:
             LOGGER.warning("blur ratio cannot be less than 0.1, updating it to default value 0.5")
             blur_ratio = 0.5

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/object_cropper.py

@@ -40,7 +40,7 @@ class ObjectCropper(BaseSolution):
         """
         super().__init__(**kwargs)
 
-        self.crop_dir = kwargs.get("crop_dir", "cropped-detections")  # Directory for storing cropped detections
+        self.crop_dir = self.CFG["crop_dir"]  # Directory for storing cropped detections
         if not os.path.exists(self.crop_dir):
             os.mkdir(self.crop_dir)  # Create directory if it does not exist
         if self.CFG["show"]:
@@ -49,7 +49,7 @@ class ObjectCropper(BaseSolution):
             )
         self.crop_idx = 0  # Initialize counter for total cropped objects
         self.iou = self.CFG["iou"]
-        self.conf = self.CFG["conf"] if self.CFG["conf"] is not None else 0.25
+        self.conf = self.CFG["conf"]
 
     def process(self, im0):
         """

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/parking_management.py

@@ -201,9 +201,9 @@ class ParkingManagement(BaseSolution):
         """Initialize the parking management system with a YOLO model and visualization settings."""
         super().__init__(**kwargs)
 
-        self.json_file = self.CFG["json_file"]  # Load JSON data
+        self.json_file = self.CFG["json_file"]  # Load parking regions JSON data
         if self.json_file is None:
-            LOGGER.warning("❌ json_file argument missing. Parking region details required.")
+            LOGGER.warning("json_file argument missing. Parking region details required.")
             raise ValueError("❌ Json file path can not be empty")
 
         with open(self.json_file) as f:

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/security_alarm.py

@@ -143,7 +143,7 @@ class SecurityAlarm(BaseSolution):
             annotator.box_label(box, label=self.names[cls], color=colors(cls, True))
 
         total_det = len(self.clss)
-        if total_det > self.records and not self.email_sent:  # Only send email if not sent before
+        if total_det >= self.records and not self.email_sent:  # Only send email if not sent before
             self.send_email(im0, total_det)
             self.email_sent = True
 

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/solutions.py

@@ -7,7 +7,8 @@ import cv2
 import numpy as np
 
 from ultralytics import YOLO
-from ultralytics.utils import ASSETS_URL, DEFAULT_CFG_DICT, DEFAULT_SOL_DICT, LOGGER
+from ultralytics.solutions.config import SolutionConfig
+from ultralytics.utils import ASSETS_URL, LOGGER
 from ultralytics.utils.checks import check_imshow, check_requirements
 from ultralytics.utils.plotting import Annotator
 
@@ -72,15 +73,11 @@ class BaseSolution:
         self.r_s = None
 
         self.LOGGER = LOGGER  # Store logger object to be used in multiple solution classes
-
-        # Load config and update with args
-        DEFAULT_SOL_DICT.update(kwargs)
-        DEFAULT_CFG_DICT.update(kwargs)
-        self.CFG = {**DEFAULT_SOL_DICT, **DEFAULT_CFG_DICT}
-        self.LOGGER.info(f"Ultralytics Solutions: ✅ {DEFAULT_SOL_DICT}")
+        self.CFG = vars(SolutionConfig().update(**kwargs))
+        self.LOGGER.info(f"Ultralytics Solutions: ✅ {self.CFG}")
 
         self.region = self.CFG["region"]  # Store region data for other classes usage
-        self.line_width = self.CFG["line_width"] if self.CFG["line_width"] not in (None, 0) else 2  # Store line_width
+        self.line_width = self.CFG["line_width"]
 
         # Load Model and store additional information (classes, show_conf, show_label)
         if self.CFG["model"] is None:
@@ -178,7 +175,7 @@ class BaseSolution:
     def initialize_region(self):
         """Initialize the counting region and line segment based on configuration settings."""
         if self.region is None:
-            self.region = [(20, 400), (1080, 400), (1080, 360), (20, 360)]
+            self.region = [(10, 200), (540, 200), (540, 180), (10, 180)]
         self.r_s = (
             self.Polygon(self.region) if len(self.region) >= 3 else self.LineString(self.region)
         )  # region or line

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/speed_estimation.py

@@ -44,15 +44,15 @@ class SpeedEstimator(BaseSolution):
         """
         super().__init__(**kwargs)
 
-        self.fps = kwargs.get("fps", 30)  # assumed video FPS
+        self.fps = self.CFG["fps"]  # assumed video FPS
         self.frame_count = 0  # global frame count
         self.trk_frame_ids = {}  # Track ID → first frame index
         self.spd = {}  # Final speed per object (km/h), once locked
         self.trk_hist = {}  # Track ID → deque of (time, position)
         self.locked_ids = set()  # Track IDs whose speed has been finalized
-        self.max_hist = kwargs.get("max_hist", 5)  # Required frame history before computing speed
-        self.meter_per_pixel = kwargs.get("meter_per_pixel", 0.05)  # Scene scale, depends on camera details
-        self.max_speed = kwargs.get("max_speed", 120)  # max_speed adjustment
+        self.max_hist = self.CFG["max_hist"]  # Required frame history before computing speed
+        self.meter_per_pixel = self.CFG["meter_per_pixel"]  # Scene scale, depends on camera details
+        self.max_speed = self.CFG["max_speed"]  # max_speed adjustment
 
     def process(self, im0):
         """

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/trackzone.py

@@ -42,7 +42,7 @@ class TrackZone(BaseSolution):
             **kwargs (Any): Additional keyword arguments passed to the parent class.
         """
         super().__init__(**kwargs)
-        default_region = [(150, 150), (1130, 150), (1130, 570), (150, 570)]
+        default_region = [(75, 75), (565, 75), (565, 285), (75, 285)]
         self.region = cv2.convexHull(np.array(self.region or default_region, dtype=np.int32))
 
     def process(self, im0):

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/solutions/vision_eye.py

@@ -34,7 +34,7 @@ class VisionEye(BaseSolution):
         """
         super().__init__(**kwargs)
         # Set the vision point where the system will view objects and draw tracks
-        self.vision_point = kwargs.get("vision_point", (30, 30))
+        self.vision_point = self.CFG["vision_point"]
 
     def process(self, im0):
         """

{ultralytics-8.3.122 → ultralytics-8.3.124}/ultralytics/trackers/track.py

@@ -58,10 +58,10 @@ def on_predict_start(predictor: object, persist: bool = False) -> None:
             predictor._feats = None
 
             # Register hook to extract input of Detect layer
-            def capture_io(module, input, output):
-                predictor._feats = input[0]
+            def pre_hook(module, input):
+                predictor._feats = [t.clone() for t in input[0]]
 
-            predictor.model.model.model[-1].register_forward_hook(capture_io)
+            predictor.model.model.model[-1].register_forward_pre_hook(pre_hook)
 
     trackers = []
     for _ in range(predictor.dataset.bs):