Skip to content
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.

Sign up for GitHub

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 interoception 2 #116

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Feat interoception 2 #116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16ed620
added Charles River
saskiad Dec 15, 2024
4873408
added blood vessels
saskiad Dec 15, 2024
bddcf34
fixed spaces
saskiad Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/aind_data_schema_models/_generators/models/organizations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Cambridge Technology,,,
Carl Zeiss,,ROR,01xk5xs43
Champalimaud Foundation,Champalimaud,ROR,03g001n57
Chan Zuckerberg Initiative,CZI,ROR,02qenvm24
Charles River Laboratories, CRL, ROR, 03ndmsg87
saskiad marked this conversation as resolved.
Show resolved Hide resolved
Chroma,,,
Coherent Scientific,,ROR,031tysd23
Columbia University,Columbia,ROR,00hj8s172
Expand Down
8 changes: 8 additions & 0 deletions src/aind_data_schema_models/mouse_anatomy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73220,3 +73220,11 @@ class MouseAnatomicalStructure:
],
Field(discriminator="registry_identifier"),
]

MouseAnatomicalStructure.BLOOD_VESSELS = Annotated[
Union[
_Carotid_Artery,
_Jugular_Vein,
],
Field(disriminator="registry_identifier"),
]
20 changes: 11 additions & 9 deletions src/aind_data_schema_models/organizations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,15 @@ class _Chan_Zuckerberg_Initiative(_OrganizationModel):
registry_identifier: Literal["02qenvm24"] = "02qenvm24"


class _Charles_River_Laboratories(_OrganizationModel):
"""Model Charles River Laboratories"""

name: Literal["Charles River Laboratories"] = "Charles River Laboratories"
abbreviation: Literal[" CRL"] = " CRL"
registry: Registry.ONE_OF = Registry.ROR
registry_identifier: Literal[" 03ndmsg87"] = " 03ndmsg87"


class _Chroma(_OrganizationModel):
"""Model Chroma"""

Expand Down Expand Up @@ -898,6 +907,7 @@ class Organization:
CARL_ZEISS = _Carl_Zeiss()
CHAMPALIMAUD = _Champalimaud_Foundation()
CZI = _Chan_Zuckerberg_Initiative()
_CRL = _Charles_River_Laboratories()
CHROMA = _Chroma()
COHERENT_SCIENTIFIC = _Coherent_Scientific()
COLUMBIA = _Columbia_University()
Expand Down Expand Up @@ -1032,7 +1042,6 @@ def from_name(cls, name: str):
Organization.FUJINON,
Organization.HAMAMATSU,
Organization.INFINITY_PHOTO_OPTICAL,
Organization.KOWA,
Organization.LEICA,
Organization.MITUTUYO,
Organization.NAVITAR,
Expand Down Expand Up @@ -1077,14 +1086,7 @@ def from_name(cls, name: str):

Organization.MONITOR_MANUFACTURERS = one_of_instance([Organization.ASUS, Organization.LG, Organization.OTHER])

Organization.SPEAKER_MANUFACTURERS = one_of_instance(
[
Organization.DIGIKEY,
Organization.TYMPHANY,
Organization.ISL,
Organization.OTHER
]
)
Organization.SPEAKER_MANUFACTURERS = one_of_instance([Organization.TYMPHANY, Organization.ISL, Organization.OTHER])

Organization.FUNDERS = one_of_instance(
[
Expand Down
Loading