Fix accidental changes, rearrange utils, rename methods

Author: LinasKo

docs/changelog.md

@@ -176,8 +176,6 @@ with csv_sink:
 
 - Added [#819](https://github.com/roboflow/supervision/pull/819): [`sv.JSONSink`](/0.19.0/detection/tools/save_detections/#supervision.detection.tools.csv_sink.JSONSink) allowing for the straightforward saving of image, video, or stream inference results in a `.json` file.
 
-````python
-
 ```python
 import supervision as sv
 from ultralytics import YOLO
@@ -191,7 +189,7 @@ with json_sink:
         result = model(frame)[0]
         detections = sv.Detections.from_ultralytics(result)
         json_sink.append(detections, custom_data={<CUSTOM_LABEL>:<CUSTOM_DATA>})
-````
+```
 
 - Added [#847](https://github.com/roboflow/supervision/pull/847): [`sv.mask_iou_batch`](/0.19.0/detection/utils/#supervision.detection.utils.mask_iou_batch) allowing to compute Intersection over Union (IoU) of two sets of masks.
 

docs/deprecated.md

@@ -5,7 +5,7 @@ status: deprecated
 
 These features are phased out due to better alternatives or potential issues in future versions. Deprecated functionalities are supported for **three subsequent releases**, providing time for users to transition to updated methods.
 
-- [`Detections.from_froboflow`](detection/core.md/#supervision.detection.core.Detections.from_roboflow) is deprecated and will be removed in `supervision-0.22.0`. Use [`Detections.from_inference`](detection/core.md/#supervision.detection.core.Detections.from_inference) instead.
+- [`Detections.from_roboflow`](detection/core.md/#supervision.detection.core.Detections.from_roboflow) is deprecated and will be removed in `supervision-0.22.0`. Use [`Detections.from_inference`](detection/core.md/#supervision.detection.core.Detections.from_inference) instead.
 - The method `Color.white()` is deprecated and will be removed in `supervision-0.22.0`. Use the constant `Color.WHITE` instead.
 - The method `Color.black()` is deprecated and will be removed in `supervision-0.22.0`. Use the constant `Color.BLACK` instead.
 - The method `Color.red()` is deprecated and will be removed in `supervision-0.22.0`. Use the constant `Color.RED` instead.

supervision/dataset/formats/pascal_voc.py

@@ -183,8 +183,6 @@ def load_pascal_voc_annotations(
         )
         annotations[image_path] = annotation
 
-    # TODO: classes are wrong
-
     return classes, image_paths, annotations
 
 

supervision/dataset/formats/yolo.py

@@ -68,7 +68,7 @@ def _extract_class_names(file_path: str) -> List[str]:
     return names
 
 
-def image_name_to_annotation_name(image_name: str) -> str:
+def _image_name_to_annotation_name(image_name: str) -> str:
     base_name, _ = os.path.splitext(image_name)
     return base_name + ".txt"
 
@@ -242,12 +242,6 @@ def detections_to_yolo_annotations(
     return annotation
 
 
-def save_data_yaml(data_yaml_path: str, classes: List[str]) -> None:
-    data = {"nc": len(classes), "names": classes}
-    Path(data_yaml_path).parent.mkdir(parents=True, exist_ok=True)
-    save_yaml_file(data=data, file_path=data_yaml_path)
-
-
 def save_yolo_annotations(
     dataset: "DetectionDataset",
     annotations_directory_path: str,
@@ -258,7 +252,7 @@ def save_yolo_annotations(
     Path(annotations_directory_path).mkdir(parents=True, exist_ok=True)
     for image_path, image, annotation in dataset:
         image_name = Path(image_path).name
-        yolo_annotations_name = image_name_to_annotation_name(image_name=image_name)
+        yolo_annotations_name = _image_name_to_annotation_name(image_name=image_name)
         yolo_annotations_path = os.path.join(
             annotations_directory_path, yolo_annotations_name
         )
@@ -270,3 +264,9 @@ def save_yolo_annotations(
             approximation_percentage=approximation_percentage,
         )
         save_text_file(lines=lines, file_path=yolo_annotations_path)
+
+
+def save_data_yaml(data_yaml_path: str, classes: List[str]) -> None:
+    data = {"nc": len(classes), "names": classes}
+    Path(data_yaml_path).parent.mkdir(parents=True, exist_ok=True)
+    save_yaml_file(data=data, file_path=data_yaml_path)

supervision/draw/utils.py

@@ -295,8 +295,8 @@ def calculate_optimal_text_scale(resolution_wh: Tuple[int, int]) -> float:
     Calculate font scale based on the resolution of an image.
 
     Parameters:
-         resolution_wh (Tuple[int, int]): A tuple representing the width and height
-             of the image.
+        resolution_wh (Tuple[int, int]): A tuple representing the width and height
+            of the image.
 
     Returns:
          float: The calculated font scale factor.

test/dataset/formats/test_yolo.py

@@ -5,8 +5,8 @@
 import pytest
 
 from supervision.dataset.formats.yolo import (
+    _image_name_to_annotation_name,
     _with_mask,
-    image_name_to_annotation_name,
     object_to_yolo,
     yolo_annotations_to_detections,
 )
@@ -205,7 +205,7 @@ def test_image_name_to_annotation_name(
     image_name: str, expected_result: Optional[str], exception: Exception
 ) -> None:
     with exception:
-        result = image_name_to_annotation_name(image_name=image_name)
+        result = _image_name_to_annotation_name(image_name=image_name)
         assert result == expected_result
 
 

test/dataset/test_core.py

@@ -13,7 +13,7 @@
     [
         (
             [],
-            DetectionDataset(classes=[], images=[], annotations={}),
+            DetectionDataset(classes=[], images={}, annotations={}),
             DoesNotRaise(),
         ),  # empty dataset list
         (