dgenerate-ultralytics-headless 8.3.248__tar.gz → 8.3.250__tar.gz

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/PKG-INFO

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

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

@@ -37,6 +37,7 @@ ultralytics/cfg/datasets/HomeObjects-3K.yaml
 ultralytics/cfg/datasets/ImageNet.yaml
 ultralytics/cfg/datasets/Objects365.yaml
 ultralytics/cfg/datasets/SKU-110K.yaml
+ultralytics/cfg/datasets/TT100K.yaml
 ultralytics/cfg/datasets/VOC.yaml
 ultralytics/cfg/datasets/VisDrone.yaml
 ultralytics/cfg/datasets/african-wildlife.yaml

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/__init__.py

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

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/cfg/__init__.py

@@ -410,7 +410,9 @@ def get_save_dir(args: SimpleNamespace, name: str | None = None) -> Path:
     else:
         from ultralytics.utils.files import increment_path
 
-        project = args.project or (ROOT.parent / "tests/tmp/runs" if TESTS_RUNNING else RUNS_DIR) / args.task
+        runs = (ROOT.parent / "tests/tmp/runs" if TESTS_RUNNING else RUNS_DIR) / args.task
+        nested = args.project and len(Path(args.project).parts) > 1  # e.g. "user/project" or "org\repo"
+        project = runs / args.project if nested else args.project or runs
         name = name or args.name or f"{args.mode}"
         save_dir = increment_path(Path(project) / name, exist_ok=args.exist_ok if RANK in {-1, 0} else True)
 

dgenerate_ultralytics_headless-8.3.250/ultralytics/cfg/datasets/TT100K.yaml

@@ -0,0 +1,356 @@
+# Ultralytics YOLO 🚀 AGPL-3.0 License - https://ultralytics.com/license
+# Tsinghua-Tencent 100K Traffic Sign Detection Dataset
+# Dataset: https://cg.cs.tsinghua.edu.cn/traffic-sign/
+# Paper: Traffic-Sign Detection and Classification in the Wild (CVPR 2016)
+# Documentation: 100,000 images with 30,000+ traffic sign annotations
+# Example usage: yolo train data=TT100K.yaml
+# parent
+# ├── ultralytics
+# └── datasets
+#     └── TT100K  ← downloads here (~30 GB with images)
+
+# Train/val/test sets
+path: TT100K # dataset root dir
+train: images/train # train images (relative to 'path')
+val: images/val # val images (relative to 'path')
+test: images/test # test images (relative to 'path')
+
+# Classes
+nc: 221
+names:
+  0: pl5
+  1: pl10
+  2: pl15
+  3: pl20
+  4: pl25
+  5: pl30
+  6: pl40
+  7: pl50
+  8: pl60
+  9: pl70
+  10: pl80
+  11: pl90
+  12: pl100
+  13: pl110
+  14: pl120
+  15: pm5
+  16: pm10
+  17: pm13
+  18: pm15
+  19: pm20
+  20: pm25
+  21: pm30
+  22: pm35
+  23: pm40
+  24: pm46
+  25: pm50
+  26: pm55
+  27: pm8
+  28: pn
+  29: pne
+  30: ph4
+  31: ph4.5
+  32: ph5
+  33: ps
+  34: pg
+  35: ph1.5
+  36: ph2
+  37: ph2.1
+  38: ph2.2
+  39: ph2.4
+  40: ph2.5
+  41: ph2.8
+  42: ph2.9
+  43: ph3
+  44: ph3.2
+  45: ph3.5
+  46: ph3.8
+  47: ph4.2
+  48: ph4.3
+  49: ph4.8
+  50: ph5.3
+  51: ph5.5
+  52: pb
+  53: pr10
+  54: pr100
+  55: pr20
+  56: pr30
+  57: pr40
+  58: pr45
+  59: pr50
+  60: pr60
+  61: pr70
+  62: pr80
+  63: pr90
+  64: p1
+  65: p2
+  66: p3
+  67: p4
+  68: p5
+  69: p6
+  70: p7
+  71: p8
+  72: p9
+  73: p10
+  74: p11
+  75: p12
+  76: p13
+  77: p14
+  78: p15
+  79: p16
+  80: p17
+  81: p18
+  82: p19
+  83: p20
+  84: p21
+  85: p22
+  86: p23
+  87: p24
+  88: p25
+  89: p26
+  90: p27
+  91: p28
+  92: pa8
+  93: pa10
+  94: pa12
+  95: pa13
+  96: pa14
+  97: pb5
+  98: pc
+  99: pg
+  100: ph1
+  101: ph1.3
+  102: ph1.5
+  103: ph2
+  104: ph3
+  105: ph4
+  106: ph5
+  107: pi
+  108: pl0
+  109: pl4
+  110: pl5
+  111: pl8
+  112: pl10
+  113: pl15
+  114: pl20
+  115: pl25
+  116: pl30
+  117: pl35
+  118: pl40
+  119: pl50
+  120: pl60
+  121: pl65
+  122: pl70
+  123: pl80
+  124: pl90
+  125: pl100
+  126: pl110
+  127: pl120
+  128: pm2
+  129: pm8
+  130: pm10
+  131: pm13
+  132: pm15
+  133: pm20
+  134: pm25
+  135: pm30
+  136: pm35
+  137: pm40
+  138: pm46
+  139: pm50
+  140: pm55
+  141: pn
+  142: pne
+  143: po
+  144: pr10
+  145: pr100
+  146: pr20
+  147: pr30
+  148: pr40
+  149: pr45
+  150: pr50
+  151: pr60
+  152: pr70
+  153: pr80
+  154: ps
+  155: w1
+  156: w2
+  157: w3
+  158: w5
+  159: w8
+  160: w10
+  161: w12
+  162: w13
+  163: w16
+  164: w18
+  165: w20
+  166: w21
+  167: w22
+  168: w24
+  169: w28
+  170: w30
+  171: w31
+  172: w32
+  173: w34
+  174: w35
+  175: w37
+  176: w38
+  177: w41
+  178: w42
+  179: w43
+  180: w44
+  181: w45
+  182: w46
+  183: w47
+  184: w48
+  185: w49
+  186: w50
+  187: w51
+  188: w52
+  189: w53
+  190: w54
+  191: w55
+  192: w56
+  193: w57
+  194: w58
+  195: w59
+  196: w60
+  197: w62
+  198: w63
+  199: w66
+  200: i1
+  201: i2
+  202: i3
+  203: i4
+  204: i5
+  205: i6
+  206: i7
+  207: i8
+  208: i9
+  209: i10
+  210: i11
+  211: i12
+  212: i13
+  213: i14
+  214: i15
+  215: il60
+  216: il80
+  217: il100
+  218: il110
+  219: io
+  220: ip
+
+# Download script/URL (optional) ---------------------------------------------------------------------------------------
+download: |
+  import os
+  import json
+  import shutil
+  from pathlib import Path
+  from ultralytics.utils.downloads import download
+  from ultralytics.utils import TQDM
+
+  def tt100k2yolo(dir):
+      """Convert TT100K annotations to YOLO format."""
+      from PIL import Image
+      
+      data_dir = dir / "data"
+      anno_file = data_dir / "annotations.json"
+      
+      print("Loading annotations...")
+      with open(anno_file, 'r', encoding='utf-8') as f:
+          data = json.load(f)
+      
+      # Get all unique classes
+      classes = set()
+      for img_id, img_data in data['imgs'].items():
+          for obj in img_data.get('objects', []):
+              classes.add(obj['category'])
+      class_to_idx = {cls: idx for idx, cls in enumerate(yaml["names"]) if cls in classes}
+      class_to_idx = {cls: idx for idx, cls in enumerate(classes)}
+      
+      print(f"Found {len(classes)} traffic sign classes")
+      
+      # Create directories
+      for split in ['train', 'val', 'test']:
+          (dir / 'images' / split).mkdir(parents=True, exist_ok=True)
+          (dir / 'labels' / split).mkdir(parents=True, exist_ok=True)
+      
+      print("Converting annotations to YOLO format...")
+      for img_id, img_data in TQDM(data['imgs'].items(), desc="Processing"):
+          img_path_str = img_data['path']
+          if 'train' in img_path_str:
+              split = 'train'
+          elif 'test' in img_path_str:
+              split = 'test'
+          else:
+              split = 'val'
+          
+          # Source and destination paths
+          src_img = data_dir / img_path_str
+          if not src_img.exists():
+              continue
+          
+          img_name = src_img.name
+          dst_img = dir / 'images' / split / img_name
+          
+          # Get image dimensions
+          try:
+              with Image.open(src_img) as img:
+                  img_width, img_height = img.size
+          except Exception as e:
+              print(f"Error reading {src_img}: {e}")
+              continue
+          shutil.copy2(src_img, dst_img)
+          label_file = dir / 'labels' / split / f"{src_img.stem}.txt"
+          lines = []
+          
+          for obj in img_data.get('objects', []):
+              category = obj['category']
+              if category not in class_to_idx:
+                  continue
+              
+              bbox = obj['bbox']
+              xmin, ymin = bbox['xmin'], bbox['ymin']
+              xmax, ymax = bbox['xmax'], bbox['ymax']
+              
+              # Convert to YOLO format (normalized center coordinates and dimensions)
+              x_center = ((xmin + xmax) / 2.0) / img_width
+              y_center = ((ymin + ymax) / 2.0) / img_height
+              width = (xmax - xmin) / img_width
+              height = (ymax - ymin) / img_height
+              
+              # Ensure valid coordinates
+              x_center = max(0, min(1, x_center))
+              y_center = max(0, min(1, y_center))
+              width = max(0, min(1, width))
+              height = max(0, min(1, height))
+              
+              cls_idx = class_to_idx[category]
+              lines.append(f"{cls_idx} {x_center:.6f} {y_center:.6f} {width:.6f} {height:.6f}\n")
+          
+          # Write label file
+          if lines:
+              label_file.write_text("".join(lines), encoding="utf-8")
+      
+      print(f"Conversion complete!")
+      print(f"Found {len(classes)} classes: {classes[:10]}..." if len(classes) > 10 else f"Classes: {classes}")
+      
+      return classes
+
+  # Download dataset
+  dir = Path(yaml['path'])  # dataset root dir
+
+  # TT100K dataset URLs
+  urls = [
+      'https://cg.cs.tsinghua.edu.cn/traffic-sign/data_model_code/data.zip',  # Main dataset with annotations
+  ]
+
+  print("Downloading TT100K dataset...")
+  print("Note: This dataset is large (~30GB). Download may take some time.")
+  print("Dataset is under CC-BY-NC license for non-commercial use only.")
+
+  # Download and extract
+  download(urls, dir=dir, unzip=True, delete=False, curl=False, threads=1)
+
+  # Convert dataset in YOLO format
+  classes = tt100k2yolo(dir)

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/engine/trainer.py

@@ -631,13 +631,17 @@ class BaseTrainer:
         try:
             if self.args.task == "classify":
                 data = check_cls_dataset(self.args.data)
-            elif str(self.args.data).rsplit(".", 1)[-1] == "ndjson":
-                # Convert NDJSON to YOLO format
+            elif str(self.args.data).rsplit(".", 1)[-1] == "ndjson" or (
+                str(self.args.data).startswith("ul://") and "/datasets/" in str(self.args.data)
+            ):
+                # Convert NDJSON to YOLO format (including ul:// platform dataset URIs)
                 import asyncio
 
                 from ultralytics.data.converter import convert_ndjson_to_yolo
+                from ultralytics.utils.checks import check_file
 
-                yaml_path = asyncio.run(convert_ndjson_to_yolo(self.args.data))
+                ndjson_file = check_file(self.args.data)  # Resolve ul:// or URL to local .ndjson file
+                yaml_path = asyncio.run(convert_ndjson_to_yolo(ndjson_file))
                 self.args.data = str(yaml_path)
                 data = check_det_dataset(self.args.data)
             elif str(self.args.data).rsplit(".", 1)[-1] in {"yaml", "yml"} or self.args.task in {

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/solutions/object_counter.py

@@ -129,7 +129,7 @@ class ObjectCounter(BaseSolution):
             str.capitalize(key): f"{'IN ' + str(value['IN']) if self.show_in else ''} "
             f"{'OUT ' + str(value['OUT']) if self.show_out else ''}".strip()
             for key, value in self.classwise_count.items()
-            if value["IN"] != 0 or (value["OUT"] != 0 and (self.show_in or self.show_out))
+            if (value["IN"] != 0 and self.show_in) or (value["OUT"] != 0 and self.show_out)
         }
         if labels_dict:
             self.annotator.display_analytics(plot_im, labels_dict, (104, 31, 17), (255, 255, 255), self.margin)

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/utils/callbacks/platform.py

@@ -32,6 +32,85 @@ except (AssertionError, ImportError):
     _api_key = None
 
 
+def resolve_platform_uri(uri, hard=True):
+    """Resolve ul:// URIs to signed URLs by authenticating with Ultralytics Platform.
+
+    Formats:
+        ul://username/datasets/slug  -> Returns signed URL to NDJSON file
+        ul://username/project/model  -> Returns signed URL to .pt file
+
+    Args:
+        uri (str): Platform URI starting with "ul://".
+        hard (bool): Whether to raise an error if resolution fails (FileNotFoundError only).
+
+    Returns:
+        (str | None): Signed URL on success, None if not found and hard=False.
+
+    Raises:
+        ValueError: If API key is missing/invalid or URI format is wrong.
+        PermissionError: If access is denied.
+        RuntimeError: If resource is not ready (e.g., dataset still processing).
+        FileNotFoundError: If resource not found and hard=True.
+        ConnectionError: If network request fails and hard=True.
+    """
+    import requests
+
+    path = uri[5:]  # Remove "ul://"
+    parts = path.split("/")
+
+    api_key = os.getenv("ULTRALYTICS_API_KEY") or SETTINGS.get("api_key")
+    if not api_key:
+        raise ValueError(f"ULTRALYTICS_API_KEY required for '{uri}'. Get key at https://alpha.ultralytics.com/settings")
+
+    base = "https://alpha.ultralytics.com/api/webhooks"
+    headers = {"Authorization": f"Bearer {api_key}"}
+
+    # ul://username/datasets/slug
+    if len(parts) == 3 and parts[1] == "datasets":
+        username, _, slug = parts
+        url = f"{base}/datasets/{username}/{slug}/export"
+
+    # ul://username/project/model
+    elif len(parts) == 3:
+        username, project, model = parts
+        url = f"{base}/models/{username}/{project}/{model}/download"
+
+    else:
+        raise ValueError(f"Invalid platform URI: {uri}. Use ul://user/datasets/name or ul://user/project/model")
+
+    LOGGER.info(f"Resolving {uri} from Ultralytics Platform...")
+
+    try:
+        r = requests.head(url, headers=headers, allow_redirects=False, timeout=30)
+
+        # Handle redirect responses (301, 302, 303, 307, 308)
+        if 300 <= r.status_code < 400 and "location" in r.headers:
+            return r.headers["location"]  # Return signed URL
+
+        # Handle error responses
+        if r.status_code == 401:
+            raise ValueError(f"Invalid ULTRALYTICS_API_KEY for '{uri}'")
+        if r.status_code == 403:
+            raise PermissionError(f"Access denied for '{uri}'. Check dataset/model visibility settings.")
+        if r.status_code == 404:
+            if hard:
+                raise FileNotFoundError(f"Not found on platform: {uri}")
+            LOGGER.warning(f"Not found on platform: {uri}")
+            return None
+        if r.status_code == 409:
+            raise RuntimeError(f"Resource not ready: {uri}. Dataset may still be processing.")
+
+        # Unexpected response
+        r.raise_for_status()
+        raise RuntimeError(f"Unexpected response from platform for '{uri}': {r.status_code}")
+
+    except requests.exceptions.RequestException as e:
+        if hard:
+            raise ConnectionError(f"Failed to resolve {uri}: {e}") from e
+        LOGGER.warning(f"Failed to resolve {uri}: {e}")
+        return None
+
+
 def _interp_plot(plot, n=101):
     """Interpolate plot curve data from 1000 to n points to reduce storage size."""
     import numpy as np

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/utils/checks.py

@@ -592,7 +592,7 @@ def check_file(file, suffix="", download=True, download_dir=".", hard=True):
     """Search/download file (if necessary), check suffix (if provided), and return path.
 
     Args:
-        file (str): File name or path.
+        file (str): File name or path, or platform URI (ul://username/datasets/name).
         suffix (str | tuple): Acceptable suffix or tuple of suffixes to validate against the file.
         download (bool): Whether to download the file if it doesn't exist locally.
         download_dir (str): Directory to download the file to.
@@ -610,6 +610,18 @@ def check_file(file, suffix="", download=True, download_dir=".", hard=True):
         or file.lower().startswith("grpc://")
     ):  # file exists or gRPC Triton images
         return file
+    elif download and file.lower().startswith("ul://"):  # Ultralytics Platform URI
+        from ultralytics.utils.callbacks.platform import resolve_platform_uri
+
+        url = resolve_platform_uri(file, hard=hard)  # Convert to signed HTTPS URL
+        if url is None:
+            return []  # Not found, soft fail (consistent with file search behavior)
+        local_file = Path(download_dir) / url2file(url)
+        if local_file.exists():
+            LOGGER.info(f"Found {clean_url(url)} locally at {local_file}")
+        else:
+            downloads.safe_download(url=url, file=local_file, unzip=False)
+        return str(local_file)
     elif download and file.lower().startswith(("https://", "http://", "rtsp://", "rtmp://", "tcp://")):  # download
         url = file  # warning: Pathlib turns :// -> :/
         file = Path(download_dir) / url2file(file)  # '%2F' to '/', split https://url.com/file.txt?auth

{dgenerate_ultralytics_headless-8.3.248 → dgenerate_ultralytics_headless-8.3.250}/ultralytics/utils/metrics.py

@@ -315,7 +315,7 @@ class ConfusionMatrix(DataExportMixin):
         matches (dict): Contains the indices of ground truths and predictions categorized into TP, FP and FN.
     """
 
-    def __init__(self, names: dict[int, str] = [], task: str = "detect", save_matches: bool = False):
+    def __init__(self, names: dict[int, str] = {}, task: str = "detect", save_matches: bool = False):
         """Initialize a ConfusionMatrix instance.
 
         Args: