From 8cd26d54b706fa2ce223dfea193955629705a9c2 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Thu, 30 Apr 2026 13:39:25 +0200 Subject: [PATCH] Face_detection: bug in pytest due to same names, refactored face_detection scripts to be utils in daq/operations/face_detection --- src/aare/daq/operations/__init__.py | 0 src/aare/daq/operations/face_detection/service.py | 3 +-- .../operations/face_detection/utils.py} | 0 .../operations/face_detection/test_face_detection_logic.py} | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 src/aare/daq/operations/__init__.py rename src/aare/{common/face_detection.py => daq/operations/face_detection/utils.py} (100%) rename tests/unit/{common/test_face_detection.py => daq/operations/face_detection/test_face_detection_logic.py} (98%) diff --git a/src/aare/daq/operations/__init__.py b/src/aare/daq/operations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/aare/daq/operations/face_detection/service.py b/src/aare/daq/operations/face_detection/service.py index 31941523..eafe0f9c 100644 --- a/src/aare/daq/operations/face_detection/service.py +++ b/src/aare/daq/operations/face_detection/service.py @@ -1,10 +1,9 @@ import time -import aare.common.face_detection as fd +import aare.daq.operations.face_detection.utils as fd from aare.common.coordinate import Coordinate, SmargonCoordinate from aare.common.logger_events import log_duration, log_ml_bundle_meta from aare.common.models import MLBoxModel, ZoomModeEnum -from aare.daq.config import BeamlineStateEnum from aare.daq.mlbox import MLBoxPredictionResult from aare.daq.operations.face_detection.models import ( FaceDetectionContext, diff --git a/src/aare/common/face_detection.py b/src/aare/daq/operations/face_detection/utils.py similarity index 100% rename from src/aare/common/face_detection.py rename to src/aare/daq/operations/face_detection/utils.py diff --git a/tests/unit/common/test_face_detection.py b/tests/unit/daq/operations/face_detection/test_face_detection_logic.py similarity index 98% rename from tests/unit/common/test_face_detection.py rename to tests/unit/daq/operations/face_detection/test_face_detection_logic.py index e21f1c95..a4b8f571 100644 --- a/tests/unit/common/test_face_detection.py +++ b/tests/unit/daq/operations/face_detection/test_face_detection_logic.py @@ -1,6 +1,6 @@ import numpy as np import pytest -from aare.common.face_detection import ( +from aare.daq.operations.face_detection.utils import ( box_height_from_tuple, box_area_from_tuple, prepare_samples,