Merge branch 'dev' into 1794-isi-instrumentjson

Author: dbirman

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  |
+
+

docs/source/components/specimen_procedures.md

@@ -108,7 +108,7 @@ Description of surgical or other procedure performed on a specimen
 | `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  |
 
 

src/aind_data_schema/components/reagent.py

@@ -31,6 +31,13 @@ class Reagent(DataModel):
     expiration_date: Optional[date] = Field(default=None, title="Lot expiration date")
 
 
+class Solution(DataModel):
+    """Description of a solution made in house. Should match a solution named in protocol."""
+
+    name: str = Field(..., title="Name")
+    lot_number: Optional[str] = Field(default=None, title="Lot number")
+
+
 class OligoProbe(DataModel):
     """Description of an oligonucleotide probe"""
 

src/aind_data_schema/components/specimen_procedures.py

@@ -13,7 +13,7 @@
 
 from aind_data_schema.base import AwareDatetimeWithDefault, DataModel, DiscriminatedList
 from aind_data_schema.components.coordinates import Atlas, CoordinateSystem, Translation
-from aind_data_schema.components.reagent import FluorescentStain, GeneProbeSet, ProbeReagent, Reagent
+from aind_data_schema.components.reagent import FluorescentStain, GeneProbeSet, ProbeReagent, Reagent, Solution
 from aind_data_schema.utils.exceptions import OneOfError
 
 
@@ -178,7 +178,7 @@ class SpecimenProcedure(DataModel):
     )
 
     procedure_details: DiscriminatedList[
-        HCRSeries | FluorescentStain | Sectioning | PlanarSectioning | ProbeReagent | Reagent | GeneProbeSet
+        HCRSeries | FluorescentStain | Sectioning | PlanarSectioning | ProbeReagent | Reagent | GeneProbeSet | Solution
     ] = Field(
         default=[],
         title="Procedure details",