xiaoxue_admin
/
supervision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(pre_commit): 🎨 auto format pre-commit hooks

This commit is contained in:
pre-commit-ci[bot] 2023-12-29 14:05:20 +00:00
parent efed23f64e
commit 27eb823809
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervision/detection/core.py
View File

@ -61,9 +61,7 @@ def _validate_tracker_id(tracker_id: Any, n: int) -> None:
raise ValueError("tracker_id must be None or 1d np.ndarray with (n,) shape")
def is_data_equal(
data_a: Dict[str, np.ndarray], data_b: Dict[str, np.ndarray]
) -> bool:
def is_data_equal(data_a: Dict[str, np.ndarray], data_b: Dict[str, np.ndarray]) -> bool:
"""
Compares the data payloads of two Detections instances.
@ -79,7 +77,7 @@ def is_data_equal(
def merge_data(
data_list: List[Dict[str, Union[np.ndarray, List]]]
data_list: List[Dict[str, Union[np.ndarray, List]]],
) -> Dict[str, Union[np.ndarray, List]]:
"""
Merges the data payloads of a list of Detections instances.

37
test/detection/test_core.py
View File

@ -1,6 +1,6 @@
from contextlib import ExitStack as DoesNotRaise
from test.test_utils import mock_detections
from typing import List, Optional, Union, Dict, Any
from typing import Any, Dict, List, Optional, Union
import numpy as np
import pytest
@ -335,17 +335,12 @@ def test_equal(
DoesNotRaise(),
), # empty data list
(
[
{}
],
[{}],
{},
DoesNotRaise(),
), # single empty data dict
(
[
{},
{}
],
[{}, {}],
{},
DoesNotRaise(),
), # two empty data dicts
@ -392,39 +387,41 @@ def test_equal(
), # two data dicts with the same field name and np.array values as 2D arrays
(
[
{"test_1": np.array([1, 2, 3]), "test_2": np.array(['a', 'b', 'c'])},
{"test_1": np.array([3, 2, 1]), "test_2": np.array(['c', 'b', 'a'])},
{"test_1": np.array([1, 2, 3]), "test_2": np.array(["a", "b", "c"])},
{"test_1": np.array([3, 2, 1]), "test_2": np.array(["c", "b", "a"])},
],
{
"test_1": np.array([1, 2, 3, 3, 2, 1]),
"test_2": np.array(['a', 'b', 'c', 'c', 'b', 'a'])
"test_2": np.array(["a", "b", "c", "c", "b", "a"]),
},
DoesNotRaise(),
), # two data dicts with the same field names and np.array values
(
[
{"test_1": [1, 2, 3], "test_2": np.array(['a', 'b', 'c'])},
{"test_1": [3, 2, 1], "test_2": np.array(['c', 'b', 'a'])},
{"test_1": [1, 2, 3], "test_2": np.array(["a", "b", "c"])},
{"test_1": [3, 2, 1], "test_2": np.array(["c", "b", "a"])},
],
{
"test_1": [1, 2, 3, 3, 2, 1],
"test_2": np.array(['a', 'b', 'c', 'c', 'b', 'a'])
"test_2": np.array(["a", "b", "c", "c", "b", "a"]),
},
DoesNotRaise(),
), # two data dicts with the same field names and mixed values
]
],
)
def test_merge_data(
data_list: List[Dict[str, Any]],
expected_result: Optional[Dict[str, Any]],
exception: Exception
exception: Exception,
):
with exception:
result = merge_data(data_list=data_list)
for key in result:
if isinstance(result[key], np.ndarray):
assert np.array_equal(result[key], expected_result[
key]), f"Mismatch in arrays for key {key}"
assert np.array_equal(
result[key], expected_result[key]
), f"Mismatch in arrays for key {key}"
else:
assert result[key] == expected_result[
key], f"Mismatch in non-array data for key {key}"
assert (
result[key] == expected_result[key]
), f"Mismatch in non-array data for key {key}"