aind-data-schema 2.7.1__tar.gz → 2.8.0__tar.gz

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/.gitignore

@@ -146,3 +146,4 @@ examples/*.json
 *.json
 docs/base/models/*
 .github/copilot-instructions.md
+uv.lock

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: aind-data-schema
-Version: 2.7.1
+Version: 2.8.0
 Summary: A library that defines AIND data schema and validates JSON files.
 License: MIT
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aind-data-schema-models<6,>=5.4.1
+Requires-Dist: aind-data-schema-models<6,>=5.7.1
 Requires-Dist: pydantic<2.12,>=2.7
 Requires-Dist: pydantic-extra-types
 Requires-Dist: tzdata

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/acquisition.md

@@ -83,7 +83,6 @@ while the StimulusEpoch represents all stimuli being presented.
 | `acquisition_start_tz` | `int or pydantic_extra_types.timezone_name.TimeZoneName or NoneType` | Acquisition start timezone (Automatically populated by a validator based on acquisition_start_time. Will be a TimeZoneName (IANA name) when the datetime uses a ZoneInfo timezone, or an integer UTC offset in hours for fixed-offset timezones. Use ZoneInfo (from the zoneinfo standard library) to preserve the named timezone.) |
 | `acquisition_end_time` | `datetime (timezone-aware)` | Acquisition end time  |
 | `experimenters` | `List[str]` | experimenter(s)  |
-| `protocol_id` | `Optional[List[str]]` | Protocol ID (DOI for protocols.io) |
 | `ethics_review_id` | `Optional[List[str]]` | Ethics review ID  |
 | `instrument_id` | `Optional[str]` | Instrument ID (Should match the Instrument.instrument_id. Required when instrument metadata is available.) |
 | `acquisition_type` | `str` | Acquisition type (Descriptive string detailing the type of acquisition, should be consistent across similar acquisitions for the same experiment.) |
@@ -95,6 +94,7 @@ while the StimulusEpoch represents all stimuli being presented.
 | `stimulus_epochs` | List[[StimulusEpoch](acquisition.md#stimulusepoch)] | Stimulus (A stimulus epoch captures all stimuli being presented during an acquisition. Epochs should be split when the purpose of the stimulus changes.) |
 | `manipulations` | List[[Manipulation](acquisition.md#manipulation)] | Manipulations (Procedures performed during the acquisition.) |
 | `subject_details` | Optional[[AcquisitionSubjectDetails](acquisition.md#acquisitionsubjectdetails)] | Subject details (Required for in vivo acquisitions.) |
+| `protocol_id` | `Optional[List[str]]` | Protocol ID (DOI for protocols.io) |
 
 
 ## Model definitions
@@ -151,9 +151,10 @@ Description of procedures performed during an acquisition.
 |-------|------|-------------|
 | `start_time` | `datetime (timezone-aware)` | Manipulation start time (Must be between the acquisition start and end times) |
 | `end_time` | `datetime (timezone-aware)` | Manipulation end time (Must be between the acquisition start and end times) |
-| `procedures` | Optional[List[[Injection](components/injection_procedures.md#injection) or [BrainInjection](components/surgery_procedures.md#braininjection)]] | Procedures (Procedures performed during the manipulation) |
+| `procedures` | Optional[List[[Injection](components/injection_procedures.md#injection) or [BrainInjection](components/surgery_procedures.md#braininjection) or [Reagent](components/reagent.md#reagent)]] | Procedures (Procedures performed during the manipulation) |
 | `anaesthesia` | Optional[[Anaesthetic](components/surgery_procedures.md#anaesthetic)] | Anaesthesia  |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[List[str]]` | Protocol ID (DOI for protocols.io) |
 
 
 ### PerformanceMetrics

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/aind_data_schema_models/harp_types.md

@@ -18,6 +18,7 @@ Harp device types
 | `CURRENTDRIVER` | `CurrentDriver` | `1282` |
 | `CUTTLEFISH` | `cuTTLefish` | `1403` |
 | `CUTTLEFISHFIP` | `cuTTLefishFip` | `1407` |
+| `DELUXDRIVER` | `deLuxDriver` | `1410` |
 | `DRIVER12VOLTS` | `Driver12Volts` | `1072` |
 | `ENVIRONMENTSENSOR` | `EnvironmentSensor` | `1405` |
 | `FLYPAD` | `FlyPad` | `1200` |

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/aind_data_schema_models/organizations.md

@@ -22,6 +22,7 @@ Organization
 | `ASUS` | `None` | `ASUS` | `Research Organization Registry (ROR)` | `00bxkz165` |
 | `BASLER` | `None` | `Basler` | `None` | `None` |
 | `BCM` | `BCM` | `Baylor College of Medicine` | `Research Organization Registry (ROR)` | `02pttbw34` |
+| `BROADCOM` | `None` | `Broadcom` | `Research Organization Registry (ROR)` | `035gt5s03` |
 | `BRUKER` | `None` | `Bruker` | `Research Organization Registry (ROR)` | `04r739x86` |
 | `BU` | `BU` | `Boston University` | `Research Organization Registry (ROR)` | `05qwgg493` |
 | `CAJAL` | `Cajal` | `Cajal Neuroscience` | `Research Organization Registry (ROR)` | `05pdc0q70` |
@@ -47,6 +48,7 @@ Organization
 | `EDMUND_OPTICS` | `None` | `Edmund Optics` | `Research Organization Registry (ROR)` | `01j1gwp17` |
 | `EMORY` | `Emory` | `Emory University` | `Research Organization Registry (ROR)` | `03czfpz43` |
 | `EURESYS` | `None` | `Euresys` | `None` | `None` |
+| `EXCELITAS_TECHNOLOGIES` | `None` | `Excelitas Technologies` | `Research Organization Registry (ROR)` | `01tpbbf75` |
 | `FILTER_MANUFACTURERS` | `N/A` | `N/A` | `N/A` | `N/A` |
 | `FLIR` | `FLIR` | `Teledyne FLIR` | `Research Organization Registry (ROR)` | `01j1gwp17` |
 | `FUJINON` | `None` | `Fujinon` | `None` | `None` |
@@ -66,6 +68,7 @@ Organization
 | `JENOPTIK` | `None` | `Jenoptik` | `Research Organization Registry (ROR)` | `05g7t5c49` |
 | `JHU` | `JHU` | `Johns Hopkins University` | `Research Organization Registry (ROR)` | `00za53h95` |
 | `JULABO` | `None` | `Julabo` | `None` | `None` |
+| `KENT_SCIENTIFIC_CORPORATION` | `None` | `Kent Scientific Corporation` | `Research Organization Registry (ROR)` | `03xkj6a08` |
 | `KOWA` | `None` | `Kowa` | `Research Organization Registry (ROR)` | `03zbwg482` |
 | `LASER_MANUFACTURERS` | `N/A` | `N/A` | `N/A` | `N/A` |
 | `LASOS` | `LASOS` | `LASOS Lasertechnik` | `None` | `None` |
@@ -104,6 +107,7 @@ Organization
 | `OLYMPUS` | `None` | `Olympus` | `Research Organization Registry (ROR)` | `02vcdte90` |
 | `OPTOTUNE` | `None` | `Optotune` | `None` | `None` |
 | `OTHER` | `None` | `Other` | `None` | `None` |
+| `OXFORD_INSTRUMENTS` | `None` | `Oxford Instruments` | `Research Organization Registry (ROR)` | `01age2z78` |
 | `OXXIUS` | `None` | `Oxxius` | `None` | `None` |
 | `PLACID_INDUSTRIES` | `None` | `Placid Industries` | `None` | `None` |
 | `PRIZMATIX` | `None` | `Prizmatix` | `None` | `None` |
@@ -112,6 +116,7 @@ Organization
 | `RESEARCH_INSTITUTIONS` | `N/A` | `N/A` | `N/A` | `N/A` |
 | `SAME_SKY` | `None` | `Same Sky` | `None` | `None` |
 | `SCHNEIDER_KREUZNACH` | `None` | `Schneider-Kreuznach` | `None` | `None` |
+| `SCIENTIFICA` | `None` | `Scientifica` | `Research Organization Registry (ROR)` | `00z72df47` |
 | `SECOND_ORDER_EFFECTS` | `None` | `Second Order Effects` | `None` | `None` |
 | `SEMROCK` | `None` | `Semrock` | `None` | `None` |
 | `SICGEN` | `None` | `SICGEN` | `None` | `None` |
@@ -137,5 +142,6 @@ Organization
 | `UPENN` | `UPENN` | `University of Pennsylvania` | `Research Organization Registry (ROR)` | `00b30xv10` |
 | `VIEWORKS` | `None` | `Vieworks` | `None` | `None` |
 | `VORTRAN` | `None` | `Vortran` | `None` | `None` |
+| `WPI` | `WPI` | `World Precision Intstruments` | `Research Organization Registry (ROR)` | `03st5df34` |
 
 

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/aind_data_schema_models/process_names.md

@@ -17,6 +17,7 @@ Process names
 | `EPHYS_VISUALIZATION` | `Ephys visualization` |
 | `FIDUCIAL_SEGMENTATION` | `Fiducial segmentation` |
 | `FILE_FORMAT_CONVERSION` | `File format conversion` |
+| `FIX_COLOR_RANGE` | `Fix color range` |
 | `FLUORESCENCE_EVENT_DETECTION` | `Fluorescence event detection` |
 | `IMAGE_ATLAS_ALIGNMENT` | `Image atlas alignment` |
 | `IMAGE_BACKGROUND_SUBTRACTION` | `Image background subtraction` |
@@ -28,6 +29,7 @@ Process names
 | `IMAGE_FLAT_FIELD_CORRECTION` | `Image flat-field correction` |
 | `IMAGE_IMPORTING` | `Image importing` |
 | `IMAGE_MIP_VISUALIZATION` | `Image mip visualization` |
+| `IMAGE_MULTISCALING` | `Image multiscaling` |
 | `IMAGE_RADIAL_CORRECTION` | `Image radial correction` |
 | `IMAGE_SPOT_DETECTION` | `Image spot detection` |
 | `IMAGE_SPOT_SPECTRAL_UNMIXING` | `Image spot spectral unmixing` |
@@ -35,6 +37,7 @@ Process names
 | `IMAGE_TILE_ALIGNMENT` | `Image tile alignment` |
 | `IMAGE_TILE_FUSING` | `Image tile fusing` |
 | `IMAGE_TILE_PROJECTION` | `Image tile projection` |
+| `MANUAL_CURATION` | `Manual curation` |
 | `MODEL_EVALUATION` | `Model evaluation` |
 | `MODEL_TRAINING` | `Model training` |
 | `NEURON_SKELETON_PROCESSING` | `Neuron skeleton processing` |

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/aind_data_schema_models/specimen_procedure_types.md

@@ -25,6 +25,5 @@ Specimen procedures
 | `SOAK` | `Soak` |
 | `STORAGE` | `Storage` |
 | `STRIPPING` | `Stripping` |
-| `TAMOXIFEN_INDUCTION` | `Tamoxifen induction` |
 
 

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/devices.md

@@ -57,7 +57,7 @@ Camera Detector
 | Field | Type | Title (Description) |
 |-------|------|-------------|
 | `detector_type` | [DetectorType](../aind_data_schema_models/devices.md#detectortype) |   |
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `data_interface` | [DataInterface](../aind_data_schema_models/devices.md#datainterface) | Data interface  |
 | `cooling` | [Cooling](../aind_data_schema_models/devices.md#cooling) | Cooling  |
 | `frame_rate` | `Optional[decimal.Decimal]` | Frame rate (Hz) (Frame rate being used) |
@@ -192,7 +192,7 @@ Data acquisition device containing multiple I/O channels
 | Field | Type | Title (Description) |
 |-------|------|-------------|
 | `data_interface` | [DataInterface](../aind_data_schema_models/devices.md#datainterface) | Type of connection to PC  |
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `channels` | List[[DAQChannel](#daqchannel)] | DAQ channels  |
 | `firmware_version` | `Optional[str]` | Firmware version  |
 | `hardware_version` | `Optional[str]` | Hardware version  |
@@ -210,7 +210,7 @@ Description of a generic detector
 | Field | Type | Title (Description) |
 |-------|------|-------------|
 | `detector_type` | [DetectorType](../aind_data_schema_models/devices.md#detectortype) | Detector Type  |
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `data_interface` | [DataInterface](../aind_data_schema_models/devices.md#datainterface) | Data interface  |
 | `cooling` | [Cooling](../aind_data_schema_models/devices.md#cooling) | Cooling  |
 | `frame_rate` | `Optional[decimal.Decimal]` | Frame rate (Hz) (Frame rate being used) |
@@ -417,7 +417,7 @@ Filter used in a light path
 | Field | Type | Title (Description) |
 |-------|------|-------------|
 | `filter_type` | [FilterType](../aind_data_schema_models/devices.md#filtertype) | Type of filter  |
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `cut_off_wavelength` | `Optional[int]` | Cut-off wavelength (nm)  |
 | `cut_on_wavelength` | `Optional[int]` | Cut-on wavelength (nm)  |
 | `center_wavelength` | `int or List[int] or NoneType` | Center wavelength (nm) (Single wavelength or list of wavelengths for MULTIBAND or MULTI_NOTCH filters) |
@@ -435,7 +435,7 @@ DAQ that uses the Harp protocol for synchronization and data transmission
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `harp_device_type` | [HarpDeviceType](../aind_data_schema_models/harp_types.md#harpdevicetype) | Type of Harp device  |
 | `core_version` | `Optional[str]` | Core version  |
 | `tag_version` | `Optional[str]` | Tag version  |
@@ -476,7 +476,7 @@ Laser module with a specific wavelength (may be a sub-component of a larger asse
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `wavelength` | `int` | Wavelength (nm)  |
 | `wavelength_unit` | [SizeUnit](../aind_data_schema_models/units.md#sizeunit) | Wavelength unit  |
 | `coupling` | Optional[[Coupling](../aind_data_schema_models/devices.md#coupling)] | Coupling  |
@@ -508,7 +508,7 @@ Lens
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `name` | `str` | Device name  |
 | `serial_number` | `Optional[str]` | Serial number  |
 | `model` | `Optional[str]` | Model  |
@@ -564,7 +564,7 @@ Description of a Light Emitting Diode (LED) device
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `wavelength` | `int` | Wavelength (nm)  |
 | `wavelength_unit` | [SizeUnit](../aind_data_schema_models/units.md#sizeunit) | Wavelength unit  |
 | `bandwidth` | `Optional[int]` | Bandwidth (FWHM)  |
@@ -582,7 +582,7 @@ Manipulator used on a dome module
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `name` | `str` | Device name  |
 | `serial_number` | `Optional[str]` | Serial number  |
 | `model` | `Optional[str]` | Model  |
@@ -610,7 +610,7 @@ Description of visual display for visual stimuli
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `refresh_rate` | `int` | Refresh rate (Hz)  |
 | `width` | `int` | Width (pixels)  |
 | `height` | `int` | Height (pixels)  |
@@ -732,7 +732,7 @@ Description of an olfactometer for odor stimuli
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `harp_device_type` | [HarpDeviceType](../aind_data_schema_models/harp_types.md#harpdevicetype) | Type of Harp device  |
 | `channels` | List[[OlfactometerChannel](#olfactometerchannel)] |   |
 | `core_version` | `Optional[str]` | Core version  |
@@ -888,7 +888,7 @@ Description of a speaker for auditory stimuli
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) |   |
+| `manufacturer` | [Organization](../aind_data_schema_models/organizations.md#organization) | Manufacturer  |
 | `name` | `str` | Device name  |
 | `serial_number` | `Optional[str]` | Serial number  |
 | `model` | `Optional[str]` | Model  |

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/identifiers.md

@@ -50,7 +50,8 @@ Description of a single data asset
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `url` | `str` | Asset location (URL pointing to the data asset) |
+| `name` | `Optional[str]` | Asset name (Name of the data asset) |
+| `url` | `Optional[str]` | Asset location (URL pointing to the data asset) |
 
 
 ### Database

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/injection_procedures.md

@@ -12,7 +12,7 @@ Description of an injection procedure
 | `targeted_structure` | Optional[[MouseAnatomyModel](../aind_data_schema_models/external.md#mouseanatomymodel)] | Injection target (Use InjectionTargets) |
 | `relative_position` | Optional[List[[AnatomicalRelative](../aind_data_schema_models/coordinates.md#anatomicalrelative)]] | Relative position  |
 | `dynamics` | List[[InjectionDynamics](#injectiondynamics)] | Injection dynamics (List of injection events, one per location/depth) |
-| <del>`protocol_id`</del> | `Optional[str]` | **[DEPRECATED]** Use protocol_id in Surgery or NonSurgicalInjection instead. Protocol ID (DOI for protocols.io) |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### InjectionDynamics

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/measurements.md

@@ -10,7 +10,6 @@ Generic calibration class
 |-------|------|-------------|
 | `calibration_date` | `datetime (timezone-aware)` | Date and time of calibration  |
 | `description` | `str` | Description (Brief description of what is being calibrated) |
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `measured_at` | `Optional[str]` | Measurement location  |
 | `input` | `List[float or str]` | Inputs (Calibration input) |
 | `input_unit` | [SizeUnit](../aind_data_schema_models/units.md#sizeunit) or [MassUnit](../aind_data_schema_models/units.md#massunit) or [FrequencyUnit](../aind_data_schema_models/units.md#frequencyunit) or [SpeedUnit](../aind_data_schema_models/units.md#speedunit) or [VolumeUnit](../aind_data_schema_models/units.md#volumeunit) or [AngleUnit](../aind_data_schema_models/units.md#angleunit) or [TimeUnit](../aind_data_schema_models/units.md#timeunit) or [PowerUnit](../aind_data_schema_models/units.md#powerunit) or [CurrentUnit](../aind_data_schema_models/units.md#currentunit) or [ConcentrationUnit](../aind_data_schema_models/units.md#concentrationunit) or [TemperatureUnit](../aind_data_schema_models/units.md#temperatureunit) or [SoundIntensityUnit](../aind_data_schema_models/units.md#soundintensityunit) or [VoltageUnit](../aind_data_schema_models/units.md#voltageunit) or [MemoryUnit](../aind_data_schema_models/units.md#memoryunit) or [UnitlessUnit](../aind_data_schema_models/units.md#unitlessunit) or [MagneticFieldUnit](../aind_data_schema_models/units.md#magneticfieldunit) or [PressureUnit](../aind_data_schema_models/units.md#pressureunit) or {TorqueUnit} | Input unit  |
@@ -19,6 +18,7 @@ Generic calibration class
 | `output_unit` | [SizeUnit](../aind_data_schema_models/units.md#sizeunit) or [MassUnit](../aind_data_schema_models/units.md#massunit) or [FrequencyUnit](../aind_data_schema_models/units.md#frequencyunit) or [SpeedUnit](../aind_data_schema_models/units.md#speedunit) or [VolumeUnit](../aind_data_schema_models/units.md#volumeunit) or [AngleUnit](../aind_data_schema_models/units.md#angleunit) or [TimeUnit](../aind_data_schema_models/units.md#timeunit) or [PowerUnit](../aind_data_schema_models/units.md#powerunit) or [CurrentUnit](../aind_data_schema_models/units.md#currentunit) or [ConcentrationUnit](../aind_data_schema_models/units.md#concentrationunit) or [TemperatureUnit](../aind_data_schema_models/units.md#temperatureunit) or [SoundIntensityUnit](../aind_data_schema_models/units.md#soundintensityunit) or [VoltageUnit](../aind_data_schema_models/units.md#voltageunit) or [MemoryUnit](../aind_data_schema_models/units.md#memoryunit) or [UnitlessUnit](../aind_data_schema_models/units.md#unitlessunit) or [MagneticFieldUnit](../aind_data_schema_models/units.md#magneticfieldunit) or [PressureUnit](../aind_data_schema_models/units.md#pressureunit) or {TorqueUnit} | Output unit  |
 | `fit` | Optional[[CalibrationFit](#calibrationfit)] | Fit (Fit equation for the calibration data used during data acquisition) |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `device_name` | `str` | Device name (Must match a device defined in the instrument.json) |
 
 
@@ -51,9 +51,9 @@ Generic maintenance class
 |-------|------|-------------|
 | `maintenance_date` | `datetime (timezone-aware)` | Date and time of maintenance  |
 | `description` | `str` | Description (Description on maintenance procedure) |
-| `protocol_id` | `Optional[str]` | Protocol ID  |
 | `reagents` | Optional[List[[Reagent](reagent.md#reagent)]] | Reagents  |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `device_name` | `str` | Device name (Must match a device defined in the instrument.json) |
 
 
@@ -69,11 +69,11 @@ Calibration of a device that outputs power based on input strength
 | `output_unit` | [PowerUnit](../aind_data_schema_models/units.md#powerunit) | Output unit  |
 | `description` | `"Power measured for various power or percentage input strengths"` |   |
 | `calibration_date` | `datetime (timezone-aware)` | Date and time of calibration  |
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `measured_at` | `Optional[str]` | Measurement location  |
 | `repeats` | `Optional[int]` | Number of repeats (If each input was repeated multiple times, provide the number of repeats) |
 | `fit` | Optional[[CalibrationFit](#calibrationfit)] | Fit (Fit equation for the calibration data used during data acquisition) |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `device_name` | `str` | Device name (Must match a device defined in the instrument.json) |
 
 
@@ -90,10 +90,10 @@ Calibration of a liquid delivery device based on solenoid/valve opening times
 | `output_unit` | [VolumeUnit](../aind_data_schema_models/units.md#volumeunit) | Output unit  |
 | `description` | `"Volume measured for various solenoid opening times"` |   |
 | `calibration_date` | `datetime (timezone-aware)` | Date and time of calibration  |
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `measured_at` | `Optional[str]` | Measurement location  |
 | `fit` | Optional[[CalibrationFit](#calibrationfit)] | Fit (Fit equation for the calibration data used during data acquisition) |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `device_name` | `str` | Device name (Must match a device defined in the instrument.json) |
 
 

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/reagent.md

@@ -115,3 +115,13 @@ Description of a small molecule probe
 | `mass_unit` | [MassUnit](../aind_data_schema_models/units.md#massunit) | Mass unit  |
 
 
+### Solution
+
+Description of a solution made in house. Should match a solution named in protocol.
+
+| Field | Type | Title (Description) |
+|-------|------|-------------|
+| `name` | `str` | Name  |
+| `lot_number` | `Optional[str]` | Lot number  |
+
+

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/specimen_procedures.md

@@ -106,9 +106,9 @@ Description of surgical or other procedure performed on a specimen
 | `start_date` | `datetime.date` | Start date  |
 | `end_date` | `datetime.date` | End date  |
 | `experimenters` | `List[str]` | experimenter(s)  |
-| `protocol_id` | `Optional[List[str]]` | Protocol ID (DOI for protocols.io) |
 | `protocol_parameters` | `Optional[Dict[str, str]]` | Protocol parameters (Parameters defined in the protocol and their value during this procedure) |
-| `procedure_details` | List[[HCRSeries](#hcrseries) or [FluorescentStain](reagent.md#fluorescentstain) or [Sectioning](#sectioning) or [PlanarSectioning](#planarsectioning) or [ProbeReagent](reagent.md#probereagent) or [Reagent](reagent.md#reagent) or [GeneProbeSet](reagent.md#geneprobeset)] | Procedure details (Details of the procedures, including reagents and sectioning information.) |
+| `procedure_details` | List[[HCRSeries](#hcrseries) or [FluorescentStain](reagent.md#fluorescentstain) or [Sectioning](#sectioning) or [PlanarSectioning](#planarsectioning) or [ProbeReagent](reagent.md#probereagent) or [Reagent](reagent.md#reagent) or [GeneProbeSet](reagent.md#geneprobeset) or [Solution](reagent.md#solution)] | Procedure details (Details of the procedures, including reagents and sectioning information.) |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[List[str]]` | Protocol ID (DOI for protocols.io) |
 
 

{aind_data_schema-2.7.1 → aind_data_schema-2.8.0}/docs/source/components/surgery_procedures.md

@@ -26,7 +26,7 @@ Description of an injection procedure into a brain
 | `injection_materials` | List[[ViralMaterial](injection_procedures.md#viralmaterial) or [NonViralMaterial](injection_procedures.md#nonviralmaterial)] | Injection material  |
 | `relative_position` | Optional[List[[AnatomicalRelative](../aind_data_schema_models/coordinates.md#anatomicalrelative)]] | Relative position  |
 | `dynamics` | List[[InjectionDynamics](injection_procedures.md#injectiondynamics)] | Injection dynamics (List of injection events, one per location/depth) |
-| <del>`protocol_id`</del> | `Optional[str]` | **[DEPRECATED]** Use protocol_id in Surgery or NonSurgicalInjection instead. Protocol ID (DOI for protocols.io) |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### CatheterImplant
@@ -46,7 +46,6 @@ Description of craniotomy procedure
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `craniotomy_type` | [CraniotomyType](#craniotomytype) | Craniotomy type  |
 | `coordinate_system_name` | `Optional[str]` | Coordinate system name  |
 | `position` | [Translation](coordinates.md#translation) or List[[AnatomicalRelative](../aind_data_schema_models/coordinates.md#anatomicalrelative)] or NoneType | Craniotomy position  |
@@ -55,6 +54,7 @@ Description of craniotomy procedure
 | `protective_material` | Optional[[ProtectiveMaterial](#protectivematerial)] | Protective material  |
 | `implant_part_number` | `Optional[str]` | Implant part number  |
 | `dura_removed` | `Optional[bool]` | Dura removed  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### CraniotomyType
@@ -76,9 +76,9 @@ Description of a surgery procedure performed on a subject
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `description` | `str` | Description  |
 | `notes` | `Optional[str]` | Notes  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### GroundWireImplant
@@ -110,12 +110,12 @@ Description of headframe procedure
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `headframe_type` | `str` | Headframe type  |
 | `headframe_part_number` | `Optional[str]` | Headframe part number  |
 | `headframe_material` | Optional[[HeadframeMaterial](#headframematerial)] | Headframe material  |
 | `well_part_number` | `Optional[str]` | Well part number  |
 | `well_type` | `Optional[str]` | Well type  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### HeadframeMaterial
@@ -135,9 +135,9 @@ Description of a Myomatrix array insertion for EMG
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `ground_electrode` | [GroundWireImplant](#groundwireimplant) | Ground electrode  |
 | `implanted_device` | [MyomatrixArray](devices.md#myomatrixarray) | Implanted device  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### Perfusion
@@ -146,8 +146,8 @@ Description of a perfusion procedure that creates a specimen
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `output_specimen_ids` | `List[str]` | Specimen ID (IDs of specimens resulting from this procedure. Whole brains can use the {subject_id}, partial sections should always include a suffix {subject_id}_###) |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### ProbeImplant
@@ -156,9 +156,9 @@ Description of a probe (fiber, ephys) implant procedure
 
 | Field | Type | Title (Description) |
 |-------|------|-------------|
-| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 | `implanted_device` | [EphysProbe](devices.md#ephysprobe) or [FiberProbe](devices.md#fiberprobe) | Implanted device  |
 | `device_config` | [ProbeConfig](configs.md#probeconfig) | Device configuration  |
+| `protocol_id` | `Optional[str]` | Protocol ID (DOI for protocols.io) |
 
 
 ### ProtectiveMaterial