diff --git a/demo.ipynb b/demo.ipynb index 55d2b7cb..b5aa7c5e 100644 --- a/demo.ipynb +++ b/demo.ipynb @@ -972,7 +972,7 @@ } ], "source": [ - "from supervision.assets import download_assets, VideoAssets\n", + "from supervision.assets import VideoAssets, download_assets\n", "\n", "download_assets(VideoAssets.VEHICLES)\n", "VIDEO_PATH = VideoAssets.VEHICLES.value" diff --git a/test/annotators/test_utils.py b/test/annotators/test_utils.py index 1344d213..588f0242 100644 --- a/test/annotators/test_utils.py +++ b/test/annotators/test_utils.py @@ -1,5 +1,4 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections from typing import Optional import numpy as np @@ -7,6 +6,7 @@ import pytest from supervision.annotators.utils import ColorLookup, resolve_color_idx from supervision.detection.core import Detections +from test.test_utils import mock_detections @pytest.mark.parametrize( diff --git a/test/dataset/formats/test_pascal_voc.py b/test/dataset/formats/test_pascal_voc.py index bce29271..80d83cc7 100644 --- a/test/dataset/formats/test_pascal_voc.py +++ b/test/dataset/formats/test_pascal_voc.py @@ -1,16 +1,16 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections from typing import List, Optional -import defusedxml.ElementTree as ET import numpy as np import pytest +from defusedxml import ElementTree from supervision.dataset.formats.pascal_voc import ( detections_from_xml_obj, object_to_pascal_voc, parse_polygon_points, ) +from test.test_utils import mock_detections def are_xml_elements_equal(elem1, elem2): @@ -36,7 +36,7 @@ def are_xml_elements_equal(elem1, elem2): np.array([0, 0, 10, 10]), "test", None, - ET.fromstring( + ElementTree.fromstring( """test11 1111""" ), @@ -46,7 +46,7 @@ def are_xml_elements_equal(elem1, elem2): np.array([0, 0, 10, 10]), "test", np.array([[0, 0], [10, 0], [10, 10], [0, 10]]), - ET.fromstring( + ElementTree.fromstring( """test11 1111 1111 @@ -73,7 +73,7 @@ def test_object_to_pascal_voc( "polygon_element, expected_result, exception", [ ( - ET.fromstring( + ElementTree.fromstring( """0010010 10010""" ), @@ -160,6 +160,6 @@ def test_detections_from_xml_obj( xml_string, classes, resolution_wh, force_masks, expected_result, exception ): with exception: - root = ET.fromstring(xml_string) + root = ElementTree.fromstring(xml_string) result, _ = detections_from_xml_obj(root, classes, resolution_wh, force_masks) assert result == expected_result diff --git a/test/dataset/test_core.py b/test/dataset/test_core.py index 4a75225c..fdfe1475 100644 --- a/test/dataset/test_core.py +++ b/test/dataset/test_core.py @@ -1,11 +1,11 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections from typing import List, Optional import numpy as np import pytest from supervision import DetectionDataset +from test.test_utils import mock_detections @pytest.mark.parametrize( diff --git a/test/dataset/test_utils.py b/test/dataset/test_utils.py index 41e1da5b..67893abc 100644 --- a/test/dataset/test_utils.py +++ b/test/dataset/test_utils.py @@ -1,5 +1,4 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections from typing import Dict, List, Optional, Tuple, TypeVar import numpy as np @@ -15,6 +14,7 @@ from supervision.dataset.utils import ( rle_to_mask, train_test_split, ) +from test.test_utils import mock_detections T = TypeVar("T") diff --git a/test/detection/test_core.py b/test/detection/test_core.py index 300d6dfe..b857250e 100644 --- a/test/detection/test_core.py +++ b/test/detection/test_core.py @@ -1,5 +1,4 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections from typing import List, Optional, Union import numpy as np @@ -7,6 +6,7 @@ import pytest from supervision.detection.core import Detections, merge_inner_detection_object_pair from supervision.geometry.core import Position +from test.test_utils import mock_detections PREDICTIONS = np.array( [ diff --git a/test/detection/test_csv.py b/test/detection/test_csv.py index c3444494..e1414424 100644 --- a/test/detection/test_csv.py +++ b/test/detection/test_csv.py @@ -1,11 +1,11 @@ import csv import os -from test.test_utils import mock_detections from typing import Any, Dict, List import pytest import supervision as sv +from test.test_utils import mock_detections @pytest.mark.parametrize( diff --git a/test/detection/test_json.py b/test/detection/test_json.py index 760c2db3..d5f24924 100644 --- a/test/detection/test_json.py +++ b/test/detection/test_json.py @@ -1,11 +1,11 @@ import json import os -from test.test_utils import mock_detections from typing import Any, Dict, List import pytest import supervision as sv +from test.test_utils import mock_detections @pytest.mark.parametrize( diff --git a/test/detection/test_line_counter.py b/test/detection/test_line_counter.py index 66118e97..b7e4d33d 100644 --- a/test/detection/test_line_counter.py +++ b/test/detection/test_line_counter.py @@ -1,11 +1,11 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections from typing import List, Optional, Tuple import pytest from supervision import LineZone from supervision.geometry.core import Point, Position, Vector +from test.test_utils import mock_detections @pytest.mark.parametrize( diff --git a/test/detection/test_polygonzone.py b/test/detection/test_polygonzone.py index ed899615..a631ff17 100644 --- a/test/detection/test_polygonzone.py +++ b/test/detection/test_polygonzone.py @@ -1,10 +1,10 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import mock_detections import numpy as np import pytest import supervision as sv +from test.test_utils import mock_detections DETECTION_BOXES = np.array( [ diff --git a/test/metrics/test_detection.py b/test/metrics/test_detection.py index 7cb92c46..b2313bdd 100644 --- a/test/metrics/test_detection.py +++ b/test/metrics/test_detection.py @@ -1,5 +1,4 @@ from contextlib import ExitStack as DoesNotRaise -from test.test_utils import assert_almost_equal, mock_detections from typing import Optional, Union import numpy as np @@ -11,6 +10,7 @@ from supervision.metrics.detection import ( MeanAveragePrecision, detections_to_tensor, ) +from test.test_utils import assert_almost_equal, mock_detections CLASSES = np.arange(80) NUM_CLASSES = len(CLASSES) diff --git a/test/test_utils.py b/test/test_utils.py index b676cb54..ce1bc136 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,13 +1,14 @@ from typing import Any, Dict, List, Optional import numpy as np +import numpy.typing as npt from supervision.detection.core import Detections from supervision.keypoint.core import KeyPoints def mock_detections( - xyxy: List[List[float]], + xyxy: npt.NDArray[np.float32], mask: Optional[List[np.ndarray]] = None, confidence: Optional[List[float]] = None, class_id: Optional[List[int]] = None, @@ -32,7 +33,7 @@ def mock_detections( def mock_keypoints( - xy: List[List[float]], + xy: npt.NDArray[np.float32], confidence: Optional[List[float]] = None, class_id: Optional[List[int]] = None, data: Optional[Dict[str, List[Any]]] = None,