Merge pull request #551 from AllenNeuralDynamics/feat-mfct

saskiad · web-flow · commit 08f9e170a7b1 · 2023-10-25T13:24:13.000-07:00
new manufacturers
diff --git a/examples/aibs_smartspim_instrument.json b/examples/aibs_smartspim_instrument.json
@@ -1,6 +1,6 @@
 {
    "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/imaging/instrument.py",
-   "schema_version": "0.9.0",
+   "schema_version": "0.9.1",
    "instrument_id": "SmartSPIM2-2",
    "modification_date": "2023-10-04",
    "instrument_type": "SmartSPIM",
diff --git a/examples/aind_smartspim_instrument.json b/examples/aind_smartspim_instrument.json
@@ -1,6 +1,6 @@
 {
    "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/imaging/instrument.py",
-   "schema_version": "0.9.0",
+   "schema_version": "0.9.1",
    "instrument_id": "SmartSPIM1-3",
    "modification_date": "2023-10-04",
    "instrument_type": "SmartSPIM",
diff --git a/examples/ephys_rig.json b/examples/ephys_rig.json
@@ -1,6 +1,6 @@
 {
    "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/rig.py",
-   "schema_version": "0.1.1",
+   "schema_version": "0.1.2",
    "rig_id": "323_EPHYS1",
    "modification_date": "2023-10-03",
    "modalities": [
diff --git a/examples/exaspim_instrument.json b/examples/exaspim_instrument.json
@@ -1,6 +1,6 @@
 {
    "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/imaging/instrument.py",
-   "schema_version": "0.9.0",
+   "schema_version": "0.9.1",
    "instrument_id": "exaSPIM1-1",
    "modification_date": "2023-10-04",
    "instrument_type": "exaSPIM",
diff --git a/examples/fip_ophys_rig.json b/examples/fip_ophys_rig.json
@@ -1,6 +1,6 @@
 {
    "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/rig.py",
-   "schema_version": "0.1.1",
+   "schema_version": "0.1.2",
    "rig_id": "428_FIP1_2",
    "modification_date": "2023-10-03",
    "modalities": [
diff --git a/src/aind_data_schema/behavior/behavior_rig.py b/src/aind_data_schema/behavior/behavior_rig.py
@@ -26,7 +26,7 @@
 class BehaviorRig(AindCoreModel):
     """Description of an behavior rig. This is being deprecated after 2023-11-01."""
 
-    schema_version: str = Field("0.1.16", description="schema version", title="Version", const=True)
+    schema_version: str = Field("0.1.17", description="schema version", title="Version", const=True)
 
     rig_id: str = Field(..., description="room_stim apparatus_version", title="Rig ID")
     mouse_platform: Annotated[
diff --git a/src/aind_data_schema/device.py b/src/aind_data_schema/device.py
@@ -205,6 +205,7 @@ class Lens(Device):
         Manufacturer.INFINITY_PHOTO_OPTICAL,
         Manufacturer.LEICA,
         Manufacturer.MITUTUYO,
+        Manufacturer.NAVITAR,
         Manufacturer.NIKON,
         Manufacturer.OLYMPUS,
         Manufacturer.SCHNEIDER_KREUZNACH,
@@ -619,7 +620,7 @@ class Monitor(Device):
     """Description of visual display for visual stimuli"""
 
     device_type: Literal["Monitor"] = Field("Monitor", const=True, readOnly=True)
-    manufacturer: EnumSubset[Manufacturer.LG]
+    manufacturer: EnumSubset[Manufacturer.ASUS, Manufacturer.LG]
     refresh_rate: int = Field(..., title="Refresh rate (Hz)", units="Hz", ge=60)
     width: int = Field(..., title="Width (pixels)", units="pixels")
     height: int = Field(..., title="Height (pixels)", units="pixels")
@@ -676,7 +677,7 @@ class Speaker(Device):
     """Description of a speaker for auditory stimuli"""
 
     device_type: Literal["Speaker"] = Field("Speaker", const=True, readOnly=True)
-    manufacturer: EnumSubset[Manufacturer.TYMPHANY]
+    manufacturer: EnumSubset[Manufacturer.TYMPHANY, Manufacturer.ISL]
     position: Optional[RelativePosition] = Field(None, title="Relative position of the monitor")
 
 
diff --git a/src/aind_data_schema/ephys/ephys_rig.py b/src/aind_data_schema/ephys/ephys_rig.py
@@ -111,7 +111,7 @@ class EphysAssembly(AindModel):
 class EphysRig(AindCoreModel):
     """Description of an ephys rig. This is being deprecated after 2023-11-01."""
 
-    schema_version: str = Field("0.7.15", description="schema version", title="Version", const=True)
+    schema_version: str = Field("0.7.16", description="schema version", title="Version", const=True)
     rig_id: str = Field(..., description="room_stim apparatus_version", title="Rig ID")
     ephys_assemblies: Optional[List[EphysAssembly]] = Field(None, title="Ephys probes", unique_items=True)
     stick_microscopes: Optional[List[StickMicroscopeAssembly]] = Field(None, title="Stick microscopes")
diff --git a/src/aind_data_schema/imaging/instrument.py b/src/aind_data_schema/imaging/instrument.py
@@ -107,7 +107,7 @@ class OpticalTable(Device):
 class Instrument(AindCoreModel):
     """Description of an instrument, which is a collection of devices"""
 
-    schema_version: str = Field("0.9.0", description="schema version", title="Version", const=True)
+    schema_version: str = Field("0.9.1", description="schema version", title="Version", const=True)
     instrument_id: Optional[str] = Field(
         None,
         description="Unique identifier for this instrument. Naming convention: <room>-<apparatus>-<version>",
diff --git a/src/aind_data_schema/imaging/mri_session.py b/src/aind_data_schema/imaging/mri_session.py
@@ -98,7 +98,7 @@ def validate_other(cls, v):
 class MriSession(AindCoreModel):
     """Description of an MRI scan"""
 
-    schema_version: str = Field("0.1.12", description="schema version", title="Version", const=True)
+    schema_version: str = Field("0.1.13", description="schema version", title="Version", const=True)
     subject_id: str = Field(
         ...,
         description="Unique identifier for the subject. If this is not a Allen LAS ID, indicate this in the Notes.",
diff --git a/src/aind_data_schema/manufacturers.py b/src/aind_data_schema/manufacturers.py
@@ -15,6 +15,11 @@ class Manufacturer(Enum, metaclass=BaseNameEnumMeta):
         name="Applied Scientific Instrumentation",
         abbreviation="ASI",
     )
+    ASUS = PIDName(
+        name="ASUS",
+        registry=Registry.ROR,
+        registry_identifier="00bxkz165",
+    )
     AVCOSTAR = PIDName(name="Arecont Vision Costar")
     BASLER = PIDName(name="Basler")
     CAMBRIDGE_TECHNOLOGY = PIDName(name="Cambridge Technology")
@@ -59,6 +64,7 @@ class Manufacturer(Enum, metaclass=BaseNameEnumMeta):
         registry_identifier="02kcbn207",
     )
     INFINITY_PHOTO_OPTICAL = PIDName(name="Infinity Photo-Optical")
+    ISL = PIDName(name="ISL Products International", abbreviation="ISL")
     JULABO = PIDName(name="Julabo")
     LEE = PIDName(name="The Lee Company")
     LEICA = PIDName(name="Leica")
@@ -86,6 +92,7 @@ class Manufacturer(Enum, metaclass=BaseNameEnumMeta):
         registry=Registry.ROR,
         registry_identifier="026exqw73",
     )
+    NAVITAR = PIDName(name="Navitar")
     NEW_SCALE_TECHNOLOGIES = PIDName(name="New Scale Technologies")
     NIKON = PIDName(
         name="Nikon",
diff --git a/src/aind_data_schema/ophys/ophys_rig.py b/src/aind_data_schema/ophys/ophys_rig.py
@@ -89,7 +89,7 @@ class OphysRig(AindCoreModel):
     """Description of an optical physiology rig. This is being deprecated after 2023-11-01."""
 
     schema_version: str = Field(
-        "0.7.4",
+        "0.7.5",
         description="schema version",
         title="Schema Version",
         const=True,
diff --git a/src/aind_data_schema/rig.py b/src/aind_data_schema/rig.py
@@ -42,7 +42,7 @@
 class Rig(AindCoreModel):
     """Description of a rig"""
 
-    schema_version: str = Field("0.1.1", description="schema version", title="Version", const=True)
+    schema_version: str = Field("0.1.2", description="schema version", title="Version", const=True)
     rig_id: str = Field(..., description="room_stim apparatus_version", title="Rig ID")
     modification_date: date = Field(..., title="Date of modification")
     modalities: List[Modality] = Field(..., title="Modalities", unique_items=True)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/imaging/instrument.py",`
`3`		`- "schema_version": "0.9.0",`
	`3`	`+ "schema_version": "0.9.1",`
`4`	`4`	`"instrument_id": "SmartSPIM2-2",`
`5`	`5`	`"modification_date": "2023-10-04",`
`6`	`6`	`"instrument_type": "SmartSPIM",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/rig.py",`
`3`		`- "schema_version": "0.1.1",`
	`3`	`+ "schema_version": "0.1.2",`
`4`	`4`	`"rig_id": "323_EPHYS1",`
`5`	`5`	`"modification_date": "2023-10-03",`
`6`	`6`	`"modalities": [`