dgenerate-ultralytics-headless 8.3.190__tar.gz → 8.3.191__tar.gz

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.190
+Version: 8.3.191
 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.190 → dgenerate_ultralytics_headless-8.3.191}/dgenerate_ultralytics_headless.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dgenerate-ultralytics-headless
-Version: 8.3.190
+Version: 8.3.191
 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.190 → dgenerate_ultralytics_headless-8.3.191}/dgenerate_ultralytics_headless.egg-info/SOURCES.txt

@@ -261,6 +261,7 @@ ultralytics/utils/downloads.py
 ultralytics/utils/errors.py
 ultralytics/utils/export.py
 ultralytics/utils/files.py
+ultralytics/utils/git.py
 ultralytics/utils/instance.py
 ultralytics/utils/logger.py
 ultralytics/utils/loss.py

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/tests/test_cuda.py

@@ -23,10 +23,11 @@ if CUDA_IS_AVAILABLE:
         gpu_info = GPUInfo()
         gpu_info.print_status()
         autodevice_fraction = __import__("os").environ.get("YOLO_AUTODEVICE_FRACTION_FREE", 0.3)
-        idle_gpus = gpu_info.select_idle_gpu(
-            count=2, min_memory_fraction=autodevice_fraction, min_util_fraction=autodevice_fraction
-        )
-        if idle_gpus:
+        if idle_gpus := gpu_info.select_idle_gpu(
+            count=2,
+            min_memory_fraction=autodevice_fraction,
+            min_util_fraction=autodevice_fraction,
+        ):
             DEVICES = idle_gpus
 
 
@@ -112,9 +113,9 @@ def test_train():
     import os
 
     device = tuple(DEVICES) if len(DEVICES) > 1 else DEVICES[0]
-    results = YOLO(MODEL).train(data="coco8.yaml", imgsz=64, epochs=1, device=device)  # requires imgsz>=64
     # NVIDIA Jetson only has one GPU and therefore skipping checks
     if not IS_JETSON:
+        results = YOLO(MODEL).train(data="coco8.yaml", imgsz=64, epochs=1, device=device)  # requires imgsz>=64
         visible = eval(os.environ["CUDA_VISIBLE_DEVICES"])
         assert visible == device, f"Passed GPUs '{device}', but used GPUs '{visible}'"
         assert (

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/tests/test_exports.py

@@ -241,12 +241,7 @@ def test_export_ncnn():
 
 
 @pytest.mark.slow
-@pytest.mark.parametrize(
-    "task, half, batch",
-    [  # generate all combinations except for exclusion cases
-        (task, half, batch) for task, half, batch in product(TASKS, [True, False], [1])
-    ],
-)
+@pytest.mark.parametrize("task, half, batch", list(product(TASKS, [True, False], [1])))
 def test_export_ncnn_matrix(task, half, batch):
     """Test YOLO export to NCNN format considering various export configurations."""
     file = YOLO(TASK2MODEL[task]).export(format="ncnn", imgsz=32, half=half, batch=batch)

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/tests/test_python.py

@@ -397,18 +397,15 @@ def test_cfg_init():
 
 def test_utils_init():
     """Test initialization utilities in the Ultralytics library."""
-    from ultralytics.utils import get_git_branch, get_git_origin_url, get_ubuntu_version, is_github_action_running
+    from ultralytics.utils import get_ubuntu_version, is_github_action_running
 
     get_ubuntu_version()
     is_github_action_running()
-    get_git_origin_url()
-    get_git_branch()
 
 
 def test_utils_checks():
     """Test various utility checks for filenames, git status, requirements, image sizes, and versions."""
     checks.check_yolov5u_filename("yolov5n.pt")
-    checks.git_describe(ROOT)
     checks.check_requirements()  # check requirements.txt
     checks.check_imgsz([600, 600], max_dim=1)
     checks.check_imshow(warn=True)

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/tests/test_solutions.py

@@ -227,7 +227,7 @@ def test_right_click_reset():
     dc = solutions.DistanceCalculation()
     dc.selected_boxes, dc.left_mouse_count = {1: [10, 10, 50, 50]}, 1
     dc.mouse_event_for_distance(cv2.EVENT_RBUTTONDOWN, 0, 0, None, None)
-    assert dc.selected_boxes == {}
+    assert not dc.selected_boxes
     assert dc.left_mouse_count == 0
 
 

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/ultralytics/__init__.py

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

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/ultralytics/cfg/__init__.py

@@ -1,11 +1,13 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from __future__ import annotations
+
 import shutil
 import subprocess
 import sys
 from pathlib import Path
 from types import SimpleNamespace
-from typing import Any, Dict, List, Union
+from typing import Any
 
 from ultralytics import __version__
 from ultralytics.utils import (
@@ -78,9 +80,9 @@ SOLUTIONS_HELP_MSG = f"""
         yolo solutions SOLUTION ARGS
 
         Where SOLUTION (optional) is one of {list(SOLUTION_MAP.keys())[:-1]}
-              ARGS (optional) are any number of custom 'arg=value' pairs like 'show_in=True' that override defaults 
+              ARGS (optional) are any number of custom 'arg=value' pairs like 'show_in=True' that override defaults
                   at https://docs.ultralytics.com/usage/cfg
-                
+
     1. Call object counting solution
         yolo solutions count source="path/to/video.mp4" region="[(20, 400), (1080, 400), (1080, 360), (20, 360)]"
 
@@ -95,10 +97,10 @@ SOLUTIONS_HELP_MSG = f"""
 
     5. Generate analytical graphs
         yolo solutions analytics analytics_type="pie"
-    
+
     6. Track objects within specific zones
         yolo solutions trackzone source="path/to/video.mp4" region="[(150, 150), (1130, 150), (1130, 570), (150, 570)]"
-        
+
     7. Streamlit real-time webcam inference GUI
         yolo streamlit-predict
     """
@@ -237,7 +239,7 @@ CFG_BOOL_KEYS = frozenset(
 )
 
 
-def cfg2dict(cfg: Union[str, Path, Dict, SimpleNamespace]) -> Dict:
+def cfg2dict(cfg: str | Path | dict | SimpleNamespace) -> dict:
     """
     Convert a configuration object to a dictionary.
 
@@ -272,7 +274,7 @@ def cfg2dict(cfg: Union[str, Path, Dict, SimpleNamespace]) -> Dict:
     return cfg
 
 
-def get_cfg(cfg: Union[str, Path, Dict, SimpleNamespace] = DEFAULT_CFG_DICT, overrides: Dict = None) -> SimpleNamespace:
+def get_cfg(cfg: str | Path | dict | SimpleNamespace = DEFAULT_CFG_DICT, overrides: dict = None) -> SimpleNamespace:
     """
     Load and merge configuration data from a file or dictionary, with optional overrides.
 
@@ -320,7 +322,7 @@ def get_cfg(cfg: Union[str, Path, Dict, SimpleNamespace] = DEFAULT_CFG_DICT, ove
     return IterableSimpleNamespace(**cfg)
 
 
-def check_cfg(cfg: Dict, hard: bool = True) -> None:
+def check_cfg(cfg: dict, hard: bool = True) -> None:
     """
     Check configuration argument types and values for the Ultralytics library.
 
@@ -414,7 +416,7 @@ def get_save_dir(args: SimpleNamespace, name: str = None) -> Path:
     return Path(save_dir)
 
 
-def _handle_deprecation(custom: Dict) -> Dict:
+def _handle_deprecation(custom: dict) -> dict:
     """
     Handle deprecated configuration keys by mapping them to current equivalents with deprecation warnings.
 
@@ -458,7 +460,7 @@ def _handle_deprecation(custom: Dict) -> Dict:
     return custom
 
 
-def check_dict_alignment(base: Dict, custom: Dict, e: Exception = None) -> None:
+def check_dict_alignment(base: dict, custom: dict, e: Exception = None) -> None:
     """
     Check alignment between custom and base configuration dictionaries, handling deprecated keys and providing error
     messages for mismatched keys.
@@ -498,7 +500,7 @@ def check_dict_alignment(base: Dict, custom: Dict, e: Exception = None) -> None:
         raise SyntaxError(string + CLI_HELP_MSG) from e
 
 
-def merge_equals_args(args: List[str]) -> List[str]:
+def merge_equals_args(args: list[str]) -> list[str]:
     """
     Merge arguments around isolated '=' in a list of strings and join fragments with brackets.
 
@@ -557,7 +559,7 @@ def merge_equals_args(args: List[str]) -> List[str]:
     return new_args
 
 
-def handle_yolo_hub(args: List[str]) -> None:
+def handle_yolo_hub(args: list[str]) -> None:
     """
     Handle Ultralytics HUB command-line interface (CLI) commands for authentication.
 
@@ -587,7 +589,7 @@ def handle_yolo_hub(args: List[str]) -> None:
         hub.logout()
 
 
-def handle_yolo_settings(args: List[str]) -> None:
+def handle_yolo_settings(args: list[str]) -> None:
     """
     Handle YOLO settings command-line interface (CLI) commands.
 
@@ -630,7 +632,7 @@ def handle_yolo_settings(args: List[str]) -> None:
         LOGGER.warning(f"settings error: '{e}'. Please see {url} for help.")
 
 
-def handle_yolo_solutions(args: List[str]) -> None:
+def handle_yolo_solutions(args: list[str]) -> None:
     """
     Process YOLO solutions arguments and run the specified computer vision solutions pipeline.
 

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/ultralytics/cfg/datasets/VisDrone.yaml

@@ -45,18 +45,18 @@ download: |
       images_dir = dir / "images" / split
       labels_dir = dir / "labels" / split
       labels_dir.mkdir(parents=True, exist_ok=True)
-      
+
       # Move images to new structure
       if (source_images_dir := source_dir / "images").exists():
           images_dir.mkdir(parents=True, exist_ok=True)
           for img in source_images_dir.glob("*.jpg"):
               img.rename(images_dir / img.name)
-      
+
       for f in TQDM((source_dir / "annotations").glob("*.txt"), desc=f"Converting {split}"):
           img_size = Image.open(images_dir / f.with_suffix(".jpg").name).size
           dw, dh = 1.0 / img_size[0], 1.0 / img_size[1]
           lines = []
-          
+
           with open(f, encoding="utf-8") as file:
               for row in [x.split(",") for x in file.read().strip().splitlines()]:
                   if row[4] != "0":  # Skip ignored regions
@@ -66,7 +66,7 @@ download: |
                       x_center, y_center = (x + w / 2) * dw, (y + h / 2) * dh
                       w_norm, h_norm = w * dw, h * dh
                       lines.append(f"{cls} {x_center:.6f} {y_center:.6f} {w_norm:.6f} {h_norm:.6f}\n")
-          
+
           (labels_dir / f.name).write_text("".join(lines), encoding="utf-8")
 
 

{dgenerate_ultralytics_headless-8.3.190 → dgenerate_ultralytics_headless-8.3.191}/ultralytics/data/annotator.py

@@ -1,13 +1,14 @@
 # Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
 
+from __future__ import annotations
+
 from pathlib import Path
-from typing import List, Optional, Union
 
 from ultralytics import SAM, YOLO
 
 
 def auto_annotate(
-    data: Union[str, Path],
+    data: str | Path,
     det_model: str = "yolo11x.pt",
     sam_model: str = "sam_b.pt",
     device: str = "",
@@ -15,8 +16,8 @@ def auto_annotate(
     iou: float = 0.45,
     imgsz: int = 640,
     max_det: int = 300,
-    classes: Optional[List[int]] = None,
-    output_dir: Optional[Union[str, Path]] = None,
+    classes: list[int] | None = None,
+    output_dir: str | Path | None = None,
 ) -> None:
     """
     Automatically annotate images using a YOLO object detection model and a SAM segmentation model.
@@ -54,8 +55,7 @@ def auto_annotate(
     )
 
     for result in det_results:
-        class_ids = result.boxes.cls.int().tolist()  # Extract class IDs from detection results
-        if class_ids:
+        if class_ids := result.boxes.cls.int().tolist():  # Extract class IDs from detection results
             boxes = result.boxes.xyxy  # Boxes object for bbox outputs
             sam_results = sam_model(result.orig_img, bboxes=boxes, verbose=False, save=False, device=device)
             segments = sam_results[0].masks.xyn