adding validator to instrument

Author: Sun-flow

src/aind_data_schema/imaging/instrument.py

@@ -150,6 +150,45 @@ class Instrument(AindCoreModel):
     com_ports: Optional[List[Com]] = Field(None, title="COM ports", unique_items=True)
     notes: Optional[str] = None
 
+    @root_validator
+    def validate_device_names(cls, values):  # noqa: C901
+        """validate that all DAQ channels are connected to devices that
+        actually exist
+        """
+
+        device_names = []
+
+        optical_tables = values.get("optical_tables")
+        enclosure = values.get("enclosure")
+        lenses = values.get("lenses")
+        fluorescence_filters = values.get("fluorescence_filters")
+        motorized_stages = values.get("motorized_stages")
+        scanning_stages = values.get("scanning_stages")
+        light_sources = values.get("light_sources")
+        detectors = values.get("detectors") 
+        additional_devices = values.get("additional_devices")
+        daqs = values.get("daqs")
+
+        if daqs is None:
+            return values
+
+        for device_type in [daqs, light_sources, detectors, additional_devices, optical_tables, enclosure, lenses, fluorescence_filters, motorized_stages, scanning_stages]:
+            if device_type is not None:
+                device_names += [device.name for device in device_type]
+
+
+        for daq in daqs:
+            if daq.channels is not None:
+                for channel in daq.channels:
+                    if channel.device_name not in device_names:
+                        raise ValueError(
+                            f"Device name validation error: '{channel.device_name}' "
+                            + f"is connected to '{channel.channel_name}' on '{daq.name}', but "
+                            + "this device is not part of the rig."
+                        )
+
+        return values
+
     @root_validator
     def validate_other(cls, v):
         """Validator for other/notes"""

src/aind_data_schema/rig.py

@@ -110,10 +110,7 @@ def validate_device_names(cls, values):  # noqa: C901
         stick_microscopes = values.get("stick_microscopes")
         light_sources = values.get("light_sources")
         patch_coords = values.get("patch_cords")
-        detectors = values.get("detectors")
-        objectives = values.get("objectives")
-        filters = values.get("filters")
-        lenses = values.get("lenses")  
+        detectors = values.get("detectors") 
         digital_micromirror_devices = values.get("digital_micromirror_devices")
         polygonal_scanners = values.get("polygonal_scanners")
         pockels_cells = values.get("pockels_cells")
@@ -123,7 +120,7 @@ def validate_device_names(cls, values):  # noqa: C901
         if daqs is None:
             return values
 
-        for device_type in [daqs, stimulus_devices, light_sources, patch_coords,detectors, objectives, filters, lenses, digital_micromirror_devices, polygonal_scanners, pockels_cells, additional_devices]:
+        for device_type in [daqs, stimulus_devices, light_sources, patch_coords,detectors, digital_micromirror_devices, polygonal_scanners, pockels_cells, additional_devices]:
             if device_type is not None:
                 device_names += [device.name for device in device_type]