From 37795757188394db80a74b568f98869c5fafda3c Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Tue, 7 Jan 2025 14:03:57 -0800 Subject: [PATCH 1/2] feat: remove references to PowerValue --- examples/exaspim_acquisition.py | 12 +++++++++--- tests/test_imaging.py | 22 +++++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/examples/exaspim_acquisition.py b/examples/exaspim_acquisition.py index 68cc6a344..1f659e9e9 100644 --- a/examples/exaspim_acquisition.py +++ b/examples/exaspim_acquisition.py @@ -5,7 +5,7 @@ from aind_data_schema_models.organizations import Organization from aind_data_schema_models.pid_names import PIDName from aind_data_schema_models.registries import Registry -from aind_data_schema_models.units import PowerValue +from aind_data_schema_models.units import PowerUnit from aind_data_schema.components import tile from aind_data_schema.components.coordinates import ImageAxis, Scale3dTransform, Translation3dTransform @@ -44,8 +44,14 @@ calibration_date=t, device_name="Laser_1", description="Laser power calibration", - input={"power_setting": PowerValue(value=100.0, unit="percent")}, - output={"power_measurement": PowerValue(value=50.0, unit="milliwatt")}, + input={ + "power_setting": 100.0, + "power_unit": PowerUnit.PERCENT + }, + output={ + "power_measurement": 50.0, + "power_unit": PowerUnit.MW, + }, ) ], session_start_time=t, diff --git a/tests/test_imaging.py b/tests/test_imaging.py index c1940d714..4f1007efd 100644 --- a/tests/test_imaging.py +++ b/tests/test_imaging.py @@ -5,7 +5,7 @@ from datetime import date, datetime, timezone from aind_data_schema_models.organizations import Organization -from aind_data_schema_models.units import PowerValue, FrequencyUnit +from aind_data_schema_models.units import PowerUnit, FrequencyUnit from pydantic import ValidationError from pydantic import __version__ as pyd_version @@ -43,8 +43,14 @@ def test_constructors(self): calibration_date=datetime.now(tz=timezone.utc), description="Laser power calibration", device_name="Laser 1", - input={"power_setting": PowerValue(value=100.0, unit="percent")}, - output={"power_measurement": PowerValue(value=50.0, unit="milliwatt")}, + input={ + "power_setting": 100.0, + "power_unit": PowerUnit.PERCENT + }, + output={ + "power_measurement": 50.0, + "power_unit": PowerUnit.MW, + }, ), ], session_end_time=datetime.now(tz=timezone.utc), @@ -144,8 +150,14 @@ def test_axis(self): calibration_date=datetime.now(tz=timezone.utc), description="Laser power calibration", device_name="Laser 1", - input={"power_setting": PowerValue(value=100.0, unit="percent")}, - output={"power_measurement": PowerValue(value=50.0, unit="milliwatt")}, + input={ + "power_setting": 100.0, + "power_unit": PowerUnit.PERCENT + }, + output={ + "power_measurement": 50.0, + "power_unit": PowerUnit.MW, + }, ), ], session_end_time=datetime.now(tz=timezone.utc), From 054f2e56541319395e14bee4d731b3845ad42104 Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Tue, 7 Jan 2025 14:07:41 -0800 Subject: [PATCH 2/2] tests: re-generate examples --- examples/exaspim_acquisition.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/exaspim_acquisition.json b/examples/exaspim_acquisition.json index d7182a70c..c02e9b2c5 100644 --- a/examples/exaspim_acquisition.json +++ b/examples/exaspim_acquisition.json @@ -14,16 +14,12 @@ "device_name": "Laser_1", "description": "Laser power calibration", "input": { - "power_setting": { - "value": "100.0", - "unit": "percent" - } + "power_setting": 100.0, + "power_unit": "percent" }, "output": { - "power_measurement": { - "value": "50.0", - "unit": "milliwatt" - } + "power_measurement": 50.0, + "power_unit": "milliwatt" }, "notes": null }