-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat 1147 interoception #1190
Open
saskiad
wants to merge
4
commits into
dev
Choose a base branch
from
feat_1147_interoception
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feat 1147 interoception #1190
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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,29 @@ 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 Readout(Reagent): | ||
"""Description of a readout""" | ||
|
||
|
@@ -292,6 +316,47 @@ 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" | ||
protocol_id: Optional[str] = Field(default=None, title="Protocol ID", description="DOI for protocols.io") | ||
iacuc_protocol: str = Field(..., title="IACUC protocol") | ||
start_date: date = Field(..., title="Start date") | ||
experimenter_full_name: str = Field( | ||
..., | ||
description="First and last name of the experimenter.", | ||
title="Experimenter full name", | ||
) | ||
where_performed: Annotated[Union[Organization.AIND, Organization.JAX], | ||
Field(..., title="Where performed", discriminator="name")] | ||
catheter_material: CatheterMaterial = Field(..., title="Catheter material") | ||
catheter_design: CatheterDesign = Field(..., title="Catheter design") | ||
catheter_port: CatheterPort = Field(..., title="Catheter port") | ||
targeted_vessel: MouseAnatomicalStructure.BLOOD_VESSELS = Field(..., title="Targeted blood vessel") | ||
notes: Optional[str] = Field(default=None, title="Notes") | ||
|
||
|
||
class CatheterMaintenance(AindModel): | ||
"""Description of a catheter maintenance procedure""" | ||
|
||
procedure_type: Literal["Catheter maintenance"] = "Catheter maintenance" | ||
protocol_id: Optional[str] = Field(default=None, title="Protocol ID", description="DOI for protocols.io") | ||
iacuc_protocol: str = Field(..., title="IACUC protocol") | ||
start_date: date = Field(..., title="Start date") | ||
experimenter_full_name: str = Field( | ||
..., | ||
description="First and last name of the experimenter.", | ||
title="Experimenter full name", | ||
) | ||
animal_weight_prior: Decimal = Field( | ||
..., title="Animal weight (g)", description="Animal weight before procedure" | ||
) | ||
health_assessment: Optional[str] = Field(default=None, title="Health assessment") | ||
pantent: bool = Field(default=True, title="Catheter patent") | ||
saskiad marked this conversation as resolved.
Show resolved
Hide resolved
|
||
notes: Optional[str] = Field(default=None, title="Notes") | ||
|
||
|
||
class Craniotomy(AindModel): | ||
"""Description of craniotomy procedure""" | ||
|
||
|
@@ -495,6 +560,28 @@ class IntraCisternalMagnaInjection(BrainInjection): | |
injection_volume_unit: VolumeUnit = Field(VolumeUnit.NL, title="Injection volume unit") | ||
|
||
|
||
class BloodCollection(AindModel): | ||
"""Description of a blood collection procedure""" | ||
|
||
procedure_type: Literal["Blood collection"] = "Blood collection" | ||
protocol_id = Optional[str] = Field(default=None, title="Protocol ID", description="DOI for protocols.io") | ||
iacuc_protcol: str = Field(..., title="IACUC protocol") | ||
start_date: date = Field(..., title="Start date") | ||
experimenter_full_name: str = Field( | ||
..., | ||
description="First and last name of the experimenter.", | ||
title="Experimenter full name", | ||
) | ||
injection: List[IntraperitonealInjection] = Field(..., title="IP injections") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove injection fields |
||
injection_time: int = Field(..., title="Relative injection time") | ||
collection_time: int = Field(..., title="Relative collection time") | ||
time_unit: TimeUnit = Field(default=TimeUnit.M, title="Time unit") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. list of times and collection volumes |
||
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") | ||
notes: Optional[str] = Field(default=None, title="Notes" | ||
|
||
|
||
class TrainingProtocol(AindModel): | ||
"""Description of an animal training protocol""" | ||
|
||
|
@@ -658,7 +745,15 @@ class Procedures(AindCoreModel): | |
) | ||
subject_procedures: List[ | ||
Annotated[ | ||
Union[Surgery, TrainingProtocol, WaterRestriction, OtherSubjectProcedure], | ||
Union[ | ||
BloodCollection, | ||
CatheterImplant, | ||
CatheterMaintenance, | ||
Surgery, | ||
TrainingProtocol, | ||
WaterRestriction, | ||
OtherSubjectProcedure | ||
], | ||
Field(discriminator="procedure_type"), | ||
] | ||
] = Field(default=[], title="Subject Procedures") | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add Charles River