Skip to content

Commit e792d9e

Browse files
committed
fix: fixes model definition for intended ccf targets
1 parent e398e8d commit e792d9e

2 files changed

Lines changed: 9 additions & 21 deletions

File tree

aind-sharepoint-service-server/src/aind_sharepoint_service_server/models/nsb_2023.py

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from datetime import datetime
44
from enum import Enum, EnumMeta
5-
from typing import Annotated, Optional
5+
from typing import Annotated, List, Optional
66

77
from pydantic import BaseModel, Field, WrapValidator
88

@@ -5009,9 +5009,7 @@ class NSB2023List(BaseModel, extra="allow"):
50095009
alias="Burr_x0020_1_x0020_Injectable_x0",
50105010
title="Burr 1 Injectable Material 1",
50115011
)
5012-
burr_1_intended: Annotated[
5013-
NSB2023Burr1IntendedCcfTarget, WrapValidator(optional_enum)
5014-
] = Field(
5012+
burr_1_intended: Optional[List[NSB2023Burr1IntendedCcfTarget]] = Field(
50155013
default=None,
50165014
alias="Burr_x0020_1_x0020_Intended_x002",
50175015
title="Burr 1 Intended CCF Target",
@@ -5109,9 +5107,7 @@ class NSB2023List(BaseModel, extra="allow"):
51095107
alias="Burr_x0020_2_x0020_Injectable_x0",
51105108
title="Burr 2 Injectable Material 1",
51115109
)
5112-
burr_2_intended: Annotated[
5113-
NSB2023Burr2IntendedCcfTarget, WrapValidator(optional_enum)
5114-
] = Field(
5110+
burr_2_intended: Optional[List[NSB2023Burr2IntendedCcfTarget]] = Field(
51155111
default=None,
51165112
alias="Burr_x0020_2_x0020_Intended_x002",
51175113
title="Burr 2 Intended CCF Target",
@@ -5218,9 +5214,7 @@ class NSB2023List(BaseModel, extra="allow"):
52185214
alias="Burr_x0020_3_x0020_Injectable_x0",
52195215
title="Burr 3 Injectable Material 1",
52205216
)
5221-
burr_3_intended: Annotated[
5222-
NSB2023Burr3IntendedCcfTarget, WrapValidator(optional_enum)
5223-
] = Field(
5217+
burr_3_intended: Optional[List[NSB2023Burr3IntendedCcfTarget]] = Field(
52245218
default=None,
52255219
alias="Burr_x0020_3_x0020_Intended_x002",
52265220
title="Burr 3 Intended CCF Target",
@@ -5320,9 +5314,7 @@ class NSB2023List(BaseModel, extra="allow"):
53205314
alias="Burr_x0020_4_x0020_Injectable_x0",
53215315
title="Burr 4 Injectable Material 1",
53225316
)
5323-
burr_4_intended: Annotated[
5324-
NSB2023Burr4IntendedCcfTarget, WrapValidator(optional_enum)
5325-
] = Field(
5317+
burr_4_intended: Optional[List[NSB2023Burr4IntendedCcfTarget]] = Field(
53265318
default=None,
53275319
alias="Burr_x0020_4_x0020_Intended_x002",
53285320
title="Burr 4 Intended CCF Target",
@@ -5422,9 +5414,7 @@ class NSB2023List(BaseModel, extra="allow"):
54225414
alias="Burr_x0020_5_x0020_Injectable_x0",
54235415
title="Burr 5 Injectable Material 1",
54245416
)
5425-
burr_5_intended: Annotated[
5426-
NSB2023Burr5IntendedCcfTarget, WrapValidator(optional_enum)
5427-
] = Field(
5417+
burr_5_intended: Optional[List[NSB2023Burr5IntendedCcfTarget]] = Field(
54285418
default=None,
54295419
alias="Burr_x0020_5_x0020_Intended_x002",
54305420
title="Burr 5 Intended CCF Target",
@@ -5535,9 +5525,7 @@ class NSB2023List(BaseModel, extra="allow"):
55355525
alias="Burr_x0020_6_x0020_Injectable_x0",
55365526
title="Burr 6 Injectable Material 1",
55375527
)
5538-
burr_6_intended: Annotated[
5539-
NSB2023Burr6IntendedCcfTarget, WrapValidator(optional_enum)
5540-
] = Field(
5528+
burr_6_intended: Optional[List[NSB2023Burr6IntendedCcfTarget]] = Field(
55415529
default=None,
55425530
alias="Burr_x0020_6_x0020_Intended_x002",
55435531
title="Burr 6 Intended CCF Target",

aind-sharepoint-service-server/tests/resources/nsb_present_first_response.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"Burr_x0020_1_x0020_Injectable_x05": null,
9898
"Burr_x0020_1_x0020_Injectable_x06": null,
9999
"Burr_x0020_1_x0020_Injectable_x0": null,
100-
"Burr_x0020_1_x0020_Intended_x002": null,
100+
"Burr_x0020_1_x0020_Intended_x002": ["FRP - Frontal pole cerebral cortex"],
101101
"Burr_x0020_1_x0020_Spinal_x0020_": "Select...",
102102
"Burr_x0020_1_x0020_D_x002f_V_x00": null,
103103
"Burr_x0020_1_x0020_DV_x0020_2": null,
@@ -169,7 +169,7 @@
169169
"Burr_x0020_5_x0020_Injectable_x05": null,
170170
"Burr_x0020_5_x0020_Injectable_x06": null,
171171
"Burr_x0020_5_x0020_Injectable_x0": null,
172-
"Burr_x0020_5_x0020_Intended_x002": null,
172+
"Burr_x0020_5_x0020_Intended_x002": ["LC - Locus ceruleus"],
173173
"Burr_x0020_5_x0020_A_x002f_P": null,
174174
"Burr_x0020_5_x0020_D_x002f_V_x000": null,
175175
"Burr_x0020_5_x0020_D_x002f_V_x001": null,

0 commit comments

Comments
 (0)