operations refactor: standardised operations, added rotation operation, updated tests.
This commit is contained in:
1 parent
9be8c1a3c8
commit
087ce0482f
22 files changed
+945
-439
No files matched your search
@@ -4,17 +4,18 @@ import pytest
|
||||
|
||||
from aare.common.coordinate import Coordinate, SmargonCoordinate
|
||||
from aare.common.models import BoundingBoxModel, MLBoxModel, MLBoxType, ZoomModeEnum
|
||||
from aare.daq.operations.common import runtime
|
||||
from aare.daq.operations.face_detection.models import (
|
||||
FaceDetectionContext,
|
||||
FaceDetectionDependencies,
|
||||
FaceDetectionResult,
|
||||
FaceDetectionSettings,
|
||||
)
|
||||
from aare.daq.operations.face_detection.service import FaceDetectionService
|
||||
from aare.daq.operations.common.runtime import (
|
||||
DAQRuntimeState,
|
||||
SampleProvider,
|
||||
StatusProvider,
|
||||
FaceDetectionProgressEmitter)
|
||||
from aare.daq.operations.common.runtime import DAQRuntimeState
|
||||
from aare.daq.operations.common.services import (
|
||||
FaceDetectionProgressEmitter,
|
||||
OperationServices,
|
||||
)
|
||||
|
||||
class DummyGeometry:
|
||||
def __init__(self):
|
||||
@@ -61,22 +62,30 @@ def context():
|
||||
status_provider=types.SimpleNamespace(status=None),
|
||||
)
|
||||
|
||||
progress_emitter = FaceDetectionProgressEmitter(
|
||||
reporter=types.SimpleNamespace(emit_progress=emit_progress)
|
||||
services = OperationServices(
|
||||
screenshots=types.SimpleNamespace(
|
||||
save_to_db=lambda *args, **kwargs: None
|
||||
),
|
||||
face_detection_progress=FaceDetectionProgressEmitter(
|
||||
reporter=types.SimpleNamespace(emit_progress=emit_progress)
|
||||
),
|
||||
)
|
||||
|
||||
ctx = FaceDetectionContext(
|
||||
cfg=cfg,
|
||||
devs=devs,
|
||||
mlbox=types.SimpleNamespace(
|
||||
predict=lambda **kwargs: types.SimpleNamespace(
|
||||
box=None,
|
||||
target_point=None,
|
||||
focus=None,
|
||||
deps=FaceDetectionDependencies(
|
||||
cfg=cfg,
|
||||
devs=devs,
|
||||
mlbox=types.SimpleNamespace(
|
||||
predict=lambda **kwargs: types.SimpleNamespace(
|
||||
box=None,
|
||||
target_point=None,
|
||||
focus=None,
|
||||
),
|
||||
),
|
||||
),
|
||||
runtime=runtime_state,
|
||||
progress_emitter=progress_emitter
|
||||
services=services,
|
||||
settings=FaceDetectionSettings(),
|
||||
)
|
||||
ctx._progress_events = progress_events
|
||||
return ctx
|
||||
@@ -86,7 +95,7 @@ def test_service_returns_empty_payload_when_no_boxes(monkeypatch, context, mock_
|
||||
service = FaceDetectionService(context=context, logger=mock_logger)
|
||||
|
||||
monkeypatch.setattr(
|
||||
context.mlbox,
|
||||
context.deps.mlbox,
|
||||
"predict",
|
||||
lambda **kwargs: types.SimpleNamespace(
|
||||
box=None,
|
||||
@@ -103,7 +112,7 @@ def test_service_returns_empty_payload_when_no_boxes(monkeypatch, context, mock_
|
||||
assert result.payload["samples"] == []
|
||||
assert result.payload["height_fit"] == {}
|
||||
assert result.payload["area_fit"] == {}
|
||||
assert context.cfg.zoom_mode == ZoomModeEnum.User
|
||||
assert context.deps.cfg.zoom_mode == ZoomModeEnum.User
|
||||
assert len(context._progress_events) >= 1
|
||||
assert context._progress_events[-1]["running"] is False
|
||||
|
||||
@@ -120,7 +129,7 @@ def test_service_prefers_face_boxes_when_ratio_is_high(monkeypatch, context, moc
|
||||
]
|
||||
)
|
||||
|
||||
monkeypatch.setattr(context.mlbox, "predict", lambda **kwargs: next(predictions))
|
||||
monkeypatch.setattr(context.deps.mlbox, "predict", lambda **kwargs: next(predictions))
|
||||
|
||||
monkeypatch.setattr(
|
||||
"aare.daq.operations.face_detection.service.fd.get_flat_face",
|
||||
@@ -144,7 +153,7 @@ def test_service_prefers_face_boxes_when_ratio_is_high(monkeypatch, context, moc
|
||||
assert result.payload["running"] is False
|
||||
assert result.payload["height_fit"]["best_angle_deg"] == 50
|
||||
assert result.payload["area_fit"]["best_angle_deg"] == 45
|
||||
assert context.devs.aerotech_omega == 47
|
||||
assert context.deps.devs.aerotech_omega == 47
|
||||
assert [sample["angle"] for sample in result.payload["samples"]] == [0, 30, 90]
|
||||
assert context._progress_events[-1]["running"] is False
|
||||
|
||||
@@ -162,7 +171,7 @@ def test_service_falls_back_to_loop_all_when_face_ratio_is_low(monkeypatch, cont
|
||||
]
|
||||
)
|
||||
|
||||
monkeypatch.setattr(context.mlbox, "predict", lambda **kwargs: next(predictions))
|
||||
monkeypatch.setattr(context.deps.mlbox, "predict", lambda **kwargs: next(predictions))
|
||||
|
||||
captured = {}
|
||||
|
||||
@@ -185,7 +194,7 @@ def test_service_falls_back_to_loop_all_when_face_ratio_is_low(monkeypatch, cont
|
||||
assert result.success is True
|
||||
assert len(captured["boxes_used"]) == 4
|
||||
assert sorted(captured["boxes_used"].keys()) == [30, 60, 90, 120]
|
||||
assert context.devs.aerotech_omega == 60
|
||||
assert context.deps.devs.aerotech_omega == 60
|
||||
assert context._progress_events[-1]["running"] is False
|
||||
|
||||
|
||||
@@ -196,16 +205,16 @@ def test_service_applies_centre_correction_when_target_is_far_from_beam(monkeypa
|
||||
|
||||
service._centre_correction(model, tolerance=0.2)
|
||||
|
||||
assert isinstance(context.devs.smargon_pos, SmargonCoordinate)
|
||||
assert context.devs.smargon_pos.sh_mm.x == pytest.approx(1.0)
|
||||
assert context.devs.smargon_pos.sh_mm.y == pytest.approx(1.8)
|
||||
assert isinstance(context.deps.devs.smargon_pos, SmargonCoordinate)
|
||||
assert context.deps.devs.smargon_pos.sh_mm.x == pytest.approx(1.0)
|
||||
assert context.deps.devs.smargon_pos.sh_mm.y == pytest.approx(1.8)
|
||||
|
||||
|
||||
def test_service_returns_failed_result_when_prediction_raises(monkeypatch, context, mock_logger):
|
||||
service = FaceDetectionService(context=context, logger=mock_logger)
|
||||
|
||||
monkeypatch.setattr(
|
||||
context.mlbox,
|
||||
context.deps.mlbox,
|
||||
"predict",
|
||||
lambda **kwargs: (_ for _ in ()).throw(RuntimeError("prediction failed")),
|
||||
)
|
||||
@@ -216,5 +225,5 @@ def test_service_returns_failed_result_when_prediction_raises(monkeypatch, conte
|
||||
assert isinstance(result.error, RuntimeError)
|
||||
assert result.comment == "Face detection sequence failed"
|
||||
assert result.payload["running"] is False
|
||||
assert context.cfg.zoom_mode == ZoomModeEnum.User
|
||||
assert context.deps.cfg.zoom_mode == ZoomModeEnum.User
|
||||
assert context._progress_events[-1]["running"] is False
|
||||
@@ -5,10 +5,16 @@ import pytest
|
||||
from aare.common.coordinate import Coordinate, SmargonCoordinate
|
||||
from aare.common.models import MLBoxType, MLOutputModel
|
||||
from aare.daq.mlbox import MLBoxPredictionsResult
|
||||
from aare.daq.operations.common.runtime import DAQRuntimeState, TraceWriter, PredictionProvider, OperationServices
|
||||
from aare.daq.operations.common.runtime import DAQRuntimeState
|
||||
from aare.daq.operations.common.services import (
|
||||
TraceWriter,
|
||||
PredictionProvider,
|
||||
OperationServices,
|
||||
)
|
||||
from aare.daq.operations.loop_centering.analyzer import LoopCenteringAnalyzer
|
||||
from aare.daq.operations.loop_centering.models import (
|
||||
LoopCenteringContext,
|
||||
LoopCenteringDependencies,
|
||||
LoopCenteringSettings,
|
||||
)
|
||||
|
||||
@@ -43,29 +49,31 @@ def analyzer(mock_logger):
|
||||
)
|
||||
|
||||
ctx = LoopCenteringContext(
|
||||
cfg=types.SimpleNamespace(),
|
||||
devs=types.SimpleNamespace(),
|
||||
mlbox=DummyMlBox(),
|
||||
settings=LoopCenteringSettings(),
|
||||
deps=LoopCenteringDependencies(
|
||||
cfg=types.SimpleNamespace(),
|
||||
devs=types.SimpleNamespace(),
|
||||
mlbox=DummyMlBox(),
|
||||
),
|
||||
runtime=runtime_state,
|
||||
services=OperationServices(
|
||||
screenshots=types.SimpleNamespace(
|
||||
save_to_db=lambda *args, **kwargs: None
|
||||
)
|
||||
),
|
||||
trace_writer=TraceWriter(
|
||||
appender=types.SimpleNamespace(append_smargon_trace=lambda *args, **kwargs: None)
|
||||
),
|
||||
prediction_provider=PredictionProvider(
|
||||
getter=types.SimpleNamespace(
|
||||
get_predictions=lambda: MLBoxPredictionsResult(
|
||||
predictions=None,
|
||||
image=None,
|
||||
target_point=None,
|
||||
focus=None,
|
||||
),
|
||||
traces=TraceWriter(
|
||||
appender=types.SimpleNamespace(append_smargon_trace=lambda *args, **kwargs: None)
|
||||
),
|
||||
predictions=PredictionProvider(
|
||||
getter=types.SimpleNamespace(
|
||||
get_predictions=lambda: MLBoxPredictionsResult(
|
||||
predictions=None,
|
||||
image=None,
|
||||
target_point=None,
|
||||
focus=None,
|
||||
)
|
||||
)
|
||||
)
|
||||
),
|
||||
),
|
||||
settings=LoopCenteringSettings(),
|
||||
)
|
||||
return LoopCenteringAnalyzer(context=ctx, logger=mock_logger)
|
||||
|
||||
@@ -142,7 +150,7 @@ def test_analyze_angle_with_crystal_prediction_returns_valid_target(analyzer):
|
||||
boxes = MLOutputModel()
|
||||
boxes.add_box(MLBoxType.CRYSTAL, (10, 20, 30, 40), conf=0.9)
|
||||
|
||||
analyzer.ctx.prediction_provider.getter.get_predictions = lambda: MLBoxPredictionsResult(
|
||||
analyzer.ctx.services.predictions.getter.get_predictions = lambda: MLBoxPredictionsResult(
|
||||
predictions=boxes,
|
||||
image=None,
|
||||
target_point=(25.0, 30.0),
|
||||
|
||||
@@ -3,10 +3,16 @@ import types
|
||||
import pytest
|
||||
|
||||
from aare.common.models import LoopCenteringResult
|
||||
from aare.daq.operations.common.runtime import DAQRuntimeState, OperationServices, TraceWriter, PredictionProvider
|
||||
from aare.daq.operations.common.runtime import DAQRuntimeState
|
||||
from aare.daq.operations.common.services import (
|
||||
OperationServices,
|
||||
TraceWriter,
|
||||
PredictionProvider,
|
||||
)
|
||||
from aare.daq.operations.loop_centering.models import (
|
||||
AngleAnalysis,
|
||||
LoopCenteringContext,
|
||||
LoopCenteringDependencies,
|
||||
LoopCenteringSettings,
|
||||
)
|
||||
from aare.daq.operations.loop_centering.service import LoopCenteringService
|
||||
@@ -31,24 +37,26 @@ def context():
|
||||
)
|
||||
|
||||
ctx = LoopCenteringContext(
|
||||
cfg=types.SimpleNamespace(),
|
||||
devs=devs,
|
||||
mlbox=types.SimpleNamespace(),
|
||||
settings=LoopCenteringSettings(),
|
||||
deps=LoopCenteringDependencies(
|
||||
cfg=types.SimpleNamespace(),
|
||||
devs=devs,
|
||||
mlbox=types.SimpleNamespace(),
|
||||
),
|
||||
runtime=runtime_state,
|
||||
services=OperationServices(
|
||||
screenshots=types.SimpleNamespace(
|
||||
save_to_db=lambda sample_id, filename, wait=0.0: screenshots.append((sample_id, filename, wait))
|
||||
)
|
||||
),
|
||||
trace_writer=TraceWriter(
|
||||
appender=types.SimpleNamespace(
|
||||
append_smargon_trace=lambda **kwargs: traces.append(kwargs)
|
||||
)
|
||||
),
|
||||
prediction_provider=PredictionProvider(
|
||||
getter=types.SimpleNamespace(get_predictions=lambda: None)
|
||||
),
|
||||
traces=TraceWriter(
|
||||
appender=types.SimpleNamespace(
|
||||
append_smargon_trace=lambda **kwargs: traces.append(kwargs)
|
||||
)
|
||||
),
|
||||
predictions=PredictionProvider(
|
||||
getter=types.SimpleNamespace(get_predictions=lambda: None)
|
||||
),
|
||||
),
|
||||
settings=LoopCenteringSettings(),
|
||||
)
|
||||
ctx._screenshots = screenshots
|
||||
ctx._traces = traces
|
||||
@@ -126,5 +134,5 @@ def test_service_uses_settings_values(monkeypatch, context, mock_logger):
|
||||
|
||||
result = service.run(sample_id=3)
|
||||
|
||||
assert context.devs.zoom == 250.0
|
||||
assert context.deps.devs.zoom == 250.0
|
||||
assert result.success is False
|
||||
@@ -5,7 +5,7 @@ from aare.common.coordinate import AerotechCoordinate, Coordinate
|
||||
from aare.common.exception_handler import CriticalTellException, MountingFailed
|
||||
from aare.common.models import DewarAddress, SampleShortInfo
|
||||
from aare.devices.tell_client import TellEventValueEnum
|
||||
from aare.daq.operations.mounting.models import MountingContext, MountingResult
|
||||
from aare.daq.operations.mounting.models import MountingContext, MountingResult, MountingDependencies, MountingSettings
|
||||
from aare.daq.operations.mounting.service import MountingService
|
||||
|
||||
|
||||
@@ -64,9 +64,13 @@ def _make_context(previous_sample=None):
|
||||
)
|
||||
|
||||
return MountingContext(
|
||||
cfg=cfg,
|
||||
devs=devs,
|
||||
mount_position=AerotechCoordinate(at_mm=Coordinate(x=0, y=0, z=0), omega_deg=0),
|
||||
deps=MountingDependencies(
|
||||
cfg=cfg,
|
||||
devs=devs,
|
||||
),
|
||||
settings=MountingSettings(
|
||||
mount_position=AerotechCoordinate(at_mm=Coordinate(x=0, y=0, z=0), omega_deg=0),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -84,7 +88,7 @@ def test_execute_mount_success(mock_logger):
|
||||
assert result.mounted_sample == target_sample
|
||||
assert result.previous_sample == previous_sample
|
||||
assert result.did_unmount_previous is True
|
||||
assert ctx.cfg.current_sample == target_sample
|
||||
assert ctx.deps.cfg.current_sample == target_sample
|
||||
|
||||
|
||||
def test_execute_unmount_success(mock_logger):
|
||||
@@ -99,13 +103,13 @@ def test_execute_unmount_success(mock_logger):
|
||||
assert result.mounted_sample is None
|
||||
assert result.previous_sample == previous_sample
|
||||
assert result.did_unmount_previous is True
|
||||
assert ctx.cfg.current_sample is None
|
||||
assert ctx.deps.cfg.current_sample is None
|
||||
|
||||
|
||||
def test_execute_mount_returns_failed_result_for_no_pin_in_gripper(mock_logger):
|
||||
target_sample = _make_sample(2, "new")
|
||||
ctx = _make_context()
|
||||
ctx.devs.tell.mount = lambda **kwargs: TellEventValueEnum.NO_PIN_IN_GRIPPER
|
||||
ctx.deps.devs.tell.mount = lambda **kwargs: TellEventValueEnum.NO_PIN_IN_GRIPPER
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
|
||||
@@ -119,7 +123,7 @@ def test_execute_mount_returns_failed_result_for_no_pin_in_gripper(mock_logger):
|
||||
def test_execute_mount_returns_failed_result_for_unhandled_tell_response(mock_logger):
|
||||
target_sample = _make_sample(2, "new")
|
||||
ctx = _make_context()
|
||||
ctx.devs.tell.mount = lambda **kwargs: TellEventValueEnum.UNKNOWN
|
||||
ctx.deps.devs.tell.mount = lambda **kwargs: TellEventValueEnum.UNKNOWN
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
|
||||
@@ -136,14 +140,14 @@ def test_dry_unmounts_current_sample_before_drying(mock_logger):
|
||||
unmount_calls = []
|
||||
dry_calls = []
|
||||
|
||||
ctx.devs.tell.unmount = lambda **kwargs: unmount_calls.append(kwargs)
|
||||
ctx.devs.tell.dry = lambda **kwargs: dry_calls.append(kwargs)
|
||||
ctx.deps.devs.tell.unmount = lambda **kwargs: unmount_calls.append(kwargs)
|
||||
ctx.deps.devs.tell.dry = lambda **kwargs: dry_calls.append(kwargs)
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
service.dry(park=True, unmount=True)
|
||||
|
||||
assert len(unmount_calls) == 1
|
||||
assert ctx.cfg.current_sample is None
|
||||
assert ctx.deps.cfg.current_sample is None
|
||||
assert dry_calls == [{"wait_cold": -1, "wait": True}]
|
||||
|
||||
|
||||
@@ -152,10 +156,10 @@ def test_execute_mount_triggers_dry_on_third_consecutive_failure(mock_logger):
|
||||
dry_calls = []
|
||||
|
||||
ctx = _make_context()
|
||||
ctx.devs.tell.mount = lambda **kwargs: TellEventValueEnum.NO_PIN_IN_GRIPPER
|
||||
ctx.devs.tell.dry = lambda **kwargs: dry_calls.append(kwargs)
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.devs.tell.mount = lambda **kwargs: TellEventValueEnum.NO_PIN_IN_GRIPPER
|
||||
ctx.deps.devs.tell.dry = lambda **kwargs: dry_calls.append(kwargs)
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
|
||||
@@ -172,12 +176,12 @@ def test_execute_mount_stops_automation_on_fifth_consecutive_failure(mock_logger
|
||||
dry_calls = []
|
||||
|
||||
ctx = _make_context()
|
||||
ctx.devs.tell.mount = lambda **kwargs: TellEventValueEnum.NO_PIN_IN_GRIPPER
|
||||
ctx.devs.tell.dry = lambda **kwargs: dry_calls.append(kwargs)
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.devs.tell.mount = lambda **kwargs: TellEventValueEnum.NO_PIN_IN_GRIPPER
|
||||
ctx.deps.devs.tell.dry = lambda **kwargs: dry_calls.append(kwargs)
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
|
||||
@@ -194,15 +198,15 @@ def test_execute_mount_success_resets_failure_streak(mock_logger):
|
||||
previous_sample = _make_sample(1, "old")
|
||||
target_sample = _make_sample(2, "new")
|
||||
ctx = _make_context(previous_sample=previous_sample)
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
ctx.deps.cfg.increment_mount_failure_streak()
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
|
||||
result = service.execute(target=target_sample)
|
||||
|
||||
assert result.success is True
|
||||
assert ctx.cfg.get_mount_failure_streak() == 0
|
||||
assert ctx.deps.cfg.get_mount_failure_streak() == 0
|
||||
|
||||
|
||||
def test_execute_mount_critical_tell_error_does_not_increment_failure_streak(mock_logger):
|
||||
@@ -212,7 +216,7 @@ def test_execute_mount_critical_tell_error_does_not_increment_failure_streak(moc
|
||||
def mount(**kwargs):
|
||||
raise CriticalTellException("critical tell problem")
|
||||
|
||||
ctx.devs.tell.mount = mount
|
||||
ctx.deps.devs.tell.mount = mount
|
||||
|
||||
service = MountingService(context=ctx, logger=mock_logger)
|
||||
|
||||
@@ -220,4 +224,4 @@ def test_execute_mount_critical_tell_error_does_not_increment_failure_streak(moc
|
||||
|
||||
assert result.success is False
|
||||
assert isinstance(result.error, CriticalTellException)
|
||||
assert ctx.cfg.get_mount_failure_streak() == 0
|
||||
assert ctx.deps.cfg.get_mount_failure_streak() == 0
|
||||
@@ -9,7 +9,7 @@ from aare.common.models import DewarAddress, SampleShortInfo, DAQOperation
|
||||
from aare.common.tell_models import TellActivityEnum, TellPhaseEnum, TellStateModel
|
||||
from aare.daq.config import ABR_POS_MOUNT, BeamlineStateEnum
|
||||
from aare.daq.daq import AareDAQ
|
||||
from aare.daq.operations.mounting.models import MountingResult
|
||||
from aare.daq.operations.mounting.models import MountingResult, MountingContext
|
||||
from aare.daq.operations.mounting.service import MountingService
|
||||
from aare.daq.operations.screenshot.service import ScreenshotService
|
||||
|
||||
@@ -51,11 +51,10 @@ def bare_daq():
|
||||
def test_create_mounting_service_builds_expected_context(mock_logger, bare_daq):
|
||||
service = bare_daq._create_mounting_service()
|
||||
|
||||
assert isinstance(service, MountingService)
|
||||
assert service.ctx.cfg is bare_daq._AareDAQ__cfg
|
||||
assert service.ctx.devs is bare_daq._AareDAQ__devs
|
||||
assert service.ctx.mount_position == ABR_POS_MOUNT
|
||||
|
||||
assert isinstance(service.ctx, MountingContext)
|
||||
assert service.ctx.deps.cfg is bare_daq._AareDAQ__cfg
|
||||
assert service.ctx.deps.devs is bare_daq._AareDAQ__devs
|
||||
assert service.ctx.settings.mount_position == ABR_POS_MOUNT
|
||||
|
||||
def test_was_previous_sample_unmounted_since_prefers_tell_phase_confirmation():
|
||||
previous_sample = _make_sample(1, "old")
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import types
|
||||
|
||||
import pytest
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import MagicMock
|
||||
@@ -6,7 +8,13 @@ from jfjoch_client.exceptions import NotFoundException
|
||||
|
||||
from aare.common.coordinate import Coordinate, SmargonCoordinate
|
||||
from aare.common.raster_grid import RasterGridRequest
|
||||
from aare.daq.operations.raster.models import RasterContext
|
||||
from aare.daq.operations.common.runtime import DAQRuntimeState
|
||||
from aare.daq.operations.common.services import OperationServices
|
||||
from aare.daq.operations.raster.models import (
|
||||
RasterContext,
|
||||
RasterDependencies,
|
||||
RasterSettings,
|
||||
)
|
||||
from aare.daq.operations.raster.service import RasterService
|
||||
|
||||
|
||||
@@ -23,25 +31,52 @@ def make_request(n_x: int, n_y: int, cell_x: float = 0.01, cell_y: float = 0.02)
|
||||
)
|
||||
|
||||
|
||||
def make_service() -> RasterService:
|
||||
runtime = SimpleNamespace(
|
||||
sample=None,
|
||||
sample_geometry=SimpleNamespace(),
|
||||
status=SimpleNamespace(),
|
||||
def _make_raster_context(*, jfjoch, aare, sample=None):
|
||||
deps = RasterDependencies(
|
||||
cfg=types.SimpleNamespace(
|
||||
simulated_detector=False,
|
||||
abr_meas_pos=types.SimpleNamespace(at_mm=Coordinate(x=0.0, y=0.0, z=0.0)),
|
||||
get_beam_mark=lambda zoom: (0.0, 0.0),
|
||||
),
|
||||
devs=types.SimpleNamespace(
|
||||
aerotech_omega=0.0,
|
||||
zoom=100.0,
|
||||
),
|
||||
mlbox=types.SimpleNamespace(),
|
||||
jfjoch=jfjoch,
|
||||
aare=aare,
|
||||
)
|
||||
context = RasterContext(
|
||||
cfg=MagicMock(),
|
||||
devs=MagicMock(),
|
||||
mlbox=MagicMock(),
|
||||
jfjoch=MagicMock(),
|
||||
aare=MagicMock(),
|
||||
runtime=runtime,
|
||||
state_controller=MagicMock(),
|
||||
services=MagicMock(),
|
||||
|
||||
runtime = DAQRuntimeState(
|
||||
sample_provider=types.SimpleNamespace(sample=sample),
|
||||
sample_geometry_provider=types.SimpleNamespace(
|
||||
sample_geometry=types.SimpleNamespace()
|
||||
),
|
||||
status_provider=types.SimpleNamespace(status=None),
|
||||
)
|
||||
|
||||
services = OperationServices(
|
||||
screenshots=types.SimpleNamespace(save_to_db=lambda *args, **kwargs: None),
|
||||
)
|
||||
|
||||
settings = RasterSettings(
|
||||
auto_raster_max_images=4500,
|
||||
auto_raster_min_cell_size_mm=0.005,
|
||||
auto_raster_skip_if_exceed_max_image_threshold=True,
|
||||
)
|
||||
|
||||
return RasterContext(
|
||||
deps=deps,
|
||||
runtime=runtime,
|
||||
services=services,
|
||||
settings=settings,
|
||||
)
|
||||
|
||||
|
||||
def make_service() -> RasterService:
|
||||
jfjoch = MagicMock()
|
||||
aare = MagicMock()
|
||||
context = _make_raster_context(jfjoch=jfjoch, aare=aare)
|
||||
return RasterService(context=context, logger=MagicMock())
|
||||
|
||||
|
||||
@@ -139,8 +174,8 @@ def test_upload_raster_diffraction_preview_skips_out_of_range_image_id():
|
||||
request=request,
|
||||
)
|
||||
|
||||
service.ctx.jfjoch.get_diffraction_image.assert_not_called()
|
||||
service.ctx.aare.upload_jpg.assert_not_called()
|
||||
service.ctx.deps.jfjoch.get_diffraction_image.assert_not_called()
|
||||
service.ctx.deps.aare.upload_jpg.assert_not_called()
|
||||
|
||||
|
||||
def test_upload_raster_diffraction_preview_ignores_not_found():
|
||||
@@ -149,7 +184,7 @@ def test_upload_raster_diffraction_preview_ignores_not_found():
|
||||
request = make_request(2, 2)
|
||||
scan_result = MagicMock()
|
||||
scan_result.images = [MagicMock(), MagicMock(), MagicMock(), MagicMock()]
|
||||
service.ctx.jfjoch.get_diffraction_image.side_effect = NotFoundException()
|
||||
service.ctx.deps.jfjoch.get_diffraction_image.side_effect = NotFoundException()
|
||||
|
||||
service._upload_raster_diffraction_preview(
|
||||
sample_id=123,
|
||||
@@ -159,8 +194,8 @@ def test_upload_raster_diffraction_preview_ignores_not_found():
|
||||
request=request,
|
||||
)
|
||||
|
||||
service.ctx.jfjoch.get_diffraction_image.assert_called_once_with(2)
|
||||
service.ctx.aare.upload_jpg.assert_not_called()
|
||||
service.ctx.deps.jfjoch.get_diffraction_image.assert_called_once_with(2)
|
||||
service.ctx.deps.aare.upload_jpg.assert_not_called()
|
||||
|
||||
|
||||
def test_upload_raster_diffraction_preview_uploads_when_present():
|
||||
@@ -169,7 +204,7 @@ def test_upload_raster_diffraction_preview_uploads_when_present():
|
||||
request = make_request(2, 2)
|
||||
scan_result = MagicMock()
|
||||
scan_result.images = [MagicMock(), MagicMock(), MagicMock(), MagicMock()]
|
||||
service.ctx.jfjoch.get_diffraction_image.return_value = b"jpeg-bytes"
|
||||
service.ctx.deps.jfjoch.get_diffraction_image.return_value = b"jpeg-bytes"
|
||||
|
||||
service._upload_raster_diffraction_preview(
|
||||
sample_id=123,
|
||||
@@ -179,5 +214,5 @@ def test_upload_raster_diffraction_preview_uploads_when_present():
|
||||
request=request,
|
||||
)
|
||||
|
||||
service.ctx.jfjoch.get_diffraction_image.assert_called_once_with(2)
|
||||
service.ctx.aare.upload_jpg.assert_called_once_with(123, "preview", b"jpeg-bytes")
|
||||
service.ctx.deps.jfjoch.get_diffraction_image.assert_called_once_with(2)
|
||||
service.ctx.deps.aare.upload_jpg.assert_called_once_with(123, "preview", b"jpeg-bytes")
|
||||
@@ -1,7 +1,7 @@
|
||||
import pytest
|
||||
from unittest.mock import MagicMock, patch
|
||||
from aare.daq.workflows import common_2rse, sa2se, sa2rse, sa2xtal_snapshot, dc2xtal_snapshot, xtal_snapshot2dc, xtal_snapshot2sa, dc2rse, se2sa, sa2dc, dc2sa, sa2xrf, sa2dh, dh2sa
|
||||
from aare.daq.config import ABR_POS_MOUNT
|
||||
from aare.daq.config import ABR_POS_MOUNT, ABR_OMEGA_MOUNT
|
||||
from aare.common.models import StagePositionEnum
|
||||
from aare.devices.area_detector import AutoEnum
|
||||
from aare.devices.bec_worker import BeamlineState
|
||||
@@ -99,7 +99,8 @@ def test_sa2se(mock_devs, mock_cfg):
|
||||
|
||||
mock_devs.samcam_auto.assert_any_call(AutoEnum.AUTO)
|
||||
_assert_bec_moved(mock_devs, BeamlineState.MANUAL_SAMPLE_EXCHANGE)
|
||||
assert mock_devs.aerotech_pos == mock_cfg.abr_meas_pos
|
||||
assert mock_devs.aerotech_pos == ABR_POS_MOUNT
|
||||
assert mock_devs.aerotech_omega == ABR_OMEGA_MOUNT
|
||||
mock_devs.smargon_move_home.assert_called_once()
|
||||
mock_devs.samcam_auto.assert_any_call(AutoEnum.ONCE)
|
||||
|
||||
|
||||
Reference in new issue
Block a user