fix: partial fix for modalities with underscores

src/aind_data_schema/core/metadata.py

@@ -206,7 +206,8 @@ def validate_expected_files_by_modality(self):
             for modality in modalities:
                 for file in CORE_FILES:
                     #  For each field, check if this is a required/excluded file
-                    file_requirement = getattr(getattr(ExpectedFiles, str(modality.abbreviation).upper()), file)
+                    abbreviation = modality["abbreviation"].replace("-", "_").upper()
+                    file_requirement = getattr(getattr(ExpectedFiles, abbreviation), file)
 
                     if file not in requirement_dict:
                         requirement_dict[file] = file_requirement

tests/test_metadata.py

@@ -273,6 +273,34 @@ def test_validate_ecephys_metadata(self):
             )
         self.assertIn("Injection is missing injection_materials.", str(context.exception))
 
+
+
+    def test_validate_underscore_modality(self):
+        """Tests that ecephys validator works as expected"""
+        viral_material = ViralMaterial.model_construct()
+        nano_inj = NanojectInjection.model_construct()
+        ionto_inj = IontophoresisInjection.model_construct(injection_materials=[viral_material])
+
+        # Tests missing metadata
+        surgery1 = Surgery.model_construct(procedures=[nano_inj, ionto_inj])
+        with self.assertRaises(ValueError) as context:
+            Metadata(
+                name="ecephys_655019_2023-04-03_18-17-09",
+                location="bucket",
+                data_description=DataDescription.model_construct(
+                    label="some label",
+                    platform=Platform.ECEPHYS,
+                    creation_time=time(12, 12, 12),
+                    modality=[Modality.BEHAVIOR_VIDEOS],
+                ),
+                procedures=Procedures.model_construct(subject_procedures=[surgery1]),
+                rig=Rig.model_construct(),
+            )
+        self.assertIn(
+            "ecephys metadata missing required file: subject",
+            str(context.exception),
+        )
+
     def test_validate_rig_session_compatibility(self):
         """Tests that rig/session compatibility validator works as expected"""
         mouse_platform = MousePlatform.model_construct(name="platform1")