Merge pull request #818 from AllenNeuralDynamics/feat-787-MRI-updates

making MriScan.voxel_sizes optional

Author: saskiad

src/aind_data_schema/core/mri_session.py

@@ -56,7 +56,7 @@ class MRIScan(AindModel):
     vc_position: Optional[Translation3dTransform] = Field(None, title="Scan position")
     subject_position: SubjectPosition = Field(..., title="Subject position")
     # other fields
-    voxel_sizes: Scale3dTransform = Field(..., title="Voxel sizes", description="Resolution")
+    voxel_sizes: Optional[Scale3dTransform] = Field(None, title="Voxel sizes", description="Resolution")
     processing_steps: List[
         Literal[
             ProcessName.FIDUCIAL_SEGMENTATION,
@@ -83,8 +83,8 @@ def validate_primary_scan(self):
         """Validate that primary scan has vc_orientation and vc_position fields"""
 
         if self.primary_scan:
-            if not self.vc_orientation or not self.vc_position:
-                raise ValueError("Primary scan must have vc_orientation and vc_position")
+            if not self.vc_orientation or not self.vc_position or not self.voxel_sizes:
+                raise ValueError("Primary scan must have vc_orientation, vc_position, and voxel_sizes fields")
 
 
 class MriSession(AindCoreModel):

tests/test_imaging.py

@@ -335,8 +335,8 @@ def test_validators(self):
 
         expected_exception = (
             "1 validation error for MRIScan\n"
-            "  Value error, Primary scan must have vc_orientation and vc_position [type=value_error, "
-            "input_value={'scan_index': 1, 'scan_t... {'number_averages': 3}}, input_type=dict]\n"
+            "  Value error, Primary scan must have vc_orientation, vc_position, and voxel_sizes fields "
+            "[type=value_error, input_value={'scan_index': 1, 'scan_t... {'number_averages': 3}}, input_type=dict]\n"
             f"    For further information visit https://errors.pydantic.dev/{PYD_VERSION}/v/value_error"
         )
         self.assertEqual(expected_exception, repr(e.exception))