Feat 1147 interoception (#1190)

* added cathether implant

* added catheter procedures

* added time fields

* small edits

* more clean up

* cleaned up blood collection and IP injections

* Charles River

* implant organizations

* wrong word

* syntax

* use Surgery, tweak times/dates

* procedures type missing

* another missing type

* removed maintenance, other small updates

src/aind_data_schema/core/procedures.py

@@ -6,6 +6,7 @@
 from typing import List, Literal, Optional, Set, Union
 
 from aind_data_schema_models.mouse_anatomy import MouseAnatomicalStructure
+from aind_data_schema_models.organizations import Organization
 from aind_data_schema_models.pid_names import PIDName
 from aind_data_schema_models.species import Species
 from aind_data_schema_models.specimen_procedure_types import SpecimenProcedureType
@@ -136,6 +137,36 @@ class VirusPrepType(str, Enum):
     PURIFIED = "Purified"
 
 
+class CatheterMaterial(str, Enum):
+    """Type of catheter material"""
+
+    NAKED = "Naked"
+    SILICONE = "VAB silicone"
+    MESH = "VAB mesh"
+
+
+class CatheterDesign(str, Enum):
+    """Type of catheter design"""
+
+    MAGNETIC = "Magnetic"
+    NONMAGNETIC = "Non-magnetic"
+    NA = "N/A"
+
+
+class CatheterPort(str, Enum):
+    """Type of catheter port"""
+
+    SINGLE = "Single"
+    DOUBLE = "Double"
+
+
+class SampleType(str, Enum):
+    """Sample type"""
+
+    BLOOD = "Blood"
+    OTHER = "Other"
+
+
 class Readout(Reagent):
     """Description of a readout"""
 
@@ -292,6 +323,17 @@ class OtherSubjectProcedure(AindModel):
     notes: Optional[str] = Field(default=None, title="Notes")
 
 
+class CatheterImplant(AindModel):
+    """Description of a catheter implant procedure"""
+
+    procedure_type: Literal["Catheter Implant"] = "Catheter implant"
+    where_performed: Organization.CATHETER_IMPLANT_INSTITUTIONS = Field(..., title="Where performed")
+    catheter_material: CatheterMaterial = Field(..., title="Catheter material")
+    catheter_design: CatheterDesign = Field(..., title="Catheter design")
+    catheter_port: CatheterPort = Field(..., title="Catheter port")
+    targeted_structure: MouseAnatomicalStructure.BLOOD_VESSELS = Field(..., title="Targeted blood vessel")
+
+
 class Craniotomy(AindModel):
     """Description of craniotomy procedure"""
 
@@ -415,6 +457,7 @@ class IntraperitonealInjection(Injection):
     """Description of an intraperitoneal injection procedure"""
 
     procedure_type: Literal["Intraperitoneal injection"] = "Intraperitoneal injection"
+    time: Optional[AwareDatetimeWithDefault] = Field(default=None, title="Injection time")
     injection_volume: Decimal = Field(..., title="Injection volume (uL)")
     injection_volume_unit: VolumeUnit = Field(default=VolumeUnit.UL, title="Injection volume unit")
 
@@ -495,6 +538,17 @@ class IntraCisternalMagnaInjection(BrainInjection):
     injection_volume_unit: VolumeUnit = Field(VolumeUnit.NL, title="Injection volume unit")
 
 
+class SampleCollection(AindModel):
+    """Description of a single sample collection"""
+
+    procedure_type: Literal["Sample collection"] = "Sample collection"
+    sample_type: SampleType = Field(..., title="Sample type")
+    time: AwareDatetimeWithDefault = Field(..., title="Collection time")
+    collection_volume: Decimal = Field(..., title="Collection volume")
+    collection_volume_unit: VolumeUnit = Field(..., title="Collection volume unit")
+    collection_method: Optional[str] = Field(default=None, title="Collection method for terminal collection")
+
+
 class TrainingProtocol(AindModel):
     """Description of an animal training protocol"""
 
@@ -624,6 +678,7 @@ class Surgery(AindModel):
     procedures: List[
         Annotated[
             Union[
+                CatheterImplant,
                 Craniotomy,
                 FiberImplant,
                 Headframe,
@@ -637,6 +692,7 @@ class Surgery(AindModel):
                 Perfusion,
                 ProtectiveMaterialReplacement,
                 RetroOrbitalInjection,
+                SampleCollection,
             ],
             Field(discriminator="procedure_type"),
         ]
@@ -658,7 +714,12 @@ class Procedures(AindCoreModel):
     )
     subject_procedures: List[
         Annotated[
-            Union[Surgery, TrainingProtocol, WaterRestriction, OtherSubjectProcedure],
+            Union[
+                Surgery,
+                TrainingProtocol,
+                WaterRestriction,
+                OtherSubjectProcedure
+            ],
             Field(discriminator="procedure_type"),
         ]
     ] = Field(default=[], title="Subject Procedures")