From 662b0f844aa7c6e139458655c04f053082802da4 Mon Sep 17 00:00:00 2001 From: mertalev <101130780+mertalev@users.noreply.github.com> Date: Sun, 13 Oct 2024 17:16:30 -0400 Subject: [PATCH] cleanup --- .../app/models/facial_recognition/recognition.py | 3 +-- machine-learning/app/test_main.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/machine-learning/app/models/facial_recognition/recognition.py b/machine-learning/app/models/facial_recognition/recognition.py index c060bdd616..574411f390 100644 --- a/machine-learning/app/models/facial_recognition/recognition.py +++ b/machine-learning/app/models/facial_recognition/recognition.py @@ -19,9 +19,8 @@ class FaceRecognizer(InferenceModel): depends = [(ModelType.DETECTION, ModelTask.FACIAL_RECOGNITION)] identity = (ModelType.RECOGNITION, ModelTask.FACIAL_RECOGNITION) - def __init__(self, model_name: str, min_score: float = 0.7, **model_kwargs: Any) -> None: + def __init__(self, model_name: str, **model_kwargs: Any) -> None: super().__init__(model_name, **model_kwargs) - self.min_score = model_kwargs.pop("minScore", min_score) self.batch = self.model_format == ModelFormat.ONNX def _load(self) -> ModelSession: diff --git a/machine-learning/app/test_main.py b/machine-learning/app/test_main.py index ad8986d572..660cadace2 100644 --- a/machine-learning/app/test_main.py +++ b/machine-learning/app/test_main.py @@ -323,7 +323,7 @@ class TestAnnSession: session.run(None, input_feed) ann_session.return_value.execute.assert_called_once_with(123, [input1, input2]) - np_spy.call_count == 2 + assert np_spy.call_count == 2 np_spy.assert_has_calls([mock.call(input1), mock.call(input2)]) @@ -456,11 +456,14 @@ class TestCLIP: class TestFaceRecognition: - def test_set_min_score(self, mocker: MockerFixture) -> None: - mocker.patch.object(FaceRecognizer, "load") - face_recognizer = FaceRecognizer("buffalo_s", cache_dir="test_cache", min_score=0.5) + def test_set_min_score(self, snapshot_download: mock.Mock, ort_session: mock.Mock, path: mock.Mock) -> None: + path.return_value.__truediv__.return_value.__truediv__.return_value.suffix = ".onnx" - assert face_recognizer.min_score == 0.5 + face_detector = FaceDetector("buffalo_s", min_score=0.5, cache_dir="test_cache") + face_detector.load() + + assert face_detector.min_score == 0.5 + assert face_detector.model.det_thresh == 0.5 def test_detection(self, cv_image: cv2.Mat, mocker: MockerFixture) -> None: mocker.patch.object(FaceDetector, "load")