fix: recursively get all component names (#1516)

* fix: repair a bug where get_component_names() wasn't being used to recursively get all component names

* tests: fix bad tests that weren't resetting properly

Author: dbirman

src/aind_data_schema/core/instrument.py

@@ -165,12 +165,11 @@ class Instrument(DataCoreModel):
         description="List of all devices in the instrument",
     )
 
-    @classmethod
-    def get_component_names(cls, instrument: "Instrument") -> List[str]:
+    def get_component_names(self) -> List[str]:
         """Get the name field of all components, recurse into assemblies."""
 
         names = []
-        for component in instrument.components:
+        for component in self.components:
             names.extend(recursive_get_all_names(component))
         names = [name for name in names if name is not None]
 
@@ -199,7 +198,7 @@ def validate_cameras_other(self):
     @classmethod
     def validate_connections(cls, self):
         """validate that all connections map between devices that actually exist"""
-        device_names = Instrument.get_component_names(self)
+        device_names = self.get_component_names()
 
         for connection in self.connections:
             # Check both source and target devices exist

src/aind_data_schema/core/metadata.py

@@ -203,8 +203,7 @@ def validate_acquisition_active_devices(cls, values):
         device_names = []
 
         if values.instrument:
-            for component in values.instrument.components:
-                device_names.append(component.name)
+            device_names.extend(values.instrument.get_component_names())
         if values.procedures:
             device_names.extend(values.procedures.get_device_names())
 
@@ -226,8 +225,7 @@ def validate_acquisition_connections(self):
         device_names = []
 
         if self.instrument:
-            for component in self.instrument.components:
-                device_names.append(component.name)
+            device_names.extend(self.instrument.get_component_names())
         if self.procedures:
             device_names.extend(self.procedures.get_device_names())
 

src/aind_data_schema/utils/compatibility_check.py

@@ -31,7 +31,7 @@ def _compare_stimulus_devices(self) -> Optional[ValueError]:
             for stimulus_epoch in getattr(self.acquisition, "stimulus_epochs", [])
             for stimulus_device_name in getattr(stimulus_epoch, "active_devices")
         ]
-        instrument_component_names = [getattr(comp, "name", None) for comp in getattr(self.inst, "components", [])]
+        instrument_component_names = self.inst.get_component_names()
 
         if any(device not in instrument_component_names for device in acquisition_stimulus_devices):
             return ValueError(

tests/test_compatibility_check.py

@@ -26,6 +26,8 @@ def setUp(self):
         device1.name = "component_2"
 
         self.mock_instrument.components = [device0, device1]
+        # Mock the get_component_names method to return the expected component names
+        self.mock_instrument.get_component_names.return_value = ["component_1", "component_2"]
 
         # Mock acquisition attributes
         self.mock_acquisition.instrument_id = "instrument_1"