diff --git a/examples/aibs_smartspim_procedures.json b/examples/aibs_smartspim_procedures.json index e4b1388e3..6db2c9d0f 100644 --- a/examples/aibs_smartspim_procedures.json +++ b/examples/aibs_smartspim_procedures.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/procedures.py", - "schema_version": "1.2.1", + "schema_version": "1.2.2", "subject_id": "651286", "subject_procedures": [ { diff --git a/examples/bergamo_ophys_session.json b/examples/bergamo_ophys_session.json index 70bbb7768..123c3a544 100644 --- a/examples/bergamo_ophys_session.json +++ b/examples/bergamo_ophys_session.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py", - "schema_version": "1.1.1", + "schema_version": "1.1.2", "protocol_id": [], "experimenter_full_name": [ "John Doe" diff --git a/examples/ephys_session.json b/examples/ephys_session.json index d08a8a982..84ac1ae64 100644 --- a/examples/ephys_session.json +++ b/examples/ephys_session.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py", - "schema_version": "1.1.1", + "schema_version": "1.1.2", "protocol_id": [], "experimenter_full_name": [ "Max Quibble", diff --git a/examples/mri_session.json b/examples/mri_session.json index a2a0ce0f2..8d4bdacd1 100644 --- a/examples/mri_session.json +++ b/examples/mri_session.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py", - "schema_version": "1.1.1", + "schema_version": "1.1.2", "protocol_id": [ "dx.doi.org/10.57824/protocols.io.bh7kl4n6" ], diff --git a/examples/multiplane_ophys_session.json b/examples/multiplane_ophys_session.json index 9d833a96c..c7bd04e98 100644 --- a/examples/multiplane_ophys_session.json +++ b/examples/multiplane_ophys_session.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py", - "schema_version": "1.1.1", + "schema_version": "1.1.2", "protocol_id": [], "experimenter_full_name": [ "John Doe" diff --git a/examples/ophys_procedures.json b/examples/ophys_procedures.json index 27b15a02a..de30e15e0 100644 --- a/examples/ophys_procedures.json +++ b/examples/ophys_procedures.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/procedures.py", - "schema_version": "1.2.1", + "schema_version": "1.2.2", "subject_id": "625100", "subject_procedures": [ { diff --git a/examples/ophys_session.json b/examples/ophys_session.json index 08f9f8d83..04f0b9295 100644 --- a/examples/ophys_session.json +++ b/examples/ophys_session.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/session.py", - "schema_version": "1.1.1", + "schema_version": "1.1.2", "protocol_id": [], "experimenter_full_name": [ "John Doe" diff --git a/examples/procedures.json b/examples/procedures.json index 08fbf5fb3..23be88751 100644 --- a/examples/procedures.json +++ b/examples/procedures.json @@ -1,6 +1,6 @@ { "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/procedures.py", - "schema_version": "1.2.1", + "schema_version": "1.2.2", "subject_id": "625100", "subject_procedures": [ { diff --git a/schemas/metadata_schema.json b/schemas/metadata_schema.json index 1fc873d48..796b59ef9 100644 --- a/schemas/metadata_schema.json +++ b/schemas/metadata_schema.json @@ -2520,8 +2520,15 @@ "title": "Frame rate (Hz)" }, "frame_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Frame rate unit" }, "immersion": { @@ -2774,12 +2781,10 @@ "title": "Camera target" }, "camera": { - "$ref": "#/$defs/Camera", - "title": "Camera" + "$ref": "#/$defs/Camera" }, "lens": { - "$ref": "#/$defs/Lens", - "title": "Lens" + "$ref": "#/$defs/Lens" }, "filter": { "anyOf": [ @@ -3084,8 +3089,15 @@ "title": "Dilation (pixels)" }, "dilation_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "pixel", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Dilation unit" }, "description": { @@ -3340,8 +3352,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" } }, @@ -3429,8 +3448,15 @@ "title": "DAQ channel sample rate (Hz)" }, "sample_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Sample rate unit" }, "event_based_sampling": { @@ -4295,8 +4321,15 @@ "title": "Frame rate (Hz)" }, "frame_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Frame rate unit" }, "immersion": { @@ -14413,8 +14446,15 @@ "title": "Surface z" }, "surface_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Surface z unit" }, "dye": { @@ -18491,8 +18531,15 @@ "title": "Frame rate (Hz)" }, "frame_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Frame rate unit" }, "coupled_fov_index": { @@ -18525,8 +18572,15 @@ "title": "Power" }, "power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "percent", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Power unit" }, "power_ratio": { @@ -18557,8 +18611,15 @@ "title": "Z stage position of the fastz actuator for a given targeted depth" }, "scanfield_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Z stage position unit" }, "scanimage_roi_index": { @@ -18786,8 +18847,15 @@ "title": "Thickness (mm)" }, "thickness_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "millimeter", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Thickness unit" }, "filter_wheel_index": { @@ -21542,18 +21610,6 @@ "default": null, "title": "Temperature control" }, - "humidity_control": { - "anyOf": [ - { - "type": "boolean" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Humidity control" - }, "optical_tables": { "default": [], "items": { @@ -21762,8 +21818,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -21782,8 +21845,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -25364,8 +25434,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -25384,8 +25461,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -28966,8 +29050,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -28986,8 +29077,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -29093,8 +29191,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -29113,8 +29218,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -33178,8 +33290,15 @@ "title": "Temperature (K)" }, "temperature_unit": { - "$ref": "#/$defs/TemperatureUnit", - "default": "Kelvin", + "anyOf": [ + { + "$ref": "#/$defs/TemperatureUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Temperature unit" } }, @@ -33465,8 +33584,15 @@ "title": "Excitation power (mW)" }, "excitation_power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "milliwatt", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Excitation power unit" } }, @@ -33647,8 +33773,15 @@ "title": "Focal length of the lens (mm)" }, "focal_length_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "millimeter", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Focal length unit" }, "size": { @@ -33880,8 +34013,15 @@ "title": "Bandwidth (FWHM)" }, "bandwidth_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "nanometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Bandwidth unit" } }, @@ -33923,8 +34063,15 @@ "title": "Excitation power (mW)" }, "excitation_power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "milliwatt", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Excitation power unit" } }, @@ -41180,8 +41327,15 @@ "title": "Surface z" }, "surface_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Surface z unit" }, "dye": { @@ -42756,8 +42910,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -42776,8 +42937,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -46946,9 +47114,17 @@ "title": "Concentration" }, "concentration_unit": { - "default": "mg/mL", - "title": "Concentration unit", - "type": "string" + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "description": "For example, mg/mL", + "title": "Concentration unit" } }, "required": [ @@ -54132,8 +54308,15 @@ "title": "Beam modulation (V)" }, "beam_modulation_unit": { - "$ref": "#/$defs/VoltageUnit", - "default": "Volts", + "anyOf": [ + { + "$ref": "#/$defs/VoltageUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Beam modulation unit" } }, @@ -54707,8 +54890,8 @@ "type": "string" }, "schema_version": { - "const": "1.2.1", - "default": "1.2.1", + "const": "1.2.2", + "default": "1.2.2", "title": "Schema Version", "type": "string" }, @@ -54979,8 +55162,15 @@ "title": "Ground wire diameter" }, "ground_wire_diameter_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "inch", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Ground wire diameter unit" }, "well_part_number": { @@ -56505,8 +56695,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -56525,8 +56722,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -62306,8 +62510,8 @@ "type": "string" }, "schema_version": { - "const": "1.1.1", - "default": "1.1.1", + "const": "1.1.2", + "default": "1.1.2", "title": "Schema Version", "type": "string" }, @@ -66064,8 +66268,15 @@ "title": "Frame rate (Hz)" }, "frame_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Frame rate unit" }, "coupled_fov_index": { @@ -66098,8 +66309,15 @@ "title": "Power" }, "power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "percent", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Power unit" }, "power_ratio": { @@ -66130,8 +66348,15 @@ "title": "Z stage position of the fastz actuator for a given targeted depth" }, "scanfield_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Z stage position unit" }, "scanimage_roi_index": { @@ -66428,8 +66653,15 @@ "title": "Volume (dB)" }, "volume_unit": { - "$ref": "#/$defs/SoundIntensityUnit", - "default": "decibels", + "anyOf": [ + { + "$ref": "#/$defs/SoundIntensityUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Volume unit" } }, @@ -70170,8 +70402,15 @@ "title": "Dilation (pixels)" }, "dilation_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "pixel", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Dilation unit" }, "description": { @@ -70874,6 +71113,21 @@ "description": "Light sources for stimulation", "title": "Light source config" }, + "objects_in_arena": { + "anyOf": [ + { + "items": { + "type": "string" + }, + "type": "array" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Objects in arena" + }, "output_parameters": { "$ref": "#/$defs/AindGeneric", "default": {}, @@ -70961,6 +71215,7 @@ "description": "Types of stimulus modalities", "enum": [ "Auditory", + "Free moving", "Olfactory", "Optogenetics", "None", @@ -107144,8 +107399,8 @@ "type": "string" }, "schema_version": { - "const": "1.1.2", - "default": "1.1.2", + "const": "1.1.3", + "default": "1.1.3", "title": "Schema Version", "type": "string" }, diff --git a/schemas/procedures_schema.json b/schemas/procedures_schema.json index a9f6db412..7ca2342d0 100644 --- a/schemas/procedures_schema.json +++ b/schemas/procedures_schema.json @@ -810,8 +810,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" } }, @@ -2666,8 +2673,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -2686,8 +2700,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -6268,8 +6289,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -6288,8 +6316,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -9870,8 +9905,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -9890,8 +9932,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -9997,8 +10046,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -10017,8 +10073,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -14353,8 +14416,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -14373,8 +14443,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -18367,9 +18444,17 @@ "title": "Concentration" }, "concentration_unit": { - "default": "mg/mL", - "title": "Concentration unit", - "type": "string" + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "description": "For example, mg/mL", + "title": "Concentration unit" } }, "required": [ @@ -22558,8 +22643,15 @@ "title": "Ground wire diameter" }, "ground_wire_diameter_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "inch", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Ground wire diameter unit" }, "well_part_number": { @@ -23535,8 +23627,15 @@ "title": "Recovery time" }, "recovery_time_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Recovery time unit" }, "injection_duration": { @@ -23555,8 +23654,15 @@ "title": "Injection duration" }, "injection_duration_unit": { - "$ref": "#/$defs/TimeUnit", - "default": "minute", + "anyOf": [ + { + "$ref": "#/$defs/TimeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Injection duration unit" }, "instrument_id": { @@ -60782,8 +60888,8 @@ "type": "string" }, "schema_version": { - "const": "1.2.1", - "default": "1.2.1", + "const": "1.2.2", + "default": "1.2.2", "title": "Schema Version", "type": "string" }, diff --git a/schemas/session_schema.json b/schemas/session_schema.json index f51c05ef6..3dececd36 100644 --- a/schemas/session_schema.json +++ b/schemas/session_schema.json @@ -7516,8 +7516,15 @@ "title": "Surface z" }, "surface_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Surface z unit" }, "dye": { @@ -11031,8 +11038,15 @@ "title": "Frame rate (Hz)" }, "frame_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Frame rate unit" }, "coupled_fov_index": { @@ -11065,8 +11079,15 @@ "title": "Power" }, "power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "percent", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Power unit" }, "power_ratio": { @@ -11097,8 +11118,15 @@ "title": "Z stage position of the fastz actuator for a given targeted depth" }, "scanfield_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Z stage position unit" }, "scanimage_roi_index": { @@ -11200,8 +11228,15 @@ "title": "Excitation power (mW)" }, "excitation_power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "milliwatt", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Excitation power unit" } }, @@ -11242,8 +11277,15 @@ "title": "Excitation power (mW)" }, "excitation_power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "milliwatt", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Excitation power unit" } }, @@ -18393,8 +18435,15 @@ "title": "Surface z" }, "surface_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Surface z unit" }, "dye": { @@ -23570,8 +23619,15 @@ "title": "Frame rate (Hz)" }, "frame_rate_unit": { - "$ref": "#/$defs/FrequencyUnit", - "default": "hertz", + "anyOf": [ + { + "$ref": "#/$defs/FrequencyUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Frame rate unit" }, "coupled_fov_index": { @@ -23604,8 +23660,15 @@ "title": "Power" }, "power_unit": { - "$ref": "#/$defs/PowerUnit", - "default": "percent", + "anyOf": [ + { + "$ref": "#/$defs/PowerUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Power unit" }, "power_ratio": { @@ -23636,8 +23699,15 @@ "title": "Z stage position of the fastz actuator for a given targeted depth" }, "scanfield_z_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "micrometer", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Z stage position unit" }, "scanimage_roi_index": { @@ -23808,8 +23878,15 @@ "title": "Volume (dB)" }, "volume_unit": { - "$ref": "#/$defs/SoundIntensityUnit", - "default": "decibels", + "anyOf": [ + { + "$ref": "#/$defs/SoundIntensityUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Volume unit" } }, @@ -27398,8 +27475,15 @@ "title": "Dilation (pixels)" }, "dilation_unit": { - "$ref": "#/$defs/SizeUnit", - "default": "pixel", + "anyOf": [ + { + "$ref": "#/$defs/SizeUnit" + }, + { + "type": "null" + } + ], + "default": null, "title": "Dilation unit" }, "description": { @@ -27601,6 +27685,21 @@ "description": "Light sources for stimulation", "title": "Light source config" }, + "objects_in_arena": { + "anyOf": [ + { + "items": { + "type": "string" + }, + "type": "array" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Objects in arena" + }, "output_parameters": { "$ref": "#/$defs/AindGeneric", "default": {}, @@ -27688,6 +27787,7 @@ "description": "Types of stimulus modalities", "enum": [ "Auditory", + "Free moving", "Olfactory", "Optogenetics", "None", @@ -58914,8 +59014,8 @@ "type": "string" }, "schema_version": { - "const": "1.1.1", - "default": "1.1.1", + "const": "1.1.2", + "default": "1.1.2", "title": "Schema Version", "type": "string" }, diff --git a/src/aind_data_schema/core/metadata.py b/src/aind_data_schema/core/metadata.py index a44a02dfa..2e89d7eba 100644 --- a/src/aind_data_schema/core/metadata.py +++ b/src/aind_data_schema/core/metadata.py @@ -72,7 +72,7 @@ class Metadata(AindCoreModel): _DESCRIBED_BY_URL = AindCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/metadata.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["1.1.2"]] = Field(default="1.1.2") + schema_version: SkipValidation[Literal["1.1.3"]] = Field(default="1.1.3") id: UUID = Field( default_factory=uuid4, alias="_id", diff --git a/src/aind_data_schema/core/procedures.py b/src/aind_data_schema/core/procedures.py index 8bc145f1b..3ca441e73 100644 --- a/src/aind_data_schema/core/procedures.py +++ b/src/aind_data_schema/core/procedures.py @@ -708,7 +708,7 @@ class Procedures(AindCoreModel): _DESCRIBED_BY_URL = AindCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/procedures.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["1.2.1"]] = Field(default="1.2.1") + schema_version: SkipValidation[Literal["1.2.2"]] = Field(default="1.2.2") 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/core/session.py b/src/aind_data_schema/core/session.py index 18ebfd5b9..178f7bf42 100644 --- a/src/aind_data_schema/core/session.py +++ b/src/aind_data_schema/core/session.py @@ -539,7 +539,7 @@ class Session(AindCoreModel): _DESCRIBED_BY_URL = AindCoreModel._DESCRIBED_BY_BASE_URL.default + "aind_data_schema/core/session.py" describedBy: str = Field(default=_DESCRIBED_BY_URL, json_schema_extra={"const": _DESCRIBED_BY_URL}) - schema_version: SkipValidation[Literal["1.1.1"]] = Field(default="1.1.1") + schema_version: SkipValidation[Literal["1.1.2"]] = Field(default="1.1.2") protocol_id: List[str] = Field(default=[], title="Protocol ID", description="DOI for protocols.io") experimenter_full_name: List[str] = Field( ...,