From 4e6ee98790a96200a006e05141c894124e3dbece Mon Sep 17 00:00:00 2001 From: brunocruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Tue, 10 Sep 2024 21:19:16 -0700 Subject: [PATCH] Fix type signatures to be compatible with pydantic 2.9 (#1053) * Remove redundant discriminator * Fix type signature and length constrain * Linting * chore: un-capping pydantic version * Revert "chore: un-capping pydantic version" This reverts commit 2f81eda810c84373b8ef9ad3d5ea425b6ab11415. --------- Co-authored-by: Dan Birman --- src/aind_data_schema/core/procedures.py | 7 +++---- src/aind_data_schema/core/rig.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/aind_data_schema/core/procedures.py b/src/aind_data_schema/core/procedures.py index df9716f8..486358ac 100644 --- a/src/aind_data_schema/core/procedures.py +++ b/src/aind_data_schema/core/procedures.py @@ -390,10 +390,9 @@ class NonViralMaterial(Reagent): class Injection(AindModel): """Description of an injection procedure""" - injection_materials: Annotated[ - List[Union[ViralMaterial, NonViralMaterial]], - Field(title="Injection material", min_length=1, discriminator="material_type"), - ] + injection_materials: List[ + Annotated[Union[ViralMaterial, NonViralMaterial], Field(..., discriminator="material_type")] + ] = Field(..., title="Injection material", min_length=1) recovery_time: Optional[Decimal] = Field(default=None, title="Recovery time") recovery_time_unit: TimeUnit = Field(default=TimeUnit.M, title="Recovery time unit") injection_duration: Optional[Decimal] = Field(default=None, title="Injection duration") diff --git a/src/aind_data_schema/core/rig.py b/src/aind_data_schema/core/rig.py index 72b01046..5c074bbf 100644 --- a/src/aind_data_schema/core/rig.py +++ b/src/aind_data_schema/core/rig.py @@ -77,7 +77,7 @@ class Rig(AindCoreModel): polygonal_scanners: List[PolygonalScanner] = Field(default=[], title="Polygonal scanners") pockels_cells: List[PockelsCell] = Field(default=[], title="Pockels cells") additional_devices: List[Device] = Field(default=[], title="Additional devices") - daqs: List[RIG_DAQ_DEVICES] = Field(default=[], title="Data acquisition devices", discriminator="device_type") + daqs: List[RIG_DAQ_DEVICES] = Field(default=[], title="Data acquisition devices") calibrations: List[Calibration] = Field(..., title="Full calibration of devices") ccf_coordinate_transform: Optional[str] = Field( default=None,